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

[nickm at torproject.org]

commit 4663bec5133058d0d349580dc0531a56db461f0c
Merge: cfd9c1b 492f8a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 16 08:39:31 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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