--- a/mercurial/help/config.txt Sun Jul 17 10:50:51 2016 -0700
+++ b/mercurial/help/config.txt Sun Jul 17 10:59:32 2016 -0700
@@ -1005,6 +1005,18 @@
The following options control default behavior for all hosts.
+``ciphers``
+ Defines the cryptographic ciphers to use for connections.
+
+ Value must be a valid OpenSSL Cipher List Format as documented at
+ https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT.
+
+ This setting is for advanced users only. Setting to incorrect values
+ can significantly lower connection security or decrease performance.
+ You have been warned.
+
+ This option requires Python 2.7.
+
``minimumprotocol``
Defines the minimum channel encryption protocol to use.
@@ -1027,6 +1039,10 @@
The following per-host settings can be defined.
+``ciphers``
+ This behaves like ``ciphers`` as described above except it only applies
+ to the host on which it is defined.
+
``fingerprints``
A list of hashes of the DER encoded peer/remote certificate. Values have
the form ``algorithm``:``fingerprint``. e.g.