[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma at torproject.org]

commit 7067f53d424820566c41412c637177b823a52c10
Merge: fd35354 8f9fb63
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Oct 16 18:51:15 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug9946           |   11 +
 changes/geoip-october2013 |    3 +
 src/config/geoip          | 2019 ++++++++++++++++++++++++++++-----------------
 src/or/entrynodes.c       |   22 +-
 4 files changed, 1273 insertions(+), 782 deletions(-)