commit 79bee260eedc92f2009bfb3c780f397a05cd30cd Merge: e8edd97c1 8340f641c Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)