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

[nickm@xxxxxxxxxxxxxx]

commit adaf6a422af84a7402c2199d2c9be89a7e3f9e02
Merge: 9bb3bcb 56a2b8d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Dec 9 08:34:24 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-december2016 |    4 +
 src/config/geoip           | 6259 ++++++++++++++++++++++++++------------------
 src/config/geoip6          | 1193 ++++++++-
 3 files changed, 4705 insertions(+), 2751 deletions(-)



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