[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6

nickm at torproject.org nickm at torproject.org
Fri Dec 9 13:35:29 UTC 2016


commit 3d9f8ff6a5c37e9f124f8111f904b97f095ca621
Merge: 6c2174d 3d2d3f2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 9 08:34:06 2016 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6

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





More information about the tor-commits mailing list