[tor-commits] [torspec/master] Merge remote-tracking branch 'asn/bug14149'

[nickm@xxxxxxxxxxxxxx]

commit ddfd56998e75a9a789999d418015b7c9db7df43e
Merge: 3c0422a a1fd251
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 14 09:15:56 2015 -0500

    Merge remote-tracking branch 'asn/bug14149'

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

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