fold in further changes entries

diff --git a/ChangeLog b/ChangeLog
index 0457134063c36915ee54f8a64aaac3e32be1f218..3782aefa02f2c49fcb56cd0b3b3f056a9ca37caf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,57 @@
-Changes in version 0.2.2.35 - 2011-1?-??
-  o Major bugfix:
+Changes in version 0.2.2.35 - 2011-11-??
+  o Major bugfixes:
+    - Initialize Libevent with the EVENT_BASE_FLAG_NOLOCK flag enabled, so
+      that it doesn't attempt to allocate a socketpair. This could cause
+      some problems on Windows systems with overzealous firewalls. Fix for
+      bug 4457; workaround for Libevent versions 2.0.1-alpha through
+      2.0.15-stable.
     - If we mark an OR connection for close based on a cell we process,
       don't process any further cells on it. We already avoided reading
       on marked-for-close connections, but now we also discard the cells
       we'd already read. Fixes bug 4299; bugfix on 0.2.0.10-alpha, which
       was the first version where we might mark a connection for close
       based on processing a cell on it.
-    - Don't crash when we're running as a relay and don't have a geoip
+    - Correctly sanity-check that we don't underflow on a memory
+      allocation (and then assert) for hidden service introduction
+      point decryption. Bug discovered by Dan Rosenberg. Fixes bug 4410;
+      bugfix on 0.2.1.5-alpha.
+    - Fix a memory leak when we check whether a hidden service
+      descriptor has any usable introduction points left. Fixes bug
+      4424. Bugfix on 0.2.2.25-alpha.
+    - Don't crash when we're running as a relay and don't have a GeoIP
       file. Bugfix on 0.2.2.34; fixes bug 4340. This backports a fix
       we've had in the 0.2.3.x branch already.
+    - When running as a client, do not print a misleading (and plain
+      wrong) log message that we're collecting "directory request"
+      statistics: we don't collect statistics as clients. Also don't
+      create a useless (because empty) stats file in the stats/
+      directory. Fixes bug 4353; bugfix on 0.2.2.34.
 
-  o Trivial fixes:
-    - Fix a typo in a hibernation-related log message. Fixes bug 4331;
+  o Minor bugfixes:
+    - Detect failure to initialize Libevent. This fix provides better
+      detection for future instances of bug 4457.
+    - Don't warn about unused log_mutex in log.c when building with
+      --disable-threads using a recent GCC. Fixes bug 4437; bugfix on
+      0.1.0.6-rc which introduced --disable-threads.
+    - When sending a NETINFO cell, include the original address
+      received for the other side, not its canonical address. Found
+      by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha.
+    - Fixed a typo in a hibernation-related log message. Fixes bug 4331;
       bugfix on 0.2.2.23-alpha; found by "tmpname0901".
+    - Fix a memory leak in launch_direct_bridge_descriptor_fetch() that
+      occurred when a client tried to fetch a descriptor for a bridge
+      in ExcludeNodes. Fixes bug 4383; bugfix on 0.2.2.25-alpha.
+
+  o Minor features:
+    - When Tor ignores a hidden service specified in its configuration,
+      include the hidden service's directory in the warning message.
+      Previously, we would only tell the user that some hidden service
+      was ignored. Bugfix on 0.0.6; fixes bug 4426.
+    - Update to the November 1 2011 Maxmind GeoLite Country database.
+
+  o Packaging changes:
+    - Make it easier to automate expert package builds on Windows,
+      by removing an absolute path from makensis.exe command.
 
 
 Changes in version 0.2.2.34 - 2011-10-26

diff --git a/changes/bug4349 b/changes/bug4349
deleted file mode 100644 (file)
index 633916b..0000000
--- a/changes/bug4349
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - When sending a NETINFO cell, include the original address
-      received for the other side, not its canonical address.  Found
-      by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha.

diff --git a/changes/bug4353 b/changes/bug4353
deleted file mode 100644 (file)
index 5e80c90..0000000
--- a/changes/bug4353
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes:
-    - When running as client without a geoip database, do not print a
-      misleading (and plain wrong) log message that we're collecting
-      dirreq statistics - we're not collecting statistics as clients.
-      Also don't create a useless (because empty) stats file in the
-      stats/ directory. Fixes bug 4353, bugfix on 0.2.2.34.
-

diff --git a/changes/bug4383 b/changes/bug4383
deleted file mode 100644 (file)
index e618b8c..0000000
--- a/changes/bug4383
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix a memleak in launch_direct_bridge_descriptor_fetch() that
-      occured when a client tried to fetch a descriptor for a bridge
-      in ExcludeNodes. Fixes #4383; bugfix on 0.2.2.25-alpha.
-

diff --git a/changes/bug4410 b/changes/bug4410
deleted file mode 100644 (file)
index f42893a..0000000
--- a/changes/bug4410
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Correctly sanity-check that we don't underflow on a memory allocation
-      for introduction point decryption. Bug discovered by Dan Rosenberg.
-      Fixes bug 4410; bugfix on 0.2.1.5-alpha.
-

diff --git a/changes/bug4424 b/changes/bug4424
deleted file mode 100644 (file)
index 443625d..0000000
--- a/changes/bug4424
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes
-
-    - Don't leak memory when we check whether a hidden service
-      descriptor has any usable introduction points left.  Fixes bug
-      4424.  Bugfix on 0.2.2.25-alpha.
-

diff --git a/changes/bug4426 b/changes/bug4426
deleted file mode 100644 (file)
index 1322243..0000000
--- a/changes/bug4426
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor features:
-
-    - When Tor ignores a hidden service specified in its
-      configuration, include the hidden service's directory in the
-      warning message.  Previously, we would only tell the user that
-      some hidden service was ignored.  Bugfix on 0.0.6; fixes bug
-      4426.
-

diff --git a/changes/bug4437 b/changes/bug4437
deleted file mode 100644 (file)
index 985c670..0000000
--- a/changes/bug4437
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Don't warn about unused log_mutex in log.c when building with
-      --disable-threads using a recent GCC. Fixes bug 4437; bugfix on
-      0.1.0.6-rc which introduced --disable-threads.
-

diff --git a/changes/bug4457 b/changes/bug4457
deleted file mode 100644 (file)
index fe7c95f..0000000
--- a/changes/bug4457
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-    - Initialize Libevent with the EVENT_BASE_FLAG_NOLOCK flag enabled, so
-      that it doesn't attempt to allocate a socketpair. This could cause
-      some problems on windows systems with overzealous firewalls. Fix for
-      bug 4457; workaround for Libevent versions 2.0.1-alpha through
-      2.0.15-stable.
-
-    - Detect failure to initialize Libevent. Better detection for bug 4457.
-

diff --git a/changes/geoip-november2011 b/changes/geoip-november2011
deleted file mode 100644 (file)
index 3aa8dc0..0000000
--- a/changes/geoip-november2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the November 1 2011 Maxmind GeoLite Country database.
-

diff --git a/changes/win-bundle-path b/changes/win-bundle-path
deleted file mode 100644 (file)
index 32ff514..0000000
--- a/changes/win-bundle-path
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Packaging changes:
-    - Remove absolute path from makensis.exe command to build Tor expert bundle
-      in order to make it easier to automate package builds
-