From: Roger Dingledine <arma@torproject.org>
Date: Mon, 26 Oct 2009 07:16:47 +0000 (-0400)
Subject: add a changelog entry to karsten's fix for bug 1114
X-Git-Tag: tor-0.2.2.6-alpha~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0b2c84cde102b8202d47dccbde54245af03cb43;p=thirdparty%2Ftor.git

add a changelog entry to karsten's fix for bug 1114
---

diff --git a/ChangeLog b/ChangeLog
index b424837906..1b0dce6832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,10 @@ Changes in version 0.2.2.6-alpha - 2009-10-??
   o Minor bugfixes:
     - Fix a crash bug when trying to initialize the evdns module in
       Libevent 2.
+    - Stop logging at severity 'warn' when some other Tor client tries
+      to establish a circuit with us using weak DH keys. It's a protocol
+      violation, but that doesn't mean ordinary users need to hear about
+      it. Fixes the bug part of bug 1114. Bugfix on 0.1.0.13.
 
 
 Changes in version 0.2.2.5-alpha - 2009-10-11