[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit 8340f641c30f8e529b513732be2c931e128227e2
Merge: 4aa3d511b d3a972561
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 12:11:45 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

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