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

[nickm at torproject.org]

commit 91f06ba2806cf4f1d714072aee8b9f069dc61d92
Merge: 5d0237f 2639fd0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 09:31:47 2016 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-november2016 |    4 +
 src/config/geoip           | 4025 ++++++++++++++++++++++++++++----------------
 src/config/geoip6          | 2490 ++++++++++-----------------
 3 files changed, 3407 insertions(+), 3112 deletions(-)