commit c1f9191581eae2d04a4ffacf7a7066a16c9f5eae
Merge: 00341d97f 4991b2931
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Dec 11 09:41:04 2018 -0500
Merge branch 'maint-0.2.9' into maint-0.3.3
changes/ticket24803 | 5 +
src/or/fallback_dirs.inc | 581 ++++++++++++++++++++++++++---------------------
2 files changed, 333 insertions(+), 253 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
