commit 5e043118736aba96a5186fd6c3523b4fefec5cc5 Merge: e4ca6427e1 ae2254e490 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 10 09:55:55 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 src/core/or/relay.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-)