commit 7e7683b254f8124e0115c9112488e47bff2b1d22 Merge: a5ed8b1 2ec5e24 Author: Nick Mathewson <[email protected]> Date: Thu Oct 15 13:56:41 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
changes/bug17354 | 4 ++++
src/or/main.c | 1 +
2 files changed, 5 insertions(+)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
