fold in changes so far

10 files changed, 36 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d2a5fca2a..7998df5a24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+Changes in version 0.2.3.20-rc - 2012-08-??
+  o Major bugfixes:
+    - When disabling guards for having too high a proportion of failed
+      circuits, make sure to look at each guard. Fixes bug 6397; bugfix
+      on 0.2.3.17-beta.
+
+  o Minor features:
+    - Terminate active server managed proxies if Tor stops being a
+      relay. Addresses parts of bug 6274; bugfix on 0.2.3.6-alpha.
+    - Provide a better error message about possible OSX Asciidoc failure
+      reasons. Fix for bug 6436.
+    - Try to make the warning when giving an obsolete SOCKSListenAddress
+      a little more useful.
+
+  o Minor bugfixes:
+    - Check return value of fputs() when writing authority certificate
+      file. Fixes Coverity issue 709056; bugfix on 0.2.0.1-alpha.
+    - Ignore ServerTransportPlugin lines when Tor is not configured as
+      a relay. Fixes bug 6274; bugfix on 0.2.3.6-alpha.
+
+  o Testing:
+    - Make it possible to set the TestingTorNetwork configuration
+      option using AlternateDirAuthority and AlternateBridgeAuthority
+      as an alternative to setting DirServer. Addresses ticket 6377.
+
+  o Documentation:
+    - Clarify the documentation for the Alternate*Authority options.
+      Fixes bug 6387.
+
+  o Code simplification and refactoring:
+    - Do not use SMARTLIST_FOREACH for any loop whose body exceeds
+      10 lines. Also, don't nest them. Doing so in the past has
+      led to hard-to-debug code. The new style is to use the
+      SMARTLIST_FOREACH_{BEGIN,END} pair. Addresses issue 6400.
+
+
 Changes in version 0.2.3.19-rc - 2012-07-06
   Tor 0.2.3.19-rc is the second release candidate for the Tor 0.2.3.x
   series. It fixes the compile on Windows, reverts to a GeoIP database
diff --git a/changes/bug6274 b/changes/bug6274
deleted file mode 100644
index ad1abcde54..0000000000
--- a/changes/bug6274
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes:
-   - Ignore ServerTransportPlugin lines when Tor is not configured as
-     a relay. Fixes bug 6274; bugfix on 0.2.3.6-alpha.
diff --git a/changes/bug6274_2 b/changes/bug6274_2
deleted file mode 100644
index 89576f9328..0000000000
--- a/changes/bug6274_2
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
-   - Terminate active server managed proxies if Tor stops being a
-     relay. Addresses parts of bug 6274; bugfix on 0.2.3.6-alpha.
diff --git a/changes/bug6377 b/changes/bug6377
deleted file mode 100644
index a3a3672783..0000000000
--- a/changes/bug6377
+++ /dev/null
@@ -1,4 +0,0 @@
- o Testing:
-   - Make it possible to set the TestingTorNetwork configuration
-     option using AlternateDirAuthority and AlternateBridgeAuthority
-     as an alternative to setting DirServer.
diff --git a/changes/bug6387 b/changes/bug6387
deleted file mode 100644
index 73fc4f7cfe..0000000000
--- a/changes/bug6387
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-    - Clarify the documentation for the Alternate*Authority options.
-      Fixes bug 6387.
diff --git a/changes/bug6397 b/changes/bug6397
deleted file mode 100644
index 23d8359bd2..0000000000
--- a/changes/bug6397
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - When disabling guards for having too high a proportion of failed
-      circuits, make sure to look at each guard. Fix for bug 6397; bugfix
-      on 0.2.3.17-beta.
diff --git a/changes/bug6436 b/changes/bug6436
deleted file mode 100644
index 2c163df105..0000000000
--- a/changes/bug6436
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Provide a better error message about possible OSX Asciidoc failure
-      reasons. Fix for bug 6436.
diff --git a/changes/cov709056 b/changes/cov709056
deleted file mode 100644
index 64a75ad8a2..0000000000
--- a/changes/cov709056
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Check return value of fputs() when writing authority certificate
-      file. Fixes Coverity issue 709056; bugfix on 0.2.0.1-alpha.
-
diff --git a/changes/port_doc b/changes/port_doc
deleted file mode 100644
index 0e8662f0ab..0000000000
--- a/changes/port_doc
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (usability):
-    - Try to make the warning when giving an obsolete SOCKSListenAddress
-      a littel more useful.
diff --git a/changes/smartlist_foreach b/changes/smartlist_foreach
deleted file mode 100644
index 2fd3a1a85c..0000000000
--- a/changes/smartlist_foreach
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Code simplification and refactoring:
-    - Do not use SMARTLIST_FOREACH for any loop whose body exceeds
-      10 lines. Doing so in the past has led to hard-to-debug code.
-      The new style is to use the SMARTLIST_FOREACH_{BEGIN,END} pair.
-      Issue 6400.
-    - Do not nest SMARTLIST_FOREACH blocks within one another. Any
-      nested block ought to be using SMARTLIST_FOREACH_{BEGIN,END}.
-      Issue 6400.