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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.0'

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