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

[nickm at torproject.org]

commit aec45bc0b1d5c694b107373f8d6e3ddd1372defc
Merge: 8a1f087 f7ed4a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 17 17:10:47 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7-redux

 changes/bug20384           |    10 +
 changes/geoip-february2017 |     4 +
 changes/trove-2017-001.2   |     8 +
 src/config/geoip           | 10832 ++++++++++++++++++++++++-------------------
 src/config/geoip6          |  1651 ++++++-
 src/or/routerparse.c       |    49 +-
 6 files changed, 7399 insertions(+), 5155 deletions(-)