commit 23fb084cb2d7d20d906106b2eb7676f455f333e1 Merge: da04fed b65d535 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 12 11:02:27 2015 -0400

Merge branch 'ticket16762_squashed'

changes/decouple_dir_all_unreachable | 4 ++++ src/or/main.c | 44 ++++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 10 deletions(-)