[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6

[nickm@xxxxxxxxxxxxxx]

commit 52a99cb6c1e7cbcc33ed9dfd09fdcb7680f7d29b
Merge: 742ff2c e4d82da
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Sep 7 13:53:53 2016 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/geoip-september2016 |     4 +
 src/config/geoip            | 30846 +++++++++++++-----------------------------
 src/config/geoip6           |  2373 ++--
 3 files changed, 10566 insertions(+), 22657 deletions(-)



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