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

[nickm at torproject.org]

commit 7bb4422a93eb347a944a25e1451c882e3060d5cb
Merge: a378b22 11f63d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 7 09:47:36 2016 -0800

    Merge branch 'maint-0.2.4' into release-0.2.4

 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/routerlist.c         |   10 +-
 15 files changed, 23690 insertions(+), 11453 deletions(-)