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

[nickm at torproject.org]

commit 0fced1949ade6e40ca215463f46d6bba14c8e616
Merge: 609b72fde 94523bffd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 15 08:53:03 2019 -0400

    Merge branch 'maint-0.4.0' into release-0.4.0

 changes/bug29665         | 7 +++++++
 src/core/or/circuituse.c | 4 ++++
 2 files changed, 11 insertions(+)