[tor-commits] [tor/release-0.2.1] fold in last two changes files

[arma at torproject.org]

commit feabf2eb6c79dca34bc9972d696020904da79ecd
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Feb 22 22:56:57 2011 -0500

    fold in last two changes files
---
 ChangeLog       |   13 ++++++++++++-
 changes/bug1859 |    9 ---------
 changes/bug2402 |    4 ----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 869365c..6c8af1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.1.30 - 2011-02-??
+Changes in version 0.2.1.30 - 2011-02-23
   o Major bugfixes:
     - Stop sending a CLOCK_SKEW controller status event whenever
       we fetch directory information from a relay that has a wrong clock.
@@ -25,11 +25,22 @@ Changes in version 0.2.1.30 - 2011-02-??
     - Check for and reject overly long directory certificates and
       directory tokens before they have a chance to hit any assertions.
       Bugfix on 0.2.1.28. Found by "doorss".
+    - 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. It also prevents 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.
 
   o Packaging changes:
     - Stop shipping the Tor specs files and development proposal documents
       in the tarball. They are now in a separate git repository at
       git://git.torproject.org/torspec.git
+    - Do not include Git version tags as though they are SVN tags when
+      generating a tarball from inside a repository that has switched
+      between branches. Bugfix on 0.2.1.15-rc; fixes bug 2402.
 
 
 Changes in version 0.2.1.29 - 2011-01-15
diff --git a/changes/bug1859 b/changes/bug1859
deleted file mode 100644
index 5b139f3..0000000
--- 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/bug2402 b/changes/bug2402
deleted file mode 100644
index f16f677..0000000
--- a/changes/bug2402
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (build)
-    - Do not include Git version tags as though they were SVN tags when
-      generating a tarball from inside a repository that has switched between
-      branches.  Bugfix on 0.2.1.15-rc; fixes bug 2402.