commit b104ea724dedebe49db299474abfd950ca0da0cb Merge: 33b69e6 1a540b5 Author: Nick Mathewson <[email protected]> Date: Mon Jun 5 12:00:14 2017 -0400
Merge branch 'maint-0.2.5' into release-0.2.5
changes/bug22490 | 3 +++
src/or/geoip.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
