Merge branch 'maint-0.3.1' into maint-0.3.2

diff --cc src/common/crypto.c
Simple merge

diff --cc src/test/test_crypto.c
Simple merge