commit 1ee1c8fb4fc2e4855dba4387a58162656b5b9f0f Merge: 3727a97 b9f9110 Author: Nick Mathewson nickm@torproject.org Date: Sun Aug 25 00:29:49 2013 -0400

Merge remote-tracking branch 'public/bug9366' into maint-0.2.4

changes/bug9366 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+)