diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-12-14 14:13:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-12-14 14:13:24 -0500 |
| commit | ddfb398494ddf9d514a3ff16ade69c619c659ce7 (patch) | |
| tree | 45911580587109996cbf8b7a06baf0302099152e /changes | |
| parent | f924fbf19f1244eed568bc799f77d8fb288c801d (diff) | |
| parent | 35148ba5329eef357bd020d1ef5f2d10a1c28693 (diff) | |
| download | tor-ddfb398494ddf9d514a3ff16ade69c619c659ce7.tar.gz tor-ddfb398494ddf9d514a3ff16ade69c619c659ce7.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/config/geoip
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/geoip-dec2010 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/geoip-dec2010 b/changes/geoip-dec2010 new file mode 100644 index 0000000000..d6247cee6b --- /dev/null +++ b/changes/geoip-dec2010 @@ -0,0 +1,3 @@ + o Minor features: + - Update to the December 1 2010 Maxmind GeoLite Country database. + |