commit 480aa722c56ea9da9cb7400de5934bed012758a8 Merge: 0633d14 a7bcab2 Author: Nick Mathewson nickm@torproject.org Date: Tue May 16 08:39:15 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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