[tor-commits] [torspec/master] Merge remote-tracking branch 'teor/bug18456'

[nickm at torproject.org]

commit 8104db8f26f64a5436425dd07b0ebd34d34e969e
Merge: 75dc767 19df578
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 19:19:03 2016 -0400

    Merge remote-tracking branch 'teor/bug18456'

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