commit 9485b1b3fe580c2840da9a1d53148afc20347419 Merge: bbb6d34 b927962 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 7 14:28:23 2017 -0500 Merge remote-tracking branch 'asn/ticket24118_01' dir-spec.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)