Merge branch 'more_aes_hackery_rebased'

Conflicts:
	changes/aes_hackery

diff --cc changes/aes_hackery
index 0000000000000000000000000000000000000000,b22cefe9016d43e9849c113a98f8642f2b67b59c..8b2ef1a2e30840bbdb7e4012de63971afd1b8a21
mode 000000,100644..100644
--- /dev/null
--- 2/changes/aes_hackery
+++ b/changes/aes_hackery
@@@ -1,0 -1,16 +1,10 @@@
 -  o Code simplification and refactoring:
 -    - Unconditionally use OpenSSL's AES implementation instead of our
 -      old built-in one. OpenSSL's AES has been better for a while, and
 -      relatively few servers should still be on any version of OpenSSL
 -      that doesn't have good optimized assembly AES.
 -
+   o Major features (AES performance):
 -    - Use OpenSSL's EVP interface for AES encryption, so that all
 -      AES operations can use hardware acceleration (if present).
 -      Resolves issue #4442.
 -    - But only use the EVP interface when AES acceleration is enabled,
 -      to avoid a performance regression.  Resolves issue #4525.
+     - When using OpenSSL 1.0.0 or later, use OpenSSL's counter mode
+       implementation; it makes AES_CTR about 7% faster than our old one
+       (which was about 10% faster than the one OpenSSL used to provide).
+       Resolves issue #4526.
++
++  o Major bugfixes (AES performance):
++    - Only use the EVP interface when AES acceleration is enabled,
++      to avoid a 5-7% performance regression.  Resolves issue #4525,
++      bugfix on 0.2.3.8-alpha.