[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm@xxxxxxxxxxxxxx]

commit 54d1a2d80537e9f9a90dcca18c9e616f73809f58
Merge: 93b6d4137 7f042cbc0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Nov 13 08:27:17 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug28413 | 4 ++++
 src/common/aes.c | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --cc src/common/aes.c
index 5d0841dfa,8ab2d2fc6..4d4a2d773
--- 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) */
- 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits