[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9

[nickm at torproject.org]

commit 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2
Merge: 2b94b0ea7 ec5fe4120
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:28:36 2017 -0400

    Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9

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