commit b5eb1ba7220d366c0dc10ae6e292f2c909550801 Merge: 62128193e2 adb248b6d6 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 10 08:53:07 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40389 | 3 +++ src/core/or/relay.c | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-)