[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/41'

[nickm at torproject.org]

commit 9d8c044057807abfd9407d2b23acf6b95b142c1d
Merge: 14881dc 98e6c66
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 6 15:25:52 2018 -0500

    Merge remote-tracking branch 'tor-github/pr/41'

 proposals/254-padding-negotiation.txt | 717 ++++++++++++----------------------
 1 file changed, 242 insertions(+), 475 deletions(-)