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

[nickm at torproject.org]

commit b0474572de5b9556144410a496e043eaa67f5ed9
Merge: 9d12bda b34c5c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 7 09:48:07 2016 -0800

    Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug17675          |    4 +
 changes/bug17906          |    4 +
 changes/bug17923          |    4 +
 changes/geoip-january2016 |    4 +
 configure.ac              |    1 -
 src/config/geoip          | 1734 +++++++++++++++++++++++++++++++++++----------
 src/config/geoip6         |  881 +++++++++++++++++------
 src/or/config.c           |    2 +-
 src/or/main.c             |    3 +
 9 files changed, 2032 insertions(+), 605 deletions(-)