[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm@xxxxxxxxxxxxxx]

commit 7410adb330ae71ee70a63dfb76a3c446ff9e28f4
Merge: 6055bba ab98c43
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 6 09:59:49 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/geoip-october2016 |     4 +
 src/config/geoip          | 63919 +++++++++++++++++++++++++++++++++-----------
 src/config/geoip6         |  1496 +-
 3 files changed, 48664 insertions(+), 16755 deletions(-)

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