[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/84'

[nickm at torproject.org]

commit 438aed98a0616a364b5e632fea74c5024010f1a3
Merge: 4707f36 b940965
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 1 14:19:23 2019 -0400

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

 dir-list-spec.txt | 52 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 9 deletions(-)