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

[nickm at torproject.org]

commit 91c17ffbd61348e63cac81e90583f0b22b3c17d4
Merge: d6bdec159 2e21493a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 5 11:04:59 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-october2017 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)