closer to an 0.2.2.34 changelog

13 files changed, 56 insertions, 72 deletions

diff --git a/ChangeLog b/ChangeLog
index e1a0c874b0..4b508eb528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+Changes in version 0.2.2.34 - 2011-10-??
+  o Security fixes:
+    - Bridge relays now do their directory fetches inside Tor TLS
+      connections, like all the other clients do, rather than connecting
+      directly to the DirPort like public relays do. Removes another
+      avenue for enumerating bridges. Fixes bug 4115; bugfix on 0.2.0.35.
+    - Bridges relays now build circuits for themselves in a more similar
+      way to how clients build them. Removes another avenue for
+      enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha,
+      when bridges were introduced.
+
+  o Major bugfixes:
+    - Fix a crash bug when changing node restrictions while a DNS lookup
+      is in-progress. Fixes bug 4259; bugfix on 0.2.2.25-alpha. Bugfix
+      by "Tey'".
+    - Don't launch a useless circuit after failing to use one of a
+      hidden service's introduction points. Previously, we would
+      launch a new introduction circuit, but not set the hidden service
+      which that circuit was intended to connect to, so it would never
+      actually be used. A different piece of code would then create a
+      new introduction circuit correctly. Bug reported by katmagic and
+      found by Sebastian Hahn. Bugfix on 0.2.1.13-alpha; fixes bug 4212.
+
+  o Minor bugfixes:
+    - Change an integer overflow check in the OpenBSD_Malloc code so
+      that GCC is less likely to eliminate it as impossible. Patch
+      from Mansour Moufid. Fixes bug 4059.
+    - When a hidden service turns an extra service-side introduction
+      circuit into a general-purpose circuit, free the rend_data and
+      intro_key fields first, so we won't leak memory if the circuit
+      is cannibalized for use as another service-side introduction
+      circuit. Bugfix on 0.2.1.7-alpha; fixes bug 4251.
+    - Bridges now skip DNS self-tests, to act a little more stealthily.
+      Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced
+      bridges. Patch by "warms0x".
+
+  o Minor bugfixes (log messages and documentation):
+    - Remove a confusing dollar sign from the example fingerprint in the
+      man page, and also make the example fingerprint a valid one. Fixes
+      bug 4309; bugfix on 0.2.1.3-alpha.
+    - The next version of Windows will be called Windows 8, and it has
+      a major version of 6, minor version of 2. Correctly identify that
+      version instead of calling it "Very recent version". Resolves
+      ticket 4153; reported by funkstar.
+    - Downgrade log messages about circuit timeout calibration from
+      "notice" to "info": they don't require or suggest any human
+      intervention. Patch from Tom Lowenthal. Fixes bug 4063;
+      bugfix on 0.2.2.14-alpha.
+
+  o Minor features:
+    - Turn on directory request statistics by default and include them in
+      extra-info descriptors. Don't break if we have no GeoIP database.
+      Backported from 0.2.3.1-alpha; implements ticket 3951.
+    - Update to the October 4 2011 Maxmind GeoLite Country database.
+
+
 Changes in version 0.2.2.33 - 2011-09-13
   Tor 0.2.2.33 fixes several bugs, and includes a slight tweak to Tor's
   TLS handshake that makes relays and bridges that run this new version
diff --git a/changes/bug4059 b/changes/bug4059
deleted file mode 100644
index 82a4b1a10c..0000000000
--- a/changes/bug4059
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Change an integer overflow check in the OpenBSD_Malloc code so
-      that GCC is less likely to eliminate it as impossible. Patch
-      from Mansour Moufid. Fixes bug 4059.
-
diff --git a/changes/bug4115 b/changes/bug4115
deleted file mode 100644
index 626791a806..0000000000
--- a/changes/bug4115
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Security fixes:
-    - Bridge relays now do their directory fetches inside Tor TLS
-      connections, like all the other clients do, rather than connecting
-      directly to the DirPort like public relays do. Removes another
-      avenue for enumerating bridges. Fixes part of bug 4115; bugfix
-      on 0.2.0.35.
-
diff --git a/changes/bug4124 b/changes/bug4124
deleted file mode 100644
index abe93ccdd8..0000000000
--- a/changes/bug4124
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Security fixes:
-    - Bridges relays now build circuits for themselves in a more similar
-      way to how clients build them. Removes another avenue for
-      enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha,
-      when bridges were introduced.
-
diff --git a/changes/bug4201 b/changes/bug4201
deleted file mode 100644
index 6f7d715af2..0000000000
--- a/changes/bug4201
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Bridges now skip DNS self-tests, to act a little more stealthily.
-      Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced
-      bridges. Patch by "warms0x".
-
diff --git a/changes/bug4212 b/changes/bug4212
deleted file mode 100644
index 6222a59978..0000000000
--- a/changes/bug4212
+++ /dev/null
@@ -1,13 +0,0 @@
-  o Major bugfixes:
-
-    - Don't launch a useless circuit after failing to use one of a
-      hidden service's introduction points.  Previously, we would
-      launch a new introduction circuit, but not set the hidden
-      service which that circuit was intended to connect to, so it
-      would never actually be used.  A different piece of code would
-      then create a new introduction circuit correctly, so this bug
-      was harmless until it caused an assertion in the client-side
-      part of the #3825 fix to fail.  Bug reported by katmagic and
-      found by Sebastian Hahn.  Bugfix on 0.2.1.13-alpha; fixes bug
-      4212.
-
diff --git a/changes/bug4251 b/changes/bug4251
deleted file mode 100644
index 303c9e6364..0000000000
--- a/changes/bug4251
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes:
-
-    - When a hidden service turns an extra service-side introduction
-      circuit into a general-purpose circuit, free the rend_data and
-      intro_key fields first, so they won't be leaked if the circuit
-      is cannibalized for use as another service-side introduction
-      circuit.  Bugfix on 0.2.1.7-alpha; fixes bug 4251.
-
diff --git a/changes/bug4259 b/changes/bug4259
deleted file mode 100644
index bfccd3aee8..0000000000
--- a/changes/bug4259
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Fix a crash bug when changing node restrictions while a DNS lookup
-      is in-progress. Fixes bug 4259; bugfix on 0.2.2.25-alpha. Bugfix
-      by "Tey'".
diff --git a/changes/bug4309 b/changes/bug4309
deleted file mode 100644
index f4f910e7ff..0000000000
--- a/changes/bug4309
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Remove a confusing dollar sign from the example fingerprint in the
-      man page, and also make example fingerprint a valid one. Fixes bug
-      4309; bugfix on 0.2.1.3-alpha.
-
diff --git a/changes/dirreq-stats-default b/changes/dirreq-stats-default
deleted file mode 100644
index df7ac11425..0000000000
--- a/changes/dirreq-stats-default
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - Turn on directory request statistics by default and include them in
-      extra-info descriptors. Don't break if we have no GeoIP database.
-      Backported from 0.2.3.1-alpha; implements ticket 3951.
-
diff --git a/changes/geoip-october2011 b/changes/geoip-october2011
deleted file mode 100644
index d5b6910edb..0000000000
--- a/changes/geoip-october2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the October 4 2011 Maxmind GeoLite Country database.
-
diff --git a/changes/ticket-4063 b/changes/ticket-4063
deleted file mode 100644
index 6a985b8c25..0000000000
--- a/changes/ticket-4063
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (usability):
-    - Downgrade log messages about circuit timeout calibration from
-      "notice" to "info": they don't require or suggest any human
-      intervention. Patch from Tom Lowenthal. Fixes bug 4063;
-      bugfix on 0.2.2.14-alpha. 
-
diff --git a/changes/windows_8 b/changes/windows_8
deleted file mode 100644
index 405e4fa158..0000000000
--- a/changes/windows_8
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - The next version of Windows will be called Windows 8, and it has a major
-      version of 6, minor version of 2. Correctly identify that version instead
-      of calling it "Very recent version". Fixes bug 4153; reported by funkstar.
-