fold the changes files into a changelog

10 files changed, 48 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a1255a8e..843c732da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+Changes in version 0.2.2.18-rc - 2010-11-1?
+  o Major bugfixes:
+    - Avoid a crash bug triggered by looking at a dangling pointer while
+      setting the network status consensus. Found by Robert Ransom.
+      Bugfix on 0.2.2.17-alpha. Fixes bug 2097.
+
+  o Minor bugfixes (on Tor 0.2.1.x and earlier):
+    - When we're trying to guess whether we know our IP address as
+      a relay, we would log various ways that we failed to guess
+      our address, but never log that we ended up guessing it
+      successfully. Now add a log line to help confused and anxious
+      relay operators. Bugfix on 0.1.2.1-alpha; fixes bug 1534.
+    - Bring the logic that gathers routerinfos and assesses the
+      acceptability of circuits into line. This prevents a Tor OP from
+      getting locked in a cycle of choosing its local OR as an exit for a
+      path (due to a .exit request) and then rejecting the circuit because
+      its OR is not listed yet. Also prevent Tor clients from using an OR
+      running in the same instance as an exit (due to a .exit request)
+      if the OR does not meet the same requirements expected of an OR
+      running elsewhere. Fixes bug 1859; bugfix on 0.1.0.1-rc.
+    - Correctly describe errors that occur when generating a TLS object
+      when logging them. Previously we would attribute them to a failure
+      while generating a TLS context. Patch by Robert Ransom. Bugfix on
+      0.1.0.4-rc; fixes bug 1994.
+    - Fix warnings that newer versions of autoconf produced during
+      ./autogen.sh. These warnings appear to be harmless in our case,
+      but they were extremely verbose. Fixes bug 2020.
+
+  o Minor bugfixes (on Tor 0.2.2.x):
+    - Enable protection of small arrays whenever we build with gcc
+      hardening features, not only when also building with warnings
+      enabled. Fixes bug 2031; bugfix on 0.2.2.14-alpha. Reported by keb.
+    - Fix a logic error where servers that _didn't_ act as exits would
+      try to keep their server lists more aggressively up to date than
+      exits, when it was supposed to be the other way around. Bugfix
+      on 0.2.2.17-alpha.
+
+  o Minor features:
+    - Update to the November 1 2010 Maxmind GeoLite Country database.
+
+  o Code simplifications and refactoring:
+    - When we fixed bug 1038 we had to put in a restriction not to send
+      RELAY_EARLY cells for relay cells on rend circuits. This was
+      necessary as long as relays using Tor 0.2.1.3-alpha through
+      0.2.1.18-alpha were active. Since this isn't the case anymore,
+      we unify our behaviour here. Resolves bug 2081.
+
+
 Changes in version 0.2.2.17-alpha - 2010-09-30
   Tor 0.2.2.17-alpha introduces a feature to make it harder for clients
   to use one-hop circuits (which can put the exit relays at higher risk,
diff --git a/changes/bug1534 b/changes/bug1534
deleted file mode 100644
index 523391f4e..000000000
--- a/changes/bug1534
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - When we're trying to guess whether we know our IP address as
-      a relay, we would log various ways that we failed to guess
-      our address, but never log that we ended up guessing it
-      successfully. Now add a log line to help confused and anxious
-      relay operators. Bugfix on 0.1.2.1-alpha; fixes bug 1534.
diff --git a/changes/bug1859 b/changes/bug1859
deleted file mode 100644
index 5b139f357..000000000
--- a/changes/bug1859
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-    - Bring the logic that gathers routerinfos and assesses the
-      acceptability of circuits into line. This prevents a Tor OP from getting
-      locked in a cycle of choosing its local OR as an exit for a path (due to
-      a .exit request) and then rejecting the circuit because its OR is not
-      listed yet. Also prevent Tor clients from using an OR running in the same
-      instance as an exit (due to a .exit request) if the OR does not meet the
-      same requirements expected of an OR running elsewhere.
-      Fixes bug 1859; bugfix on 0.2.0-alpha.
diff --git a/changes/bug1994 b/changes/bug1994
deleted file mode 100644
index 07095aa7c..000000000
--- a/changes/bug1994
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Correctly describe errors that occur when generating a TLS object
-      when logging them.  Previously we would attribtue them to a failure
-      while generating a TLS context.  Bugfix by Robert Ransom.  Bugfix 
-      on 0.1.0.4-rc.
-
diff --git a/changes/bug2020 b/changes/bug2020
deleted file mode 100644
index 51c4d0611..000000000
--- a/changes/bug2020
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix warnings that newer versions of autoconf produced during
-      ./autogen.sh. From what I can tell these were harmless in our case,
-      but they were extremely verbose.  Fixes bug 2020.
-
diff --git a/changes/bug2031 b/changes/bug2031
deleted file mode 100644
index 59afc022e..000000000
--- a/changes/bug2031
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Enable protection of small arrays whenever we build with gcc hardening
-      features, not only when also building with warnings enabled. Fixes bug
-      2031; bugfix on 0.2.2.14-alpha. Reported by keb.
-
diff --git a/changes/caches_if_exit b/changes/caches_if_exit
deleted file mode 100644
index 0e662270e..000000000
--- a/changes/caches_if_exit
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix a logic error where servers that _didn't_ act as exits would
-      try to keep their server lists more aggressively up to date than
-      exits, when it was supposed to be the other way around. Bugfix
-      on 0.2.2.17-alpha.
diff --git a/changes/geoip-nov2010 b/changes/geoip-nov2010
deleted file mode 100644
index e77da6e27..000000000
--- a/changes/geoip-nov2010
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the November 1 2010 Maxmind GeoLite Country database.
-
diff --git a/changes/relay_early_rend b/changes/relay_early_rend
deleted file mode 100644
index 411a0f640..000000000
--- a/changes/relay_early_rend
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Code simplifications and refactorting:
-    - When we fixed bug 1038 we had to put in a restriction not to send
-      RELAY_EARLY cells for relay cells on rend circuits. This was necessary
-      as long as relays using Tor 0.2.1.3-alpha through 0.2.1.18-alpha were
-      active. Since this isn't the case anymore, we unify our behaviour here.
-      Implements bug 2081.
diff --git a/changes/set_ns_crash b/changes/set_ns_crash
deleted file mode 100644
index 34466d7ad..000000000
--- a/changes/set_ns_crash
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Avoid a crash bug triggered by looking at a dangling pointer while
-      setting the network status consensus. Found by Robert Ransom.
-      Bugfix on 0.2.2.17-alpha.  Fixes bug 2097.