[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

nickm at torproject.org nickm at torproject.org
Wed Dec 20 17:15:41 UTC 2017


commit 5e92646715f32cae4d4d7f4f9a0f09108b8ddd73
Merge: 31ce03a2b 08ed0d793
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 12:15:24 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/geoip-2017-12-06 |     4 +
 src/config/geoip         | 12380 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  3373 +++++++++---
 3 files changed, 10033 insertions(+), 5724 deletions(-)





More information about the tor-commits mailing list