30 May
2011
30 May
'11
8:13 p.m.
commit e035cea0318add5cf8ed8d8f1c518a26434cbeda Merge: d35a555 0e1fad6 Author: Nick Mathewson nickm@torproject.org Date: Mon May 30 16:12:53 2011 -0400
Merge branch 'bug3216_v2' into maint-0.2.2
changes/bug3216 | 4 ++++ src/or/connection.c | 26 +++++++++++++++++++------- src/or/router.c | 7 ++++++- 3 files changed, 29 insertions(+), 8 deletions(-)