commit 00fe214729b935adc522883fa84b399429fefa74 parent 0c90fc37ec7fcee01db6bc5e0784e759a7ec954c Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 11 Feb 2020 08:53:00 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" merge, since the exceptions.txt file is already fixed in this branch.
