commit 1132dc9f75d7e5cbda1c5a6ac91d82c420967c0e Merge: b66712d85 a9379d675 Author: teor teor@torproject.org Date: Fri Aug 30 23:24:05 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5

changes/bug31003 | 4 ++++ src/feature/nodelist/routerlist.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)