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

[teor at torproject.org]

commit 3d38d0ca24915fc05e770f2d5be3fd38203b5210
Merge: ec736f872 828033001
Author: teor <teor at torproject.org>
Date:   Tue Mar 26 16:57:04 2019 +1000

    Merge branch 'maint-0.4.0'

 changes/cid1444119               | 3 +++
 src/feature/dircommon/consdiff.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)