commit edc3f70635fdead8f4dd777117c82b7319c19fe6 Merge: 5ddc04f49 3c071f300 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 22 12:54:43 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2