[tor-commits] [torspec/master] Merge remote-tracking branch 'dgoulet/ticket22060_01'

[nickm@xxxxxxxxxxxxxx]

commit 1fad82ef689b9883288e119d4accd3b5911a2be7
Merge: 21caa46 e949e60
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue May 9 10:43:08 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket22060_01'

 dir-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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