commit a7bcab263959887b27500372bc6fa1fa0f8c947b
Merge: 8f5da80 5b45d73
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue May 16 08:38:59 2017 -0400
Merge branch 'maint-0.2.8' into maint-0.2.9
changes/ticket21564 | 6 ++
src/or/fallback_dirs.inc | 179 +++++++++++++++++------------------------------
2 files changed, 69 insertions(+), 116 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
