[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit ef87966ec022d66077d8832a616026bcc51d354b
Merge: 30ecd9096 4991b2931
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 11 09:41:04 2018 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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