commit 1a540b579248c04eba79c3e18d022054b238f6f5 Merge: 68d6720 e3ebae4 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Jun 5 12:00:08 2017 -0400
Merge branch 'maint-0.2.4' into maint-0.2.5
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
