commit 0c04416c11d79e8dc5fc9def6ea337f75526e397 Merge: 1365ff5 8c8e21e Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 10 14:08:29 2014 -0400

Merge branch 'bug11043_take2_squashed'

changes/bug11043 | 5 +++++ src/or/config.c | 25 ++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-)