Browse Source

Merge branch 'maint-0.2.2'

Roger Dingledine 14 years ago
parent
commit
6d5478a8a7
3 changed files with 658 additions and 78 deletions
  1. 3 0
      changes/geoip-may2011
  2. 2 0
      doc/HACKING
  3. 653 78
      src/config/geoip

+ 3 - 0
changes/geoip-may2011

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update to the May 1 2011 Maxmind GeoLite Country database.
+

+ 2 - 0
doc/HACKING

@@ -435,6 +435,8 @@ interesting and understandable.
 
    Make stuff very terse
 
+   Make sure each section name ends with a colon
+
    Describe the user-visible problem right away
 
    Mention relevant config options by name.  If they're rare or unusual,

File diff suppressed because it is too large
+ 653 - 78
src/config/geoip


Some files were not shown because too many files changed in this diff