[tor-commits] [torspec/master] Merge remote-tracking branch 'houqp/hs_spec'

[nickm@xxxxxxxxxxxxxx]

commit 3d291cfe31763abd0f09acb1d1524b2218fe5304
Merge: 7ab099c a67ac4d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Feb 3 12:39:09 2014 -0500

    Merge remote-tracking branch 'houqp/hs_spec'

 control-spec.txt |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

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