commit e30a4311e2ebf2f33eea1228e2fc08e2b96cc094 Merge: 8c09923 6b4af10 Author: Nick Mathewson nickm@torproject.org Date: Thu May 10 14:07:23 2012 -0400

Merge remote-tracking branch 'linus/bug5146'

src/or/router.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)