1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 97b39aaac..03c2674f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 - (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux 
   systems where sshd is run in te wrong context. Patch from Sven
   Vermeulen; ok dtucker@
+ - (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6
+   addressed connections. ok dtucker@
 20120224
 - (dtucker) [audit-bsm.c configure.ac] bug #1968: enable workarounds for BSM

diff --git a/ChangeLog b/ChangeLog index 97b39aaac..03c2674f3 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -2,6 +2,8 @@
2	- (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux	2	- (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux
3	systems where sshd is run in te wrong context. Patch from Sven	3	systems where sshd is run in te wrong context. Patch from Sven
4	Vermeulen; ok dtucker@	4	Vermeulen; ok dtucker@
		5	- (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6
		6	addressed connections. ok dtucker@
5		7
6	20120224	8	20120224
7	- (dtucker) [audit-bsm.c configure.ac] bug #1968: enable workarounds for BSM	9	- (dtucker) [audit-bsm.c configure.ac] bug #1968: enable workarounds for BSM