commit fe8eb9b366d9dccf06d8d4ce117b67bbb3aeba60 Merge: 45caeec dc0d2b5 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 25 09:21:25 2015 -0500

Merge remote-tracking branch 'public/decouple_dir_request_failed'

changes/bug17589 | 7 +++++++ src/or/directory.c | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-)