commit f249074e419a7f7fe6d0943516cc5d53a88ed435 Merge: 4b8282e b336e8c Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 25 12:03:42 2013 -0400

Merge remote-tracking branch 'Ryman/bug5605'

changes/bug5605 | 2 ++ src/or/config.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)