commit d9f49e9bc1b19e2d3246e696374cde964a8e4673 Merge: 4ecd09cfb e350dfc08 Author: teor teor@torproject.org Date: Mon Jun 24 21:31:27 2019 +1000

Merge branch 'bug30958_040' into bug30958_041

changes/bug30958 | 5 +++++ src/feature/relay/router.c | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)