[tor-commits] [tor/release-0.2.3] one more changes file

[arma at torproject.org]

commit 5ee0fdafff69eb99a9a9980512196c33bf26bce6
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Sep 4 20:16:59 2012 -0400

    one more changes file
---
 ChangeLog       |    7 +++++++
 changes/bug6743 |    9 ---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59d9a3c..3c63e10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,13 @@ Changes in version 0.2.3.21-rc - 2012-09-05
       requests. Fixes bug 6472; bugfix on 0.0.7rc1.
     - Fix build and 64-bit compile warnings from --enable-openbsd-malloc.
       Fixes bug 6379. Bugfix on 0.2.0.20-rc.
+    - Allow one-hop directory fetching circuits the full "circuit build
+      timeout" period, rather than just half of it, before failing them
+      and marking the relay down. This fix should help reduce cases where
+      clients declare relays (or worse, bridges) unreachable because
+      the TLS handshake takes a few seconds to complete. Fixes bug 6743;
+      bugfix on 0.2.2.2-alpha, where we changed the timeout from a static
+      30 seconds.
     - Authorities no longer include any router in their microdescriptor
       consensuses for which they couldn't generate or agree on a
       microdescriptor. Fixes the second piece of bug 6404; fix on
diff --git a/changes/bug6743 b/changes/bug6743
deleted file mode 100644
index 6ec78f8..0000000
--- a/changes/bug6743
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-    - Allow one-hop directory fetching circuits the full "circuit build
-      timeout" period, rather than just half of it, before failing them
-      and marking the relay down. This fix should help reduce cases where
-      clients declare relays (or worse, bridges) unreachable because
-      the TLS handshake takes a few seconds to complete. Fixes bug 6743;
-      bugfix on 0.2.2.2-alpha, where we changed the timeout from a static
-      30 seconds.
-