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