commit 62d241ad22b173ee908ad9cc2c55f5b10d22c2d9 Merge: 66a564f 175451d Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 13 16:58:45 2017 -0400

Merge remote-tracking branch 'isis/bug19476'

changes/bug19476 | 3 +++ src/or/config.c | 4 ---- src/or/config.h | 4 ++++ src/or/main.c | 19 ++++++++++++++----- 4 files changed, 21 insertions(+), 9 deletions(-)