commit 56df12393304469e18e8417ae0781c164090522a Merge: 42394053c 9e900d1db Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 5 08:24:28 2017 -0400

Merge branch 'bug23331_032_01_squashed'

src/or/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)