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