commit 86c4b750da6f25a0fb5291146dd60f151ae5ad7d Merge: b395b59 dd3f4f1 Author: Nick Mathewson <ni...@torproject.org> Date: Wed Apr 11 10:04:31 2012 -0400
Merge branch 'bug5593' into maint-0.2.2
changes/bug5593 | 3 +++
src/or/connection.c | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
