commit 293aca9929cfa0205d16899191c16855a607ac77 Merge: e4b793f e51f105 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 7 11:01:31 2016 -0500

Merge branch 'bug20534_029_squashed' into maint-0.2.9

changes/bug20534 | 6 ++++-- changes/bug20593 | 6 ++++++ src/or/config.c | 4 ++-- src/or/directory.c | 28 ++++++++++++++++++---------- 4 files changed, 30 insertions(+), 14 deletions(-)