commit 573bd1f033d47a21a90340644480587e62817b68 Merge: 7f9a33a e625188 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 17 13:50:19 2015 -0400

Merge remote-tracking branch 'public/decouple_retry_directory'

changes/decouple_retry_directory | 6 ++++++ src/or/main.c | 11 +++++++++++ src/or/main.h | 1 + src/or/routerlist.c | 6 ++---- 4 files changed, 20 insertions(+), 4 deletions(-)