commit e9edcea0ca9aaaa208a52149b742d048eaaff142 Merge: 23451ef2fe 01a5b41be0 Author: David Goulet dgoulet@torproject.org Date: Tue Jun 29 10:55:46 2021 -0400

Merge branch 'tor-gitlab/mr/275'

changes/ticket40209 | 4 ++++ src/app/config/config.c | 3 +++ src/app/config/or_options_st.h | 7 +++++++ src/feature/nodelist/routerlist.c | 24 ++++++++++++++++++++++++ src/feature/nodelist/routerlist.h | 1 + 5 files changed, 39 insertions(+)