[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

[nickm at torproject.org]

commit b0fff2a9c52c92de1b4a304b2ed8ef175642c22c
Merge: 4b54ad0 64bfc29
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 13:36:57 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

 changes/bug13988                    |    3 +
 changes/bug14013                    |    6 +
 changes/bug14125                    |    5 +
 changes/bug14129                    |    7 +
 changes/bug14142-parse-virtual-addr |    7 +
 changes/bug14195                    |    3 +
 changes/bug14220                    |    4 +
 changes/bug14261                    |    5 +
 changes/bug15083                    |   10 +
 changes/bug15088                    |    4 +
 changes/geoip-january2015           |    3 +
 changes/geoip6-january2015          |    2 +
 changes/ticket14128                 |    5 +
 changes/ticket14487                 |    3 +
 src/common/crypto.c                 |    6 +
 src/common/sandbox.c                |    1 +
 src/common/tortls.c                 |   22 +
 src/common/util.c                   |    3 +
 src/config/geoip                    |12872 ++++++++++++++---------------------
 src/config/geoip6                   | 1263 +++-
 src/or/addressmap.c                 |    8 +-
 src/or/buffers.c                    |   11 +-
 src/or/config.c                     |    2 +-
 src/or/control.c                    |   53 +
 src/or/control.h                    |    1 +
 src/or/directory.c                  |    9 +-
 src/or/dirserv.c                    |    2 +-
 src/or/dns.c                        |    6 +-
 src/or/rephist.c                    |    4 +-
 src/test/test_relaycell.c           |    2 +-
 src/test/test_util.c                |    2 +-
 31 files changed, 6255 insertions(+), 8079 deletions(-)