commit 133e1e870bd59e3a89d5a7712983d3f9bf35f7c3 Merge: 77bb85ba8 5b03c7ba6 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 11 09:39:57 2017 -0400

Merge remote-tracking branch 'dgoulet/bug23091_032_01'

changes/bug23091 | 6 ++++++ src/or/main.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)