commit d0e7c545bacb45921569bf2236cc49d510530af4 Merge: d274f53 e035cea Author: Nick Mathewson nickm@torproject.org Date: Mon May 30 16:14:45 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.2'

changes/bug3216 | 4 ++++ src/or/connection.c | 26 +++++++++++++++++++------- src/or/router.c | 7 ++++++- 3 files changed, 29 insertions(+), 8 deletions(-)