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

nickm at torproject.org nickm at torproject.org
Mon Jun 5 16:03:25 UTC 2017


commit 0978889563e9986368dfe6d490fd3cf7912414b3
Merge: 183a62d 9ea3d08
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 12:00:34 2017 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug22490 | 3 +++
 src/or/geoip.c   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



More information about the tor-commits mailing list