commit f0f70ba6f1e484a5217952238b22467ba4939d8a Merge: a6dac69 b44cb4a Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 11 14:44:26 2012 -0400

Merge branch 'bug5452'

changes/bug5452 | 4 ++++ src/or/config.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-)