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