commit 169a93fff2510cf0eae76cdd198c19687bb1e875 Merge: 8384f4d e030632 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 19 07:30:42 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

changes/ticket20170-v3 | 5 + src/or/fallback_dirs.inc | 392 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 272 insertions(+), 125 deletions(-)