merge in the bug 1364 fix

diff --git a/ChangeLog b/ChangeLog
index 594f31c416e65e939171a35e02b5df2755507749..d6fac8c90de37c3729e7fa56d2bc5b46eb6826af 100644 (file)
--- 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 (file)
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.