commit c55a0542369d01f39472cc502c8e27ff85250dc6 Merge: 3bca705c5 7ae9e92ff Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:41:28 2017 -0500

Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0

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