commit b2a466b9af62c0f633af76d66f121902b5fd941b Merge: a76eaa6 2b2ad53 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 8 09:38:40 2018 -0500

Merge remote-tracking branch 'teor/fallback-format-2-v4'

dir-list-spec.txt | 451 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 451 insertions(+)