commit e9d99d2e15f09a394ad01189b7965af4888a61a6 Merge: 35dd2d733 6be9d3aed Author: David Goulet dgoulet@torproject.org Date: Tue Jun 11 11:43:15 2019 -0400
Merge branch 'tor-github/pr/1083'
changes/bug30780 | 3 +++ scripts/maint/practracker/exceptions.txt | 2 +- src/feature/dirauth/process_descs.c | 19 +++++++++++-------- src/feature/nodelist/routerlist.c | 13 +++++++------ src/feature/nodelist/routerlist.h | 9 ++++++--- 5 files changed, 28 insertions(+), 18 deletions(-)