Merge branch 'maint-0.2.9' into maint-0.3.3

diff --cc src/common/aes.c
index 5d0841dfa30140e32e9d983ae80d340844ebf501,8ab2d2fc6e4e1d4b522c0a9a90adb7b3d93bdb72..4d4a2d773a5d9cb263dc5e98f5cbcce3f46646a1
--- 1/src/common/aes.c
--- 2/src/common/aes.c
+++ b/src/common/aes.c
@@@ -402,5 -401,4 +402,4 @@@ aes_set_iv(aes_cnt_cipher_t *cipher, co
    memcpy(cipher->ctr_buf.buf, iv, 16);
  }
  
 -#endif
 +#endif /* defined(USE_EVP_AES_CTR) */
-