[tor-commits] [torspec/master] Merge remote-tracking branch 'karsten/hidserv-stats'

[nickm at torproject.org]

commit bc348154c63f46fc6cc56c49d339fcd0aab78f3d
Merge: b4d3d46 ddb630d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Mar 15 08:29:05 2015 -0400

    Merge remote-tracking branch 'karsten/hidserv-stats'

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