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