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

[nickm at torproject.org]

commit f20b35ccd3c305e7c7b4410575da54b3f02476ff
Merge: a43c172 d92f97b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 20 10:49:32 2015 -0500

    Merge remote-tracking branch 'teor/reject-private'

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