[tor-commits] [torspec/master] Merge remote-tracking branch 'jryans/getinfo-program-name'

[nickm at torproject.org]

commit a129533e0ce7c530139cdbcbfa9e24e90f5dcc05
Merge: f2756e0 c5ff1b1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 09:27:19 2017 -0500

    Merge remote-tracking branch 'jryans/getinfo-program-name'

 control-spec.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)