[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

[nickm at torproject.org]

commit e1273d7d1ba5cced68b0b035176ee20fc3367681
Merge: c1f86f749 6506b1ee9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 11 09:41:05 2018 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5

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