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

[nickm at torproject.org]

commit b49369badd28d5895f1d26b74be888298246b05a
Merge: f5fdf18 3d9f8ff
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 9 08:34:12 2016 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-december2016 |    4 +
 src/config/geoip           | 6259 ++++++++++++++++++++++++++------------------
 src/config/geoip6          | 1193 ++++++++-
 3 files changed, 4705 insertions(+), 2751 deletions(-)