commit bc6c7ea74ec1b62c7a6ca817e9c5695bafc57af3 Merge: e7b4358 0eca873 Author: Roger Dingledine arma@torproject.org Date: Thu Jul 18 23:36:05 2013 -0400

Merge branch 'maint-0.2.4' into release-0.2.4

changes/bug9200 | 5 + changes/bug9254 | 4 + changes/bug9295 | 4 + changes/geoip-july2013 | 3 + doc/tor.1.txt | 2 +- src/config/geoip | 2201 +++++++++++++++++++++++++++++++----------------- src/or/circuitlist.c | 6 +- src/or/config.c | 1 + src/or/dirvote.c | 14 +- 9 files changed, 1456 insertions(+), 784 deletions(-)