commit 764cebb4d9a3f7b16d4735b9ef8a656bc921e217 Merge: 2937de2 1196ed7 Author: Nick Mathewson <[email protected]> Date: Wed Aug 20 09:00:41 2014 -0400
Merge remote-tracking branch 'public/bug12700_024'
changes/bug12700 | 10 ++++++++++
src/or/relay.c | 8 +++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
