[tor-commits] [tor/master] Merge branch 'bug20059_024_v2' into maint-0.3.0

[nickm at torproject.org]

commit 567a56ae2e59aef26b31829f300c5700c7923f7b
Merge: 9281394 ec5fe41
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 15 11:07:38 2017 -0400

    Merge branch 'bug20059_024_v2' into maint-0.3.0

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