commit 27e42699296c1a024db294a77ebb1c0c0bbbd179 Merge: 58d2ced57 e1273d7d1 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 11 09:41:05 2018 -0500

Merge branch 'maint-0.3.5'

changes/ticket24803 | 5 + src/app/config/fallback_dirs.inc | 581 ++++++++++++++++++++++----------------- 2 files changed, 333 insertions(+), 253 deletions(-)