commit 233180a9ab3dac64560f4a90548f62bcbfec6ed8 Merge: d567796 368825f Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 21 12:36:41 2016 -0400

Merge remote-tracking branch 'public/bug18548'

changes/bug18548 | 12 ++++++++++++ src/or/config.c | 1 + src/or/main.c | 7 +++++++ 3 files changed, 20 insertions(+)