[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit f028434a5feb4b8db7c7219fe1b595a000dd4d03
Merge: 9d933bb 6494f33
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 7 13:54:21 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/geoip-september2016 |     4 +
 src/config/geoip            | 30846 +++++++++++++-----------------------------
 src/config/geoip6           |  2373 ++--
 3 files changed, 10566 insertions(+), 22657 deletions(-)