[or-cvs] [tor/master 2/2] merge in the bug 1364 fix

[arma@xxxxxxxxxxxxxx]

Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date: Tue, 20 Apr 2010 03:59:23 -0400
Subject: merge in the bug 1364 fix
Commit: 3d8879a04da79b014700b01f1ed2e8d685040dfb

---
 ChangeLog                        |    6 ++++++
 changes/demote_no_cipher_warning |    5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 changes/demote_no_cipher_warning

diff --git a/ChangeLog b/ChangeLog
index 594f31c..d6fac8c 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 24fcfdd..0000000
--- 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.
-- 
1.6.5