commit 77188ef36e9163b87f89135ff459f21100614b1e Merge: 7b7aa4f07 2d8d6d1eb Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 6 08:08:59 2020 -0500 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32841 | 4 ++++ changes/bug32877 | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)