[tor-commits] [torspec/master] Merge remote-tracking branch 'mikeperry/padding_spec'

[nickm at torproject.org]

commit 2ffe30f0ef055481d4c4a8086dffc87359d99867
Merge: 3825d07 f9251c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 13:59:47 2017 -0400

    Merge remote-tracking branch 'mikeperry/padding_spec'

 dir-spec.txt                          |  40 +++++
 padding-spec.txt                      | 291 ++++++++++++++++++++++++++++++++++
 proposals/254-padding-negotiation.txt |  36 ++---
 tor-spec.txt                          |  25 ++-
 4 files changed, 367 insertions(+), 25 deletions(-)