commit 0fc2b7f82e5583f5652893931d24c94d04464c66 Merge: 2777b469f 1a5746f8e Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 13 11:15:40 2017 -0500 Merge branch 'bug8185_031' into maint-0.3.1 changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+)