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

[nickm at torproject.org]

commit 44019d73ff56fddb389509d30f0d304e78cd9939
Merge: 87b2047f9 f7f55acae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 5 11:04:59 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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