[tor-commits] [torspec/master] Merge branch 'ticket25095_01_squashed'

[nickm@xxxxxxxxxxxxxx]

commit 9ebb361fd9b4489165215c7679d54dccfb074860
Merge: d4a64fb ed14d85
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Mar 3 11:55:29 2018 -0500

    Merge branch 'ticket25095_01_squashed'

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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits