commit 44102714460aafe59d77fdba0b1101a7bea8ab75 Merge: 61a367c 503f101 Author: Nick Mathewson nickm@torproject.org Date: Fri May 12 08:40:30 2017 -0400

Merge branch 'ticket21953_029'

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