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

[nickm at torproject.org]

commit fcfa22d80a6ad97b3192bd25050b3988112c53c8
Merge: 4a5c1584f 3c4353179
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 12:11:46 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug26072 | 5 +++++
 src/or/relay.c   | 1 +
 2 files changed, 6 insertions(+)