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

[nickm at torproject.org]

commit 640214409930662456378f103a9ed3fc681453f3
Merge: 8efa933 adaf6a4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 9 08:35:10 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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