Merge branch 'maint-0.2.2'

This commit is contained in:
Roger Dingledine 2011-05-10 23:06:12 -04:00
commit 6d5478a8a7
3 changed files with 4394 additions and 2090 deletions

3
changes/geoip-may2011 Normal file
View File

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

View File

@ -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 Load Diff