fold in most of the changes/foo files

diff --git a/ChangeLog b/ChangeLog
index d083e7fdb8fcca5bf9135b506c5fc4f6d5423371..2a427cd46a74634b55fc9eb588ae2da15df2b059 100644 (file)
--- 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

diff --git a/changes/bug1107 b/changes/bug1107
deleted file mode 100644 (file)
index c396b5d..0000000
--- a/changes/bug1107
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Complain if PublishServerDescriptor is given multiple arguments that
-      include 0 or 1. This configuration will be rejected in future.
-      Bugfix in 0.2.0.1-alpha, closes bug 1107.
-

diff --git a/changes/bug1222 b/changes/bug1222
deleted file mode 100644 (file)
index 66d24de..0000000
--- a/changes/bug1222
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - #1222: 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.
-

diff --git a/changes/bug1384 b/changes/bug1384
deleted file mode 100644 (file)
index 9c406d9..0000000
--- a/changes/bug1384
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - Warn when the same option is provided more then once in a torrc file,
-      on the command line, or in a single SETCONF statement, and option
-      is one that only accepts a single value. Closes bug 1384.
-

diff --git a/changes/bug1731 b/changes/bug1731
deleted file mode 100644 (file)
index 6d484e3..0000000
--- a/changes/bug1731
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Our libevent version parsing code couldn't handle versions like
-      1.4.14b-stable and 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.

diff --git a/changes/bug919 b/changes/bug919
deleted file mode 100644 (file)
index 728b821..0000000
--- a/changes/bug919
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - 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.
-

diff --git a/changes/bug928 b/changes/bug928
deleted file mode 100644 (file)
index 4f9fc5f..0000000
--- a/changes/bug928
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Disallow BridgeRelay 1 and ORPort 0 configuration.
-      Bugfix in 0.2.0.13-alpha, closes bug 928.
-

diff --git a/changes/geoip-update-august2010 b/changes/geoip-update-august2010
deleted file mode 100644 (file)
index 8f12785..0000000
--- a/changes/geoip-update-august2010
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features
-    - Update to the August 1 2010 Maxmind GeoLite Country database.
-

diff --git a/changes/makefile-var-exp b/changes/makefile-var-exp
index c0f7782281d1cfd206a872e31a7741fc6a96adad..14e6a725bb10fba3a695efb4977311d3f6c34afd 100644 (file)
--- a/changes/makefile-var-exp
+++ b/changes/makefile-var-exp
@@ -1,8 +1,8 @@
   o Minor bugfixes:
-    - Change $(VAR:MOD) to ${VAR:MOD} -- make(1) on
-      NetBSD substitutes '$(:x)' to 'x' rather than the empty string.  This
-      bites us in doc/ when configured with `--disable-asciidoc'.  Curly
-      braces should work in all implementations of make(1) but this patch
-      changes only the places where we use the VAR:MOD expansion.
-
+    - Change $(VAR:MOD) to ${VAR:MOD} -- make(1) on NetBSD substitutes
+      '$(:x)' to 'x' rather than the empty string. This bites us in doc/
+      when configured with --disable-asciidoc. Curly braces should work
+      in all implementations of make(1) but this patch changes only the
+      places where we use the VAR:MOD expansion. Doesn't fix bug 1773;
+      bugfix on 0.2.2.9-alpha.
 

diff --git a/changes/mingw-openssl098m b/changes/mingw-openssl098m
deleted file mode 100644 (file)
index b419976..0000000
--- a/changes/mingw-openssl098m
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features
-   - Build correctly on mingw with more recent version of OpenSSL 0.9.8.
-     Patch from mingw-san.

diff --git a/changes/nowhereland b/changes/nowhereland
deleted file mode 100644 (file)
index 5435e96..0000000
--- a/changes/nowhereland
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features:
-    - Add support for the country code "{??}" in torrc options like
-      ExcludeNodes, to indicate all routers of unknown country.  Fixes bug
-      1094.
-
-

diff --git a/changes/relays_as_bridges b/changes/relays_as_bridges
deleted file mode 100644 (file)
index 6e8afb0..0000000
--- a/changes/relays_as_bridges
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Allow the use of regular relays as bridges. To achieve this, replace
-      routers with a purpose other than bridge with bridge descriptors when
-      fetching them. Bugfix on 0.1.1.9-alpha; fixes bug 1776.
-

diff --git a/changes/remove-debian b/changes/remove-debian
deleted file mode 100644 (file)
index 6eb1896..0000000
--- a/changes/remove-debian
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Removed files:
-    -  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 .
-

diff --git a/changes/split_orh b/changes/split_orh
deleted file mode 100644 (file)
index 1ebdaf6..0000000
--- a/changes/split_orh
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplifications and refactoring:
-    - 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.

diff --git a/changes/statsswitch b/changes/statsswitch
deleted file mode 100644 (file)
index 9260492..0000000
--- a/changes/statsswitch
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major features:
-    - Allow enabling or disabling *Statistics while Tor is running.
-