[tor-commits] [torspec/master] Merge branch '26860-decryption-order-squashed'

[nickm at torproject.org]

commit 7ced6190ea1df2ae8f26ef5842a5ef4fb7e7e627
Merge: ce1d4a8 03b884b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 20 10:39:39 2018 -0400

    Merge branch '26860-decryption-order-squashed'

 tor-spec.txt | 98 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 71 insertions(+), 27 deletions(-)