commit d1e4ffc710fd6620614d4f7f20f6ed5d1c266ae4 Merge: 033e4723f 5eb2d5888 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 16 12:11:40 2018 -0400 Merge branch 'bug26072_029' into maint-0.2.9 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)