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

[nickm@xxxxxxxxxxxxxx]

commit 7a4741c2336341449212f635672102d5ba391276
Merge: bdf60fc7c f7f55acae
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 5 11:04:59 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits