commit 3f2d1f7f0730a17b81d2fb94df9b6a5b8b277893 Merge: 71dd1d7 9ea3d08 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Jun 5 12:00:41 2017 -0400
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
changes/bug22490 | 3 +++
src/or/geoip.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
