commit e99deb888e172d01268b542f85b5af31497c1825 Merge: ff165e0 33c70fc Author: teor <teor@torproject.org> Date: Thu Jan 16 00:14:40 2020 +1000 Merge remote-tracking branch 'tor-github/pr/99' dir-list-spec.txt | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)