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

[nickm at torproject.org]

commit 40718f2499d85f10f6a708ee0267b2fbd15998b6
Merge: 5639f3a 9994404
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 16:19:13 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/20460              | 4 ++--
 changes/bug20587           | 1 -
 changes/bug20588           | 2 +-
 changes/geoip-november2016 | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)