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

[nickm at torproject.org]

commit 492f8a7c448dbdbea1966bdb9fd1775d3cda16fb
Merge: 8324631 a7bcab2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 16 08:39:22 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket21564      |   6 ++
 src/or/fallback_dirs.inc | 179 +++++++++++++++++------------------------------
 2 files changed, 69 insertions(+), 116 deletions(-)