commit d8902c2e74845c5da5ab5066f57f22f8b209693a Merge: 81aeca7 d97f8d9 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 14 14:08:32 2019 -0500

Merge remote-tracking branch 'tor-github/pr/45'

dir-spec.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)