commit 209229f100d20958d0826d4f6773d7f6b3a43ade Merge: 64bfbcb 227896e Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 17 14:59:39 2011 -0400
Merge branch 'bug3407' into maint-0.2.2
changes/fix-connection_printf_to_buf | 15 ++++++++ src/or/control.c | 66 +++++++++++---------------------- 2 files changed, 37 insertions(+), 44 deletions(-)
tor-commits@lists.torproject.org