fold in most of the changes/foo files

1 files changed, 46 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index d083e7fdb..2a427cd46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.2.15-alpha - 2010-07-2?
+Changes in version 0.2.2.15-alpha - 2010-08-??
   o Major bugfixes:
     - Stop assigning the HSDir flag to relays that disable their
       DirPort (and thus will refuse to answer directory requests). This
@@ -14,12 +14,51 @@ Changes in version 0.2.2.15-alpha - 2010-07-2?
       improving the anonymity the Tor network can provide and also
       decreasing the dropoff in throughput that relays experience when
       they first get the Guard flag.
+    - Allow enabling or disabling the *Statistics config options while
+      Tor is running.
 
   o Minor features:
+    - Update to the August 1 2010 Maxmind GeoLite Country database.
     - Have the controller interface give a more useful message than
       "Internal Error" in response to failed GETINFO requests.
+    - Warn when the same option is provided more than once in a torrc
+      file, on the command line, or in a single SETCONF statement, and
+      the option is one that only accepts a single line. Closes bug 1384.
+    - Build correctly on mingw with more recent versions of OpenSSL 0.9.8.
+      Patch from mingw-san.
+    - Add support for the country code "{??}" in torrc options like
+      ExcludeNodes, to indicate all routers of unknown country. Closes
+      bug 1094.
+    - Remove the old debian/ directory from the main Tor distribution.
+      The official Tor-for-debian git repository lives at the URL
+      https://git.torproject.org/debian/tor.git
+    - Take a first step towards making or.h smaller by splitting out
+      function definitions for all source files in src/or/. Leave
+      structures and defines in or.h for now.
+
+  o Minor bugfixes (on 0.2.1.x and earlier):
+    - Complain if PublishServerDescriptor is given multiple arguments that
+      include 0 or 1. This configuration will be rejected in future.
+      Bugfix on 0.2.0.1-alpha; closes bug 1107.
+    - Change "Application request when we're believed to be offline."
+      notice to "Application request when we haven't used client
+      functionality lately.", to clarify that it's not an error. Bugfix
+      on 0.0.9.3; fixes bug 1222.
+    - Fix a regression that caused Tor to rebind its ports if it receives
+      SIGHUP while hibernating. Bugfix in 0.1.1.6-alpha; closes bug 919.
+    - Disallow BridgeRelay 1 and ORPort 0 at once in the configuration.
+      Bugfix on 0.2.0.13-alpha; closes bug 928.
+    - Fix a bug in the controller interface where "GETINFO ns/asdaskljkl"
+      would return "551 Internal error" rather than "552 Unrecognized key
+      ns/asdaskljkl". Bugfix on 0.1.2.3-alpha.
+    - Let users configure a regular relay to be their bridge. It didn't
+      work because when Tor fetched the bridge descriptor, it found
+      that it already had it, and didn't realize that the purpose of the
+      descriptor had changed. Now we replace routers with a purpose other
+      than bridge with bridge descriptors when fetching them. Bugfix on
+      0.1.1.9-alpha; fixes bug 1776.
 
-  o Minor bugfixes:
+  o Minor bugfixes (on 0.2.2.x):
     - Alter directory authorities to always consider Exit-flagged nodes
       as potential Guard nodes in their votes. The actual decision to
       use Exits as Guards is done in the consensus bandwidth weights.
@@ -27,9 +66,11 @@ Changes in version 0.2.2.15-alpha - 2010-07-2?
     - When the controller is reporting the purpose of circuits that
       didn't finish building before the circuit build timeout, it was
       printing UNKNOWN_13. Now print EXPIRED. Bugfix on 0.2.2.14-alpha.
-    - Fix a bug in the controller interface where "GETINFO ns/asdaskljkl"
-      would return "551 Internal error" rather than "552 Unrecognized key
-      ns/asdaskljkl".
+    - Our libevent version parsing code couldn't handle versions like
+      1.4.14b-stable and incorrectly warned the user about using an
+      old and broken version of libevent. Treat 1.4.14b-stable like
+      1.4.14-stable when parsing the version. Fixes bug 1731; bugfix
+      on 0.2.2.1-alpha.
 
 
 Changes in version 0.2.2.14-alpha - 2010-07-12