1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a9a8cbce1..a7ab9a693 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
     on a broken network, the backgrounded mux master will exit when the
     Control Persist time expires rather than hanging around indefinitely.
     bz#1917, also reported and tested by tedu@.  ok djm@ markus@.
+ - (dtucker) [Makefile.in configure.ac fixalgorithms] Remove unsupported
+   algorithms (Ciphers, MACs and HostKeyAlgorithms) from man pages.
 20130605
 - (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of

diff --git a/ChangeLog b/ChangeLog index a9a8cbce1..a7ab9a693 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -9,6 +9,8 @@
9	on a broken network, the backgrounded mux master will exit when the	9	on a broken network, the backgrounded mux master will exit when the
10	Control Persist time expires rather than hanging around indefinitely.	10	Control Persist time expires rather than hanging around indefinitely.
11	bz#1917, also reported and tested by tedu@. ok djm@ markus@.	11	bz#1917, also reported and tested by tedu@. ok djm@ markus@.
		12	- (dtucker) [Makefile.in configure.ac fixalgorithms] Remove unsupported
		13	algorithms (Ciphers, MACs and HostKeyAlgorithms) from man pages.
12		14
13	20130605	15	20130605
14	- (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of	16	- (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of