commit 6777cd0a8486a4930ec3020fdf31dc2be1c34f9b Merge: b11f00c d183ec2 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 2 09:03:13 2017 -0500

Merge remote-tracking branch 'public/bug21356_029'

changes/ticket21356 | 4 ++++ src/or/main.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)