commit d25b4230fe2959b727748de0b640d1ad702086db Merge: 29269e6ee 3808e3015 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 scripts/maint/checkSpace.pl | 5 ----- src/or/routerlist.c | 1 + 2 files changed, 1 insertion(+), 5 deletions(-)