commit 96d39fd236d3e4f72b164ddcf7735cf833bef749 Merge: 96e8e30 f1caa2f Author: Nick Mathewson <[email protected]> Date: Tue Mar 19 16:44:00 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug7350 | 4 ++++
src/or/channel.c | 24 ++++++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
