[tor-commits] [tor/master] Merge branch 'bug23106_032'

[nickm at torproject.org]

commit b5c5086aba2fa24649fcbda7db80ef599d56e3c6
Merge: 35a29e81a 3b646bf88
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 24 09:45:03 2017 -0400

    Merge branch 'bug23106_032'

 changes/bug23106 | 5 +++++
 src/or/onion.c   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)