commit c81b1358e706da65b5a513bc8fd851c62e0645b0 Merge: 94cb879 6057fb2 Author: Nick Mathewson nickm@torproject.org Date: Sat Mar 26 08:17:19 2016 -0400

Merge branch 'bug18649_squashed'

src/or/directory.c | 44 +++++++++++++++++++++++++++++++++++--------- src/or/main.c | 10 ++++++++-- 2 files changed, 43 insertions(+), 11 deletions(-)