commit 9ba69be96c102ff47c79f8e332127599d8ebe18e
Merge: d63746812 1c5c5f0e5
Author: Nick Mathewson <[email protected]>
Date: Mon Jan 8 11:10:53 2018 -0500
Merge branch 'maint-0.3.2'
There was a merge conflict on fallback_dirs.inc, which we resolve in
favor of the newly generated version for #24801.
changes/ticket_24801 | 5 +
src/or/fallback_dirs.inc | 635 +++++++++++++++++++++++------------------------
2 files changed, 322 insertions(+), 318 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
