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

Conflicts:
	src/test/test_relaycell.c
	src/test/test_util.c