summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-04-20 03:59:23 -0400
committerRoger Dingledine <arma@torproject.org>2010-04-20 03:59:23 -0400
commit3d8879a04da79b014700b01f1ed2e8d685040dfb (patch)
tree5fbc402e29bd444ac98250a3b8fa89101caa403a
parent0b82ce3eb6feeb48e2e3094de297156e536527a0 (diff)
downloadtor-3d8879a04da79b014700b01f1ed2e8d685040dfb.tar.gz
tor-3d8879a04da79b014700b01f1ed2e8d685040dfb.zip
merge in the bug 1364 fixtor-0.2.2.12-alpha
-rw-r--r--ChangeLog6
-rw-r--r--changes/demote_no_cipher_warning5
2 files changed, 6 insertions, 5 deletions
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.