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

[nickm at torproject.org]

commit f7f55acae96c391767fec94f8a1932b5d4645897
Merge: ad7db1077 43ebe54a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 5 11:04:59 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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