[tor-commits] [tor/master] Move errant doc/nodefamily_routerset into 0.2.3.1-alpha ChangeLog. Fix bug 3373

[nickm at torproject.org]

commit 74239f61d24feb7dc8c77c9f3e2ef1a8c2c46039
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 10 01:04:12 2011 -0400

    Move errant doc/nodefamily_routerset into 0.2.3.1-alpha ChangeLog. Fix bug 3373
---
 ChangeLog                |    3 +++
 doc/nodefamily_routerset |    4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e3b312..226d4eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -326,6 +326,9 @@ Changes in version 0.2.3.1-alpha - 2011-05-05
       bidirectional use of connections to disk every 24 hours.
     - Add a GeoIP file digest to the extra-info descriptor. Implements
       enhancement 1883.
+    - The NodeFamily option -- which let you declare that you want to
+      consider nodes to be part of a family whether they list themselves
+      that way or not -- now allows IP address ranges and country codes.
     - Add a new 'Heartbeat' log message type to periodically log a message
       describing Tor's status at level Notice. This feature is meant for
       operators who log at notice, and want to make sure that their Tor
diff --git a/doc/nodefamily_routerset b/doc/nodefamily_routerset
deleted file mode 100644
index 0af62e1..0000000
--- a/doc/nodefamily_routerset
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features
-    - The NodeFamily option -- which let you declare that you want to
-      consider nodes to be part of a family whether they list themselves
-      that way or not -- now allows IP address ranges and country codes.