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

[nickm at torproject.org]

commit 01d592143560ef650dad0827cb4b0d50a276a1b2
Merge: c79976b 9ca3295
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 7 09:47:44 2016 -0800

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug15823                          |    4 +
 changes/bug16360-failed-crypto-early-init |    7 +
 changes/bug17772                          |    7 +
 changes/bug17781                          |    3 +
 changes/bug17906                          |    4 +
 changes/geoip-december2015                |    4 +
 changes/geoip-january2016                 |    4 +
 changes/geoip-july2015                    |    3 +
 changes/geoip-june2015                    |    3 +
 changes/geoip-october2015                 |    3 +
 changes/geoip-september2015               |    3 +
 changes/geoip6-june2015                   |    3 +
 src/config/geoip                          |28651 ++++++++++++++++++-----------
 src/config/geoip6                         | 6441 +++++--
 src/or/config.c                           |    2 +-
 src/or/connection_edge.c                  |    2 +-
 src/or/main.c                             |    2 +-
 src/or/rendservice.c                      |   18 +-
 src/or/routerlist.c                       |   10 +-
 19 files changed, 23716 insertions(+), 11458 deletions(-)