[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
commit 0978889563e9986368dfe6d490fd3cf7912414b3
Merge: 183a62d 9ea3d08
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Mon Jun 5 12:00:34 2017 -0400
Merge branch 'maint-0.2.6' into release-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