commit 29842f68e7a4f38d69509191fba9a7ffb28cdcd8 Merge: eab9dc06a b07b1a4f6 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 11 08:41:48 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1 changes/bug30781 | 4 ++++ scripts/maint/practracker/exceptions.txt | 2 +- src/feature/dirparse/routerparse.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-)