[tor-commits] [torspec/master] Merge remote-tracking branch 'asn-github/bug28142'

[nickm at torproject.org]

commit e1cb6341f97a18d362fe024b823dbd08b4724988
Merge: d8902c2 09814d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 15 12:24:20 2019 -0500

    Merge remote-tracking branch 'asn-github/bug28142'

 proposals/254-padding-negotiation.txt | 16 +++++++++++++++-
 tor-spec.txt                          |  6 ++++++
 2 files changed, 21 insertions(+), 1 deletion(-)