commit f5bd987c7563e024d68cb5e49c181ca8ef37a774 Merge: 100ff4a92 16bdb9e36 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 11:18:02 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

changes/bug23470 | 6 ++++++ src/or/directory.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-)