commit 2819e9467e229c2469b6fb0fd584f5cf020ffd3e Merge: 5051cfe9b d99ccf090 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 2 09:54:56 2018 -0500

Merge remote-tracking branch 'teor/bug24762'

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