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

[nickm at torproject.org]

commit 3b2d6da45344774d58b97f709c77fb35d26ba180
Merge: 6004dd2 567a56a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 15 11:09:22 2017 -0400

    Merge branch 'maint-0.3.0'

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