[tor-commits] [torspec/master] Merge remote-tracking branch 'tpo-mikeperry/padding_negotiation-squashed'

[isis at torproject.org]

commit 45407cd6ad108aeae9d11e2df6db902d0fbb20b1
Merge: 887d1c1 8ee79e0
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Sep 25 11:33:16 2015 +0000

    Merge remote-tracking branch 'tpo-mikeperry/padding_negotiation-squashed'

 proposals/xxx-padding-negotiation.txt |  628 +++++++++++++++++++++++++++++++++
 1 file changed, 628 insertions(+)