commit 31b9b1a5bb3d3fb60e39f5a789ee4fbc2009f6a4
Merge: a857f61 209229f
Author: Nick Mathewson <[email protected]>
Date: Fri Jun 17 15:04:29 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/fix-connection_printf_to_buf | 15 ++++++++
src/or/connection_or.c | 5 ++-
src/or/control.c | 66 +++++++++++----------------------
3 files changed, 41 insertions(+), 45 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
