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

[arma at torproject.org]

commit 4ef52cc16759eb75523b9694d75d051c01ba994c
Merge: 4428a14 d7950ed
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Feb 25 15:05:06 2014 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/10777_netunreach              |    7 +
 changes/bug10777_internal_024         |    4 +
 changes/bug10904                      |    5 +
 changes/bug10929                      |    6 +
 changes/feature9777                   |    3 +
 changes/geoip-february2014            |    3 +
 changes/geoip-february2014-regcountry |    3 +
 changes/geoip6-february2014           |    3 +
 configure.ac                          |    2 +-
 src/common/compat.h                   |    2 +
 src/common/container.h                |   46 +-
 src/config/geoip                      |19698 +++++++++++++++++----------------
 src/config/geoip6                     | 7834 +++++++++++--
 src/ext/ht.h                          |   16 +-
 src/or/circuitbuild.c                 |   77 +-
 src/or/circuitlist.c                  |   10 +-
 src/or/circuitlist.h                  |    1 +
 src/or/reasons.c                      |    5 +-
 src/or/relay.c                        |    6 +-
 19 files changed, 17361 insertions(+), 10370 deletions(-)