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

[nickm at torproject.org]

commit 76ad2dadc446bedd9c04b1216f9670aa1bf361f0
Merge: 43d27f2 e7aaf14
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 14:36:44 2017 -0500

    Merge remote-tracking branch 'dgoulet/ticket19925_01'

 control-spec.txt | 8 ++++++++
 1 file changed, 8 insertions(+)