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

[nickm at torproject.org]

commit 698984c18003cca9f7763561ac479c3d5849426a
Merge: 0e101e6 567a56a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 15 11:09:17 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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