[tor-commits] [tor/master] Merge remote-tracking branch 'isis/bug4019'

[nickm at torproject.org]

commit 89d0261eb5abe75e798a120793df5df64a7c770f
Merge: 80360ed 424c458
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 23 14:38:20 2017 -0400

    Merge remote-tracking branch 'isis/bug4019'

 changes/bug4019 | 4 ++++
 src/or/config.c | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)