commit 100ff4a9284379e8f49e52a80275d3281163afb4 Merge: f02007a3e 9092e9019 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+)