commit 2ffdf43e705d416142683c414fbc18f937834cdc
Merge: f3ea41211 b85fa0bd5
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Jan 8 11:10:36 2018 -0500
Merge branch 'maint-0.3.0' into release-0.3.0
changes/ticket_24801 | 5 +
src/or/fallback_dirs.inc | 968 ++++++++++++++++++++++++++++++++++-------------
2 files changed, 717 insertions(+), 256 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
