Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/common/crypto.c

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

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

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