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

[teor at torproject.org]

commit 23ff60c1509b005ad1fca758a8fa0745008ba22d
Merge: bf5b17d8b 10ef7a31c
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 17:04:52 2019 +1000

    Merge branch 'maint-0.4.2'

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