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

[asn at torproject.org]

commit 974c2674ebb8fb6716cc147e04eff6058094565f
Merge: 811a93f80 a39789a02
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu Apr 25 15:47:07 2019 +0300

    Merge branch 'maint-0.4.0'

 changes/bug30001                | 7 +++++++
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)