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

[nickm at torproject.org]

commit 869e15cbf49417f2c6774bec49da9d91dc133905
Merge: fb610c9a2 edc3f7063
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:54:44 2019 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2