commit 8be8cc50ed86fe939d7d32e364a5193e34178216 Merge: 12b68854a c1f919158 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 11 09:41:05 2018 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket24803 | 5 + src/or/fallback_dirs.inc | 581 ++++++++++++++++++++++++++--------------------- 2 files changed, 333 insertions(+), 253 deletions(-)