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

[nickm@xxxxxxxxxxxxxx]

commit 9ea3d0877a5be2762cfcb4d7c2015e5ec43a2055
Merge: 159ddf6 1a540b5
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jun 5 12:00:27 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

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




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits