tree d27bedf1fb158324ba5ae5a5e57b4c2ac440fb05
parent 61025e9f9b3c2b090d9d08ca5a7a11b9adb04102
parent cc03e8a3a82ef6fea4290e89b11a6da9c4904c34
author David Pursehouse <dpursehouse@collab.net> 1508819942 +0900
committer David Pursehouse <dpursehouse@collab.net> 1508819946 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Documentation: List all ciphers/MACs available and add some recommendations

Change-Id: Ie0cb5536e14b79c1cf73b42bd913b6cee6892e19