commit e5beb82e043cd14f69aace05d4d06784b0413802 Merge: e3a6e01 f4fccee Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 13 17:01:53 2012 -0400

Merge remote-tracking branch 'public/bug4663'

changes/bug4663 | 5 +++++ src/or/config.c | 9 +++++++++ 2 files changed, 14 insertions(+), 0 deletions(-)