From: Roger Dingledine Date: Tue, 20 Apr 2010 07:59:23 +0000 (-0400) Subject: merge in the bug 1364 fix X-Git-Tag: tor-0.2.2.12-alpha^0 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d8879a04da79b014700b01f1ed2e8d685040dfb;p=thirdparty%2Ftor.git merge in the bug 1364 fix --- diff --git a/ChangeLog b/ChangeLog index 594f31c416..d6fac8c90d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,12 @@ Changes in version 0.2.2.12-alpha - 2010-04-20 and 24 hours pass. Bug found by keb. Fixes bug 1365; bugfix on 0.2.2.11-alpha. + o Minor bugfixes: + - Demote a confusing TLS warning that relay operators might get when + someone tries to talk to their OrPort. It is neither the operator's + fault nor can they do anything about it. Fixes bug 1364; bugfix + on 0.2.0.14-alpha. + Changes in version 0.2.2.11-alpha - 2010-04-15 o Major bugfixes: diff --git a/changes/demote_no_cipher_warning b/changes/demote_no_cipher_warning deleted file mode 100644 index 24fcfdd726..0000000000 --- a/changes/demote_no_cipher_warning +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Demote a warning that relay operators might get when someone is - trying to talk to their OrPort. It is neither the operator's fault - nor can they do anything about it. Bugfix on 0.2.0.14-alpha; fixes - bug 1364.