From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 18 Dec 2007 21:27:12 +0000 (+0000)
Subject:  r17233@catbus:  nickm | 2007-12-18 16:26:55 -0500
X-Git-Tag: tor-0.2.0.13-alpha~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbbf25db4d251ae25b8fe4d5a04f98cf72f7b855;p=thirdparty%2Ftor.git

 r17233@catbus:  nickm | 2007-12-18 16:26:55 -0500
 Changelog entry for geoip.


svn:r12858
---

diff --git a/ChangeLog b/ChangeLog
index cfe63f561f..b34ef3086d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,13 @@ Changes in version 0.2.0.13-alpha - 2007-12-??
       AlternateBridgeAuthority, and AlternateHSAuthority) that let the
       user selectively replace the default directory authorities, rather
       than the all-or-nothing replacement that DirServer offers.
+    - Tor can now be configured to read a GeoIP file from disk in one of two
+      formats.  This can be used by controllers to map IPs to countries.
+      Eventually, it may support exit-by-country.
+    - When possible, bridges remember which countries users are coming
+      from, and report aggregate information in their extra-info
+      documents, so that the bridge authorities can learn where Tor is
+      blocked.
 
   o Minor bugfixes:
     - The fix in 0.2.0.12-alpha cleared the "hsdir" flag in v3 network
diff --git a/doc/TODO b/doc/TODO
index 6d72844a16..9cb9231207 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -30,7 +30,7 @@ R   . spec
     d deploy
   . geoip caching and publishing for bridges
 R   . spec
-    - Implement
+    . Implement
       o Code to load a geoip file from disk
         o Truncated format
         o Full format.
@@ -40,8 +40,8 @@ R   . spec
       o Code to generate history lines
       o Controller interface
       - Track consecutive time up, not time since last-forgotten IP.
-      - Add log lines.
-    - Tests
+      o Add log lines.
+    o Tests
     - Mention in dir-spec.txt
     - Mention in control-spec.txt
     d let Vidalia use the geoip data too rather than doing its own