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

[nickm at torproject.org]

commit 1e9df8e2d63370867171d195464e8e76f58f4a16
Merge: 96cd6c4 e4b793f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 09:32:11 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20533           |    7 +
 changes/bug20534           |    6 +
 changes/bug20536           |    6 +
 changes/bug20587           |    6 +
 changes/bug20591           |    3 +
 changes/geoip-november2016 |    4 +
 src/config/geoip           | 4025 ++++++++++++++++++++++++++++----------------
 src/config/geoip6          | 2490 ++++++++++-----------------
 src/or/directory.c         |   11 +-
 src/or/directory.h         |   12 +-
 src/or/networkstatus.c     |   19 +-
 11 files changed, 3465 insertions(+), 3124 deletions(-)