[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

[nickm@xxxxxxxxxxxxxx]

commit 4da2f89f9522e41212ad32d52cb7cc1b08bc1b06
Merge: 9e46158 7c3f210
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Oct 9 10:18:42 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/geoip-october2015 |    3 +
 src/config/geoip          | 7429 +++++++++++++++++++++++++++++----------------
 src/config/geoip6         |  863 ++++--
 3 files changed, 5447 insertions(+), 2848 deletions(-)

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