Merge with main repo.

1 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 90dd3170..3ff1851a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,13 @@ dillo-3.1 [not released yet]
    Patches: Johannes Hofmann
 +- Doxygen fixes.
    Patch: Jeremy Henty
++- Move HTTPS from dpi into the browser, enable SNI, add certificate hostname
+   checking from wget, check more locations for CA bundles and add
+   --with-ca-certs-file and --with-ca-certs-dir to configure, some improvement
+   to security warning popups, change cipher list from "ALL" to
+   "ALL:!aNULL:!eNULL:!LOW:!EXPORT40:!RC4", disable SSL3, disable TLS
+   compression, etc.
+   Patch: corvid, Benjamin Johnson
 
 -----------------------------------------------------------------------------