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

[teor at torproject.org]

commit cf56693f1cfd7174f41fc6a546a6c3f83a6e58e4
Merge: 3edd4842e 10ef7a31c
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 17:04:48 2019 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

 Makefile.am      | 2 +-
 changes/bug31335 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)