Commit 5ddb9b31 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.2' into maint-0.2.3

parents 27ec0248 4e7552e5

changes/revert-geoip-may2012

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Major bugfixes:

    - Revert to the May 1 2012 Maxmind GeoLite Country database. In the

      June 2012 database, Maxmind marked many Tor relays as country "A1",

      which will cause risky behavior for clients that set EntryNodes

      or ExitNodes. Addresses bug 6334; bugfix on 0.2.3.17-beta.

src/config/geoip

+22128 −13352

File changed.

Preview size limit exceeded, changes collapsed.