From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 13 Nov 2018 13:27:17 +0000 (-0500)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.3
X-Git-Tag: tor-0.3.3.11~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54d1a2d80537e9f9a90dcca18c9e616f73809f58;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.3
---

54d1a2d80537e9f9a90dcca18c9e616f73809f58
diff --cc src/common/aes.c
index 5d0841dfa3,8ab2d2fc6e..4d4a2d773a
--- a/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) */
-