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

[nickm@xxxxxxxxxxxxxx]

commit b2fa807b99241198911d004097668dc997dfa94d
Merge: bf3a6643e fde551a38
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Aug 9 08:47:25 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/geoip-2018-08-07 |     4 +
 src/config/geoip         | 14291 ++++++++++++++++++++++++++-------------------
 src/config/geoip6        |   974 ++-
 3 files changed, 9063 insertions(+), 6206 deletions(-)

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