commit 33fcc0f61d1feb2fbdf3153c7c64780dcdce6767 Merge: 5b45d73 3f2d1f7 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Jun 5 12:01:17 2017 -0400
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
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
