From: Jeremy C. Reed <jreed@isc.org>
Date: Tue, 8 Mar 2016 17:11:28 +0000 (-0500)
Subject: Merge branch 'master' of repo.isc.org:/proj/git/prod/dhcp
X-Git-Tag: v4_3_4~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26de50fb49bdab16eff5139421de2e0cc4076075;p=thirdparty%2Fdhcp.git

Merge branch 'master' of repo.isc.org:/proj/git/prod/dhcp

Conflicts:
	RELNOTES
---

26de50fb49bdab16eff5139421de2e0cc4076075
diff --cc RELNOTES
index 8df8a17ed,26d508205..136a7a59b
--- a/RELNOTES
+++ b/RELNOTES
@@@ -64,8 -64,8 +64,8 @@@ by Eric Young (eay@cryptsoft.com)
    keep the previous behavior.
    [ISC-Bugs #38692]
  
- - The Linux packet filter code now correctly treats only least significant
-   12 bits an inbound packet's TCI value as the VLAN id (per IEEE 802.1Q).
 -- The linux packet filter code now correctly treats only the least significant
++- The Linux packet filter code now correctly treats only the least significant
+   12 bits in an inbound packet's TCI value as the VLAN id (per IEEE 802.1Q).
    Prior to this it was using the entire 16 bit value as the VLAN id and
    incorrectly discarding packets.  Thanks to Jiri Popelka at Red Hat for
    reporting this issue and supplying its patch.