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

[nickm@xxxxxxxxxxxxxx]

commit 4a19498edcc4bac02582bc351502803cad2bcc98
Merge: 2cb8c8d99 9d24a352c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Aug 1 11:19:30 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/geoip-july2017 |     4 +
 src/config/geoip       | 10075 ++++++++++++++++++++++++++++++++---------------
 src/config/geoip6      |   694 +++-
 3 files changed, 7530 insertions(+), 3243 deletions(-)



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