commit ae608408e93296dfe123c69fbd3dae02d50d9c66 Merge: 8e100d1a1 43c34dfca Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:43:41 2017 -0500

Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1

changes/bug23682 | 5 +++++ src/or/directory.c | 4 ++-- src/or/main.c | 18 +++++++++--------- 3 files changed, 16 insertions(+), 11 deletions(-)