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

[nickm@xxxxxxxxxxxxxx]

commit b05bb04a829250d795e4e81c9228dff57cbad7a5
Merge: b45500c6c a48ae2aa6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Aug 1 11:19:29 2017 -0400

    Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux

 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