commit d29f494ec28159281a7ff57f72dd7f50028913d7 Merge: 7bb2cd0 492f8a7 Author: Nick Mathewson nickm@torproject.org Date: Tue May 16 08:39:36 2017 -0400

Merge branch 'maint-0.3.0'

changes/ticket21564 | 6 ++ src/or/fallback_dirs.inc | 179 +++++++++++++++++------------------------------ 2 files changed, 69 insertions(+), 116 deletions(-)