commit eb4ca1c16eb7983869bac9b4a0276e535d6f7dbe
Merge: 8a556f9 3913f95
Author: Nick Mathewson <[email protected]>
Date:   Fri Jun 9 09:58:45 2017 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

 changes/geoip-june2017 |    4 +
 src/config/geoip       | 5079 +++++++++++++++++++++++++-----------------------
 src/config/geoip6      | 1952 +++++++++++++++++--
 3 files changed, 4449 insertions(+), 2586 deletions(-)

_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to