commit 08c4792413d7ea8eca5ef8f1325ecad0d1f6e4ab Merge: 9c12558af 828033001 Author: teor teor@torproject.org Date: Tue Mar 26 16:56:59 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

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