commit dd22ab519ab9ac7affa3bd775b6021049ebe7dd9 Merge: 8391c96 1196ed7 Author: Nick Mathewson <[email protected]> Date: Tue Sep 9 10:51:39 2014 -0400
Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
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
