[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2

[nickm at torproject.org]

commit 2d8d6d1ebfd62ebc6da931170d949d8c02f67b76
Merge: 16e94dc7a f5461a4bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 6 08:08:59 2020 -0500

    Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/bug32841 | 4 ++++
 changes/bug32877 | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)