Build 2.2.7.wireshark-2.2.7v2.2.7

Change-Id: I03cdd52e531cfc348449238cc032a61e402a3543
Reviewed-on: https://code.wireshark.org/review/21881
Reviewed-by: Gerald Combs <gerald@wireshark.org>

4 files changed, 1312 insertions, 195 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29bb2..b98cf53521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,1108 @@
+commit e6ace1c
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Fri May 26 15:55:08 2017 +0200
+
+    debian: remove imagemagick and demote xdg-utils deps
+    
+    imagemagick was needed since v1.11.1-rc1-140-g02a8e72b43, but
+    unnecessary since v2.1.0rc0-491-g18a54fcaa4, remove it.
+    xdg-utils is needed for xdg-open (opening websites) at runtime in GTK+,
+    but not for Qt nor during the build, remove it or mark it as optional.
+    
+    Change-Id: I6fc4d5fb61ea8b5cf79526d92ef8c108bc9d11a3
+    Reviewed-on: https://code.wireshark.org/review/21765
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 6607be77f30c8b08e2ffb8160d9f5211415decc6)
+    Reviewed-on: https://code.wireshark.org/review/21868
+
+commit ae9b917
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed May 31 12:05:52 2017 -0700
+
+    More 2.2.7 release note updates.
+    
+    Change-Id: I86a7ddb4c67175bc88adaacd04403d0010df59c7
+    Reviewed-on: https://code.wireshark.org/review/21864
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit ba35a81
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue May 30 16:41:11 2017 -0700
+
+    Update the release notes for 2.2.7.
+    
+    Change-Id: I58b3bbec02b25c1647fe7f5cf2a13a618c409ed9
+    Reviewed-on: https://code.wireshark.org/review/21830
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 498392f
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon May 29 11:30:16 2017 -0400
+
+    GTK: Bugfix not allowing extcap capture filters to be verified.
+    
+    Matches Id45052f21ebb290bf92c201370584156a65f2e19
+    
+    Change-Id: I2b097d176ec3ce0637af95d66d2f58b834c79ea2
+    Reviewed-on: https://code.wireshark.org/review/21783
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 4e05adcfb20d297d559ae787ac0fcef637d67ef3)
+    Reviewed-on: https://code.wireshark.org/review/21784
+
+commit d79e01e
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon May 29 08:51:30 2017 +0200
+
+    Qt: Fix capture filter verification for non-extcap interfaces.
+    
+    Change-Id: Id45052f21ebb290bf92c201370584156a65f2e19
+    Reviewed-on: https://code.wireshark.org/review/21777
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 10d7e391b3c9de2ea66a46980bf2362bb79292f3)
+    Reviewed-on: https://code.wireshark.org/review/21781
+
+commit 82a5c9f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun May 28 08:25:30 2017 +0000
+
+    [Automatic update for 2017-05-28]
+    
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: Idce91ff628e3b207716ae6592291bccf4c5c3639
+    Reviewed-on: https://code.wireshark.org/review/21773
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 7791a5c
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu May 25 15:27:18 2017 -0400
+
+    GTK: Don't allow extcap capture filters to be verified.
+    
+    There isn't an API to do it and if WinPcap isn't present it can
+    cause a crash.
+    
+    Change-Id: I5338f854acb26f0822ac027e6c853a550da3f7b1
+    Reviewed-on: https://code.wireshark.org/review/21758
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit d14b8f6fc5bc727355cd317197fab5b0fb349f4b)
+    Reviewed-on: https://code.wireshark.org/review/21762
+
+commit 5802749
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu May 25 14:36:44 2017 -0400
+
+    Don't try to compile capture filter if pcap_compile isn't available.
+    
+    This is most likely due to WinPcap not being installed.
+    
+    Bug: 13672
+    Change-Id: Ic7069f98c7f8068cdc5045204c2e23ab56b3f7eb
+    Reviewed-on: https://code.wireshark.org/review/21757
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 9bd2b63968ecde680cdee8e8eff43e526ef178f4)
+    Reviewed-on: https://code.wireshark.org/review/21760
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+
+commit 379ac84
+Author: Eric Wetzel <thewetzel@gmail.com>
+Date:   Wed May 17 22:17:30 2017 -0400
+
+    dnp3: fix parser when a packed variation is used with prefix value qualifier
+    
+    Bug: 13733
+    Change-Id: I4d490793b54816e731d72bf1317d3779a05ae011
+    Reviewed-on: https://code.wireshark.org/review/21722
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    (cherry picked from commit b3c68951913497d0797614636ef6784becb1a5b6)
+    Reviewed-on: https://code.wireshark.org/review/21729
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 14e28c3
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun May 21 08:26:52 2017 +0000
+
+    [Automatic update for 2017-05-21]
+    
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: Id78b574bb69be004f90b92e4d8de6928ca2983c9
+    Reviewed-on: https://code.wireshark.org/review/21724
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 13d52a5
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Fri May 19 00:45:30 2017 +0200
+
+    SDP: Handle incomplete media attributes
+    
+    Media attributes have a format of name:value, where, if the value
+    is missing the colon is missing too. Sometimes the colon is there,
+    while the value is missing. Even though this is in error, continue
+    dissecting the other attributes.
+    
+    Bug: 13698
+    Change-Id: I369b6db657b33a368f4b12134412100774105615
+    Reviewed-on: https://code.wireshark.org/review/21699
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit e71219c711e80a5534a03ab03e1c412cd53c1998)
+    Reviewed-on: https://code.wireshark.org/review/21715
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+
+commit 2755632
+Author: Björn Ruytenberg <bjorn@bjornweb.nl>
+Date:   Fri May 19 19:03:29 2017 +0200
+
+    msnip: Verify pinfo->dst is a valid IPv4 address
+    
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1678
+    Bug: 13725
+    Change-Id: Ib61733200658b4cca0bb0f45e5445b0ed3c12ab0
+    Reviewed-on: https://code.wireshark.org/review/21712
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit b2923e93133e21f18799124eff01156088980456)
+    Reviewed-on: https://code.wireshark.org/review/21713
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+
+commit c6d43ae
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri May 19 15:05:06 2017 +0200
+
+    Qt: Add check for packet bytes
+    
+    Disable menu items handling packet bytes if not having any.
+    
+    Bug: 13723
+    Change-Id: I9cdb1185910f865c61a8ee74e3cf3177159bf315
+    Reviewed-on: https://code.wireshark.org/review/21710
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 6bc71e4d0a205607496c1ecb7a0dc584fe4382e2)
+    Reviewed-on: https://code.wireshark.org/review/21717
+
+commit 7c5325f
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri May 19 14:44:14 2017 +0200
+
+    Qt: Check for no tvb in Show Packet Bytes
+    
+    Bug: 13723
+    Change-Id: I145fe93fc05a9cfdc6c0fc949274a1e88dcf2f1e
+    Reviewed-on: https://code.wireshark.org/review/21709
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 4424a8e86290265f6704ce0a67ebbd2bbd13e8f5)
+    Reviewed-on: https://code.wireshark.org/review/21716
+
+commit e91257d
+Author: Chris Wills <xenkrs@outlook.com>
+Date:   Mon May 15 22:36:52 2017 -0700
+
+    Fixed array index using nss to match the definition
+    
+    Bug: 13713
+    Change-Id: I7e96a6209fe5cd0ba11323f35e4408eb4ff7141a
+    Signed-off-by: Chris Wills <xenkrs@outlook.com>
+    Reviewed-on: https://code.wireshark.org/review/21677
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 924d1ecf6370c26bd31c08b922519a85669fa301)
+    Reviewed-on: https://code.wireshark.org/review/21680
+
+commit f2e208c
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun May 14 19:33:12 2017 +0200
+
+    SMB: Fix dissection of SMB_COM_TRANSACTION2_SECONDARY (0x33)
+    
+    Issue reported by Alex
+    Bug: 13690
+    Change-Id: I6c0c01569be8474e1cbab0c8ca009c00394e1ffe
+    Reviewed-on: https://code.wireshark.org/review/21650
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit c30bb2c75e3291a6a676ad74ab88934ca329106f)
+    Reviewed-on: https://code.wireshark.org/review/21656
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+
+commit 78bbcd0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun May 14 08:25:09 2017 +0000
+
+    [Automatic update for 2017-05-14]
+    
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: Icf585929c1d877c3d4e107397a9373f98174db04
+    Reviewed-on: https://code.wireshark.org/review/21631
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 330bcb5
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri May 12 20:39:40 2017 +0200
+
+    BT L2CAP: avoid a division by 0
+    
+    Bug: 13701
+    Change-Id: Ie433ecd932dcfc40fa6d3fdc3fa00139c64584a2
+    Reviewed-on: https://code.wireshark.org/review/21618
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit d566531ae5874bfd63c2755cba95cd63b7a4a189)
+    Reviewed-on: https://code.wireshark.org/review/21621
+
+commit f6408d6
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Fri May 5 11:46:07 2017 +0200
+
+    dns: improve loop detection in label decompression
+    
+    Previously the number of allowed pointers within a message is equal to
+    the data in a tvb (16575 in one example). This is still expensive, so
+    implement an alternative detection mechanism that looks for a direct
+    self-loop and limits the total pointers to about 256.
+    
+    Bug: 13633
+    Change-Id: I803873e24ab170c7ef0b881d3bdc9dfd4014de97
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1206
+    Reviewed-on: https://code.wireshark.org/review/21507
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 129bdb5a164a6386c35ff387e9d8f0d3d6a12dbf)
+    Reviewed-on: https://code.wireshark.org/review/21596
+
+commit 35afffb
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun May 7 08:42:03 2017 -0700
+
+    [Automatic update for 2017-05-07]
+    
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: I82d46a8f82652b7c2fddb1189d763316088fe7f5
+    Reviewed-on: https://code.wireshark.org/review/21548
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 40b2d47
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri May 5 16:37:35 2017 -0400
+
+    packet-ipv6.c: dissect_routing6_rpl must have IPv6 addresses.
+    
+    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1303
+    Bug: 13675
+    Change-Id: Icadf8a57a25bbf9abaa9685f9e9c7a803204b7e5
+    Reviewed-on: https://code.wireshark.org/review/21527
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 0e53c857e5ecc0032941b2e8a048989099fb0043)
+    Reviewed-on: https://code.wireshark.org/review/21532
+
+commit cb1b649
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri May 5 17:23:59 2017 -0400
+
+    packet-dcm.c: Fix infinite loop
+    
+    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1329
+    Bug: 13685
+    Change-Id: Ic70cf8185beeb4cfa9417c287cf963e1c56bf86c
+    Reviewed-on: https://code.wireshark.org/review/21529
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 538abdfbc2225e8c39de99811fb9cbef53b0911b)
+    Reviewed-on: https://code.wireshark.org/review/21534
+
+commit 96c6623
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu May 4 14:21:27 2017 +0200
+
+    Qt: Inhibit Disable Protocol when applicable
+    
+    The packet details context menu allows you, through the Protocol
+    Preferences sub menu to manipulate (disable) the protocol dissection
+    through the Disable <protocol>... option. This opens up the appropriate
+    dialog and select the applicable protocol.
+    This fails for protocols which have their can_toggle flag reset (e.g.
+    the frame protocol). The dialog opens, but the protocol can't be found,
+    hence the top item is selected.
+    
+    Instead disable the menu option for protocols which can't have their
+    enabled state toggled.
+    
+    Change-Id: Ifa83f656a8ab747f379d3ca0114520e5efed4b67
+    Reviewed-on: https://code.wireshark.org/review/21494
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 8e52cfb891aa5de7b20f5dbd8471609e6c6ca40d)
+    Reviewed-on: https://code.wireshark.org/review/21503
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 5673298
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Thu May 4 18:45:55 2017 +0200
+
+    bootp: fix potential buffer overflow (read)
+    
+    The Vendor class Identifier is a string (used with strncmp). Be sure to
+    obtain a null-terminated string.
+    
+    Bug: 13628
+    Change-Id: Ic6457da171fbfa1bd18366d965d22e942fb080d6
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1183
+    Bug: 13609
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1153
+    Reviewed-on: https://code.wireshark.org/review/21498
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    (cherry picked from commit 508bec78a39f0c7a2a54986b7616e4f615d6f170)
+    Reviewed-on: https://code.wireshark.org/review/21500
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 9902d39
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed May 3 14:23:54 2017 -0700
+
+    Put back the null terminator in the list of handles.
+    
+    The code to scan the list has always required a null terminator, but
+    change 96f517647a8f8b22c66eacf6e3d8bea9d8b8c68f got rid of the null
+    terminator.
+    
+    Change-Id: I13c1553114e08e8617adaf8874ffb5e7c7c4b2d3
+    Reviewed-on: https://code.wireshark.org/review/21477
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 81292f3ac786578f0cadee55f16f6dfb8315b705)
+    Reviewed-on: https://code.wireshark.org/review/21478
+
+commit d8d7690
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Apr 29 10:30:23 2017 -0400
+
+    packet-bzr.c: Prevent infinite loop
+    
+    Bug: 13599
+    Change-Id: If85588099d7c6635865614f8778a903a5e971789
+    Reviewed-on: https://code.wireshark.org/review/21410
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit afb4de370a4c54e08e9367b55ae142414efc6e8f)
+    Reviewed-on: https://code.wireshark.org/review/21459
+
+commit bbae996
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Apr 30 08:37:34 2017 -0700
+
+    [Automatic update for 2017-04-30]
+    
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: I1d4bfe0a64c9ecc5e54f49f4144994520308cae6
+    Reviewed-on: https://code.wireshark.org/review/21428
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 7245279
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Apr 28 20:00:14 2017 -0700
+
+    Don't add /usr/X11/lib/pkgconfig if we're not using GTK+.
+    
+    Qt for macOS doesn't use X11, so you don't need X11.
+    
+    Change-Id: Ibc09a2d802f21b5be38baf735d2f6d582d6bf41f
+    Reviewed-on: https://code.wireshark.org/review/21401
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 5bda98586b4f81c14a5f3b8feacd10392dc0d078)
+    Reviewed-on: https://code.wireshark.org/review/21402
+
+commit 6e652aa
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Apr 28 19:55:44 2017 -0700
+
+    Get rid of a message that should no longer apply.
+    
+    The version of pkg-config downloaded and built by macosx-setup.sh
+    defaults to looking in, among other places, /usr/local/lib/pkgconfig, so
+    you don't need to add that to PKG_CONFIG_PATH on macOS; Wireshark for
+    macOS no longer uses X11, so you don't need to add
+    /usr/X11/lib/pkgconfig to PKG_CONFIG_PATH on macOS.
+    
+    Change-Id: I84fd6848b72010aafd7859c4e9c0a4362113c890
+    Reviewed-on: https://code.wireshark.org/review/21398
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 57b17187d5eda5dd481d1bf5c5e026866fc38e91)
+    Reviewed-on: https://code.wireshark.org/review/21399
+
+commit 3ce1ba9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Apr 27 09:15:01 2017 -0400
+
+    [OpenSafety] Bugfix invalid length calculation.
+    
+    Length calculation leads to -1, which will result in a large malloc
+    
+    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1212
+    Bug: 13649
+    Change-Id: Iccb78b8c8ec9ca8e8f97bc12d0d8f41526d1f791
+    Reviewed-on: https://code.wireshark.org/review/21367
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit f6431695049116176361ce4691dfd3c77ab19858)
+    Reviewed-on: https://code.wireshark.org/review/21375
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+
+commit 5debcf5
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Apr 27 09:28:25 2017 -0400
+
+    packet-rgmp.c: Ensure pinfo->dst is a valid IPv4 address
+    
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1243
+    Bug: 13646
+    Change-Id: I2174e79dd2a9679f099c87c55c33984aca891d22
+    Reviewed-on: https://code.wireshark.org/review/21368
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 3f7f131ef372ec3a22f6363ab89dcdc0fba2b377)
+    Reviewed-on: https://code.wireshark.org/review/21385
+
+commit 5f6714e
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Apr 27 09:50:34 2017 -0400
+
+    packet-sigcomp.c: Prevent large shift
+    
+    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1232
+    Bug: 13641
+    Change-Id: I6e53d07dd03a5b637ca27884fad32ba5f7a85d0e
+    Reviewed-on: https://code.wireshark.org/review/21369
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit a1152a2a1f486e07e861afcc56ab0f16bb9c7a83)
+    Reviewed-on: https://code.wireshark.org/review/21373
+
+commit 20c7fe8
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Apr 27 09:58:14 2017 -0400
+
+    packet-netsync.c: Prevent large shift
+    
+    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1221
+    Bug: 13639
+    Change-Id: I0b67a270460473917f2481f79f404e4599727508
+    Reviewed-on: https://code.wireshark.org/review/21370
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 92903583f8373af782efe7ae64352ec1e426e35a)
+    Reviewed-on: https://code.wireshark.org/review/21371
+
+commit 9684ce8
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Apr 25 22:01:21 2017 +0200
+
+    ISUP: restore number indicators2 display like what was done in master-1.12
+    
+    proto_tree_add_bitmask_list() should avoided as there is an interpreted field.
+    
+    Bug: 13588
+    Change-Id: Iec6bf9bb4002123b6913fbee6287472aaf9bc00b
+    Reviewed-on: https://code.wireshark.org/review/21340
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit 821a3466c68ed509d8f71e34a62a2227823b1e55)
+    Reviewed-on: https://code.wireshark.org/review/21352
+
+commit d750edf
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Tue Apr 25 12:13:01 2017 +0200
+
+    ieee80211: fix stack-use-after-return
+    
+    Bug: 13662
+    Change-Id: I26c53ecc78005b26908d74877814be22924848bc
+    Fixes: v1.11.3-rc1-2029-g4b8b83407a ("Support for IEEE 802.11ad")
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1268
+    Reviewed-on: https://code.wireshark.org/review/21333
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit bfd1461ec81311f31e9fc0f3f298ae779911c7f4)
+    Reviewed-on: https://code.wireshark.org/review/21337
+
+commit 1396b29
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Apr 25 08:18:05 2017 +0200
+
+    Qt: Make text in SimpleDialog selectable by mouse
+    
+    This makes it easier to copy error messages.
+    
+    Change-Id: I39284d9b2d716336c6fc4b211e5346abcebf0aee
+    Reviewed-on: https://code.wireshark.org/review/21326
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit f9f2b84e658b8ce64553f9b9df3a37acaa2ec916)
+    Reviewed-on: https://code.wireshark.org/review/21330
+
+commit 4fe7484
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Apr 24 21:16:37 2017 +0200
+
+    GSM SMS: fix display of reassembled 8 bits SMS
+    
+    Change-Id: I0052fb1f311f18180fbc7c6b8bd2fbf23215ad67
+    Reviewed-on: https://code.wireshark.org/review/21319
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit cb089dd2ff20cd7cc165de303de075bcb6be3afc)
+    Reviewed-on: https://code.wireshark.org/review/21322
+
+commit 8525318
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sat Apr 22 18:46:23 2017 +0200
+
+    slsk: fix infinite loop
+    
+    If check_slsk_format reports that the buffer does not contain the
+    expected data, do not try to find more items (break out of the loop).
+    
+    In one case, an infinite loop would occur because the index variable was
+    not incremented when the check fails. In all other cases, it would
+    perform up to 2^32 calls to check_slsk_format per loop (with the same
+    offset parameter, so no exception is triggered).
+    
+    Change-Id: I4b7fa10a36fee2551fa46831bcecd6bcd9f342d1
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1200
+    Bug: 13631
+    Reviewed-on: https://code.wireshark.org/review/21284
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 7eab596c0824e6fa20aad6932bcd2fdb94b86edf)
+     [ Conflicts: manually resolved, skipped removal of "i = 0" from lines
+       where "j = tvb_get_letohl(...)" occurs ]
+    Reviewed-on: https://code.wireshark.org/review/21296
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 8103049
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Apr 23 08:37:33 2017 -0700
+
+    [Automatic update for 2017-04-23]
+    
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: Ib6303f93a110553ac6432de004f78a19cbcce466
+    Reviewed-on: https://code.wireshark.org/review/21299
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 7fe55f9
+Author: Björn Ruytenberg <bjorn@bjornweb.nl>
+Date:   Sat Apr 22 23:33:57 2017 +0200
+
+    DOF: Fix buffer overflow (read)
+    
+    Perform sanity check on buffer length parsed from data. Check buffer
+    size before reading value.
+    
+    Change-Id: I8beaf8860b39426d79867b0dd2221e57e32da8e0
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1151
+    Bug: 13608
+    Reviewed-on: https://code.wireshark.org/review/21287
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 6fdf8eb5a92d51617203be1a712c15585b156497)
+    Reviewed-on: https://code.wireshark.org/review/21290
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+
+commit 6b82c80
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Apr 19 21:43:49 2017 -0400
+
+    packet-quakeworld.c: Fix potential out of bounds error.
+    
+    Overflow can occur while writing to a buffer.
+    
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1179
+    Bug: 13624
+    Change-Id: I7511c43ed67f81d246e3eb66e092353e2ab4924c
+    Reviewed-on: https://code.wireshark.org/review/21235
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 22f05d620f428c0769227f0173876c95fb9aead4)
+    Reviewed-on: https://code.wireshark.org/review/21285
+
+commit 278e52f
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Apr 22 13:17:37 2017 +0200
+
+    ROS: Harden ROS dissection
+    
+    Make sure that on a OID search an actual OID is available to search for.
+    
+    # Conflicts:
+    #       epan/dissectors/asn1/ros/packet-ros-template.c
+    #       epan/dissectors/packet-ros.c
+    
+    Bug: 13637
+    Change-Id: I36f84cce5506f003d2a30a17f8671d5e22070612
+    Reviewed-on: https://code.wireshark.org/review/21280
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-on: https://code.wireshark.org/review/21283
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+
+commit bf3ad38
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Apr 21 03:10:21 2017 -0700
+
+    Code in epan/dissectors may require GeoIP.h, so include LIBGEOIP_FLAGS.
+    
+    Change-Id: I31bd53c49906db24b64fa3f1e3078b0658db3158
+    Reviewed-on: https://code.wireshark.org/review/21269
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 2c52d954d5713be1b809c3b668b0353d2b355c16)
+    Reviewed-on: https://code.wireshark.org/review/21275
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 35e89a7
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Apr 20 23:15:38 2017 +0200
+
+    Fixes for sfloat_ieee_11073_val_to_repr() function
+    
+    - when having a special value, leave function once buffer is written
+    - give the right buffer length to g_snprintf() function
+    
+    Bug: 13590
+    Change-Id: Iecf1456686b6e92a7cfcf8ed6d8619541ad50ace
+    Reviewed-on: https://code.wireshark.org/review/21260
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit a967ca50746fff4035f166585a9172b082431ec5)
+    Reviewed-on: https://code.wireshark.org/review/21266
+
+commit b7cfcce
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Apr 20 08:44:52 2017 -0400
+
+    dwarf.c: Fix potential too large shift
+    
+    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1167
+    Bug: 13616
+    
+    Change-Id: I43ab629ad8368bf672d1c079219d6b055c431e86
+    Reviewed-on: https://code.wireshark.org/review/21249
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 70b6e406e783eab172b4b9e90e9e7e624d7facb8)
+    Reviewed-on: https://code.wireshark.org/review/21263
+
+commit e717284
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Apr 20 13:05:52 2017 -0400
+
+    sigcomp: Shift operand should be limited to 16 bits
+    
+    # Conflicts:
+    #       epan/dissectors/packet-sigcomp.c
+    
+    Change-Id: I5a6fbcacf874962c361e68fef7402dc775aca658
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1154
+    Bug: 13610
+    Reviewed-on: https://code.wireshark.org/review/21250
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-on: https://code.wireshark.org/review/21256
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+
+commit 407a79b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Apr 20 11:46:45 2017 -0700
+
+    cf_open() pops up a dialog box on errors; its callers shouldn't do so.
+    
+    Change-Id: I1c65854b5bde1c64d70cb17a13080829f0faa27b
+    Reviewed-on: https://code.wireshark.org/review/21253
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit d97ce76161f573beb88fff7eefe4e0f686a4f3a9)
+    Reviewed-on: https://code.wireshark.org/review/21254
+
+commit b7cf108
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Wed Apr 12 00:55:06 2017 +0200
+
+    Qt: Prevent moving other columns on drag and drop
+    
+    This workaround prevents moving around other columns during drag and
+    drop and also transfers the sorting order to the new position.
+    
+    Bug: 13183
+    Ping-Bug: 13540
+    Change-Id: I4609c63557bf3abf06ba417ac1b40cac22a82abc
+    Reviewed-on: https://code.wireshark.org/review/21022
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 691d803037f777ff1bed025a48a48aa92956967f)
+    Reviewed-on: https://code.wireshark.org/review/21247
+
+commit 66a8087
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Apr 19 22:38:09 2017 -0400
+
+    packet-sigcomp.c: Fix potential negative shift
+    
+    Bug: 13619
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1172
+    Change-Id: Ifa5ed88031425701f9cb14c80eb61311e0bba4aa
+    Reviewed-on: https://code.wireshark.org/review/21236
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 2ab4f63dea65de2e00fa488a35a86cfd494d5fca)
+    Reviewed-on: https://code.wireshark.org/review/21243
+
+commit 947b672
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Apr 19 22:51:45 2017 -0400
+
+    packet-xot.c: Handle potentially large representation of packet sizes
+    
+    Value on wire is 2^x, so represent the field that way.
+    
+    Bug: 13618
+    Change-Id: Ida4a85e1f52b29b8b89fa835f78ef3fff2bde5c9
+    Reviewed-on: https://code.wireshark.org/review/21237
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    (cherry picked from commit 3e755bb0c1b8ad9e466db1d02d76995ce1d39763)
+    Reviewed-on: https://code.wireshark.org/review/21241
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 95b4545
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Tue Apr 18 23:24:23 2017 +0200
+
+    RTCP: Handle large TMMBR value presentation
+    
+    TMMBR can be _very_ large (131072*2^63, larger than 64 bit entities can
+    hold). Therefore don't try to calculate and present the bitrate as an
+    integer value, but as an expression.
+    
+    Bug: 13611
+    Change-Id: Ieb8caae5d72d06f82c134eda63f99575218584c2
+    Reviewed-on: https://code.wireshark.org/review/21207
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 05140af874e9bd86160659dbc8541373d662e290)
+    Reviewed-on: https://code.wireshark.org/review/21212
+
+commit 4997c64
+Author: Xiaochuan Sun <linuxvxworks@gmail.com>
+Date:   Mon Apr 17 19:39:15 2017 +0800
+
+    remove unnecessary guint64 cast in IO graph
+    
+    Change-Id: I35d666a5a9fb5813706c312334f1552703c9475c
+    Reviewed-on: https://code.wireshark.org/review/21214
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit d13c6d9628e3964697559e3509d9c1f8ec30ed9e)
+    Reviewed-on: https://code.wireshark.org/review/21216
+
+commit 35c806f
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Tue Apr 18 16:28:52 2017 +0200
+
+    netflow: fix undefined shift
+    
+    Treat any prefix length larger than 32 as 32 (effectively not masking
+    anything) and treat a zero-length prefix as the empty mask (matching
+    anything).
+    
+    Change-Id: If96b03c2f76ff7624d50fefdf0b025ab373c07dc
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1152
+    Bug: 13607
+    Reviewed-on: https://code.wireshark.org/review/21189
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 870b3d2c0f46addafb6a7dab4278de48edc33535)
+    Reviewed-on: https://code.wireshark.org/review/21201
+
+commit ea9ad9e
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Tue Apr 18 16:01:10 2017 +0200
+
+    ositp: fix undefined behavior from large shift
+    
+    Display "2^105" instead of the expanded value.
+    
+    Change-Id: I455625ab66cd86587ca35d09e1eba98ae1d87a94
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1149
+    Bug: 13606
+    Reviewed-on: https://code.wireshark.org/review/21188
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 5df6cc4b3da71f3d9564eab1ed25f4d3ad21a3ff)
+    Reviewed-on: https://code.wireshark.org/review/21196
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+
+commit a684e88
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Apr 16 08:38:26 2017 -0700
+
+    [Automatic update for 2017-04-16]
+    
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: I8044643c22134400713d63f622e7fb9e6612a138
+    Reviewed-on: https://code.wireshark.org/review/21143
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit d934481
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Apr 12 14:15:00 2017 +0200
+
+    btatt: failed assertion 'hf->bitmask != 0' (btatt.glucose_measurement.type_and_sample_location.type)
+    
+    Fixes: v1.99.9rc0-246-ga50a49e527 ("Bluetooth: ATT: Add some remaining attributes")
+    
+    Bug: 13590
+    Change-Id: I8e92ec80ee9e93a3e507f86c8354f1909070b0b9
+    Reviewed-on: https://code.wireshark.org/review/21041
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit f4f252d4c4b1d498c81d22686b160c7feccdc68d)
+    Reviewed-on: https://code.wireshark.org/review/21139
+
+commit fd9ec3f
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Fri Apr 14 14:46:11 2017 +0200
+
+    DICOM: Revert 3752a643ac5c85622822c88c69d83ce23828acb8
+    
+    Revert commit 3752a643ac5c85622822c88c69d83ce23828acb8
+    to fix bug 13164 and bug 13570 introduced with this commit.
+    
+    This reopens bug 13110.
+    
+    Bug: 13164
+    Bug: 13570
+    Change-Id: Id237f08258ca100f675614a9cb36a32340944b3e
+    Reviewed-on: https://code.wireshark.org/review/21089
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit ce50000f14da32dd2ae50f5b5efa12333e29dfcc)
+    Reviewed-on: https://code.wireshark.org/review/21121
+
+commit e9ebe2b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Apr 15 14:45:12 2017 -0700
+
+    Catch attempts to pass unregistered protocols to prefs routines.
+    
+    That way, you don't end up with "(none)" being used as the filter name
+    and getting confusing error messages.
+    
+    Change-Id: Ifc77d4434d82dabebe74118742938cfa5234791d
+    Reviewed-on: https://code.wireshark.org/review/21118
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit cbc2c84a27f3158784238cbc4b2076618b7dc6e4)
+    Reviewed-on: https://code.wireshark.org/review/21119
+
+commit 24b0ca4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Apr 15 12:37:34 2017 -0700
+
+    Squelch some compiler warnings.
+    
+    Cast an ssize_t value to unsigned int before subtracting it from an
+    unsigned int.  The value is already known to be >= 0 and <= the value
+    from which we're subtracting it, and that latter value is an unsigned
+    int, so it's guaranteed to fit into an unsigned int.  (ssize_t can be
+    bigger than unsigned int.)
+    
+    Change-Id: I5c4d3c7fa4bf241c9ea72661beca89bc30495a3b
+    Reviewed-on: https://code.wireshark.org/review/21114
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 237d23dc7355f066d772ba6ad184d5f99c25fa5a)
+    Reviewed-on: https://code.wireshark.org/review/21115
+
+commit df6b748
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Apr 14 18:28:25 2017 -0700
+
+    Make whitespace match what's checked into the SQLite repository.
+    
+    They accepted some of our changes, but with no space between "struct
+    XXX" and "*.  Whatever.
+    
+    Change-Id: I6b29462dc8b04ebf0822f8512d82f5f8df575447
+    Reviewed-on: https://code.wireshark.org/review/21101
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 3bd767108391e6d3498241b20e86ca176dffc185)
+    Reviewed-on: https://code.wireshark.org/review/21102
+
+commit f899ee7
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Apr 14 17:44:04 2017 -0700
+
+    Fix parsing of packet ranges.
+    
+    Replace the dash in a range with a '\0', so that the first value in the
+    range is properly terminated.
+    
+    Change-Id: Ib2807c2534c1e99e643848ca0fc32f4b78025ce3
+    Reviewed-on: https://code.wireshark.org/review/21099
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 0f3e20051c5be2d8164365763e63988a30aa24f4)
+    Reviewed-on: https://code.wireshark.org/review/21100
+
+commit 6461ed4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Apr 14 12:34:18 2017 -0700
+
+    Give a better error message for invalid characters in preference module names.
+    
+    And make the message for an invalid character in a preference name more
+    like it, by putting the offending name in quotes.
+    
+    Change-Id: I40db8b87eae5e46a1d49213a9a45861b6b3565af
+    Reviewed-on: https://code.wireshark.org/review/21092
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit c398858205724434bfcbec0ffed1f4223c2c85d1)
+    Reviewed-on: https://code.wireshark.org/review/21093
+
+commit 382fdc6
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Apr 13 13:17:41 2017 +0200
+
+    LTE RRC: do not display twice RRCConnectionReestablishmentReject in info column
+    
+    Bug: 13595
+    Change-Id: I5d1537afea7f5a2dddd5e11a06c451ec00913d12
+    Reviewed-on: https://code.wireshark.org/review/21073
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit 4e56c063b462837202d6c37adbdc4c0726a25024)
+    Reviewed-on: https://code.wireshark.org/review/21074
+
+commit 8569f0b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Apr 12 22:40:32 2017 -0400
+
+    Bugfix bad checksum of ICMP extension header.
+    
+    Use offset in tvb, not 0 for computation.
+    Also add check for checksum = 0, which means checksum isn't present.
+    
+    # Conflicts:
+    #       epan/dissectors/packet-icmp.c
+    
+    Bug: 13586
+    Change-Id: I18812894104c35e50ecb99aa8eca6b030c78c486
+    Reviewed-on: https://code.wireshark.org/review/21072
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 4ca3155
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Apr 10 23:26:07 2017 -0400
+
+    packet-icmp.c: Remove tree check that prevents expert info
+    
+    proto_tree_add_checksum uses expert info and shouldn't be
+    "NULL tree protected"
+    
+    Change-Id: If8a367c2be69252e9c6613329b7f78ad7e1e34eb
+    Ping-Bug: 13586
+    Reviewed-on: https://code.wireshark.org/review/21012
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 6b30fe1ce5014ec332cf8c2f483f9f1c519e0167)
+    Reviewed-on: https://code.wireshark.org/review/21071
+
+commit d05983e
+Author: Ahmad Fatoum <ahmad@a3f.at>
+Date:   Wed Apr 12 19:36:27 2017 +0200
+
+    packet-epl.c: Fix bigger-than-actual offset being reported
+    
+    dissect_epl_asnd_nmtdna returns the offset + 27,
+    adding that to the original offset isn't correct,
+    unless the offset was 0 to begin with, which isn't the case.
+    
+    Change-Id: Id0d5043b23a83aef8d07a6f6ee3b70486d913e9f
+    Reviewed-on: https://code.wireshark.org/review/21056
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 6c096f31ac6bbe2f0b7e0fd43dddb5419a8b2a3d)
+    Reviewed-on: https://code.wireshark.org/review/21069
+
+commit 87113a8
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Apr 12 15:10:36 2017 -0700
+
+    2.2.6 → 2.2.7.
+    
+    Change-Id: I844df8bd6b9d895ae04c99dce9b4656e7c395c11
+    Reviewed-on: https://code.wireshark.org/review/21065
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
diff --git a/NEWS b/NEWS
index 073021d784..7dbc066326 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-                         Wireshark 2.2.6 Release Notes
+                         Wireshark 2.2.7 Release Notes
      __________________________________________________________________
 
 What is Wireshark?
@@ -12,83 +12,98 @@ What's New
   Bug Fixes
 
    The following vulnerabilities have been fixed:
-     * [1]wnpa-sec-2017-12
-       IMAP dissector crash ([2]Bug 13466) [3]CVE-2017-7703
-     * [4]wnpa-sec-2017-13
-       WBMXL dissector infinite loop ([5]Bug 13477) [6]CVE-2017-7702
-     * [7]wnpa-sec-2017-14
-       NetScaler file parser infinite loop ([8]Bug 13478) [9]CVE-2017-7700
-     * [10]wnpa-sec-2017-15
-       RPCoRDMA dissector infinite loop ([11]Bug 13558) [12]CVE-2017-7705
-     * [13]wnpa-sec-2017-16
-       BGP dissector infinite loop ([14]Bug 13557) [15]CVE-2017-7701
-     * [16]wnpa-sec-2017-17
-       DOF dissector infinite loop ([17]Bug 13453) [18]CVE-2017-7704
-     * [19]wnpa-sec-2017-18
-       PacketBB dissector crash ([20]Bug 13559)
-     * [21]wnpa-sec-2017-19
-       SLSK dissector long loop ([22]Bug 13576)
-     * [23]wnpa-sec-2017-20
-       SIGCOMP dissector infinite loop ([24]Bug 13578)
-     * [25]wnpa-sec-2017-21
-       WSP dissector infinite loop ([26]Bug 13581)
+     * [1]wnpa-sec-2017-22
+       Bazaar dissector infinite loop ([2]Bug 13599) [3]CVE-2017-9352
+     * [4]wnpa-sec-2017-23
+       DOF dissector read overflow ([5]Bug 13608) [6]CVE-2017-9348
+     * [7]wnpa-sec-2017-24
+       DHCP dissector read overflow ([8]Bug 13609, [9]Bug 13628)
+       [10]CVE-2017-9351
+     * [11]wnpa-sec-2017-25
+       SoulSeek dissector infinite loop ([12]Bug 13631) [13]CVE-2017-9346
+     * [14]wnpa-sec-2017-26
+       DNS dissector infinite loop ([15]Bug 13633) [16]CVE-2017-9345
+     * [17]wnpa-sec-2017-27
+       DICOM dissector infinite loop ([18]Bug 13685) [19]CVE-2017-9349
+     * [20]wnpa-sec-2017-28
+       openSAFETY dissector memory exhaustion ([21]Bug 13649)
+       [22]CVE-2017-9350
+     * [23]wnpa-sec-2017-29
+       BT L2CAP dissector divide by zero ([24]Bug 13701) [25]CVE-2017-9344
+
+     * [26]wnpa-sec-2017-30
+       MSNIP dissector crash ([27]Bug 13725) [28]CVE-2017-9343
+
+     * [29]wnpa-sec-2017-31
+       ROS dissector crash ([30]Bug 13637) [31]CVE-2017-9347
+
+     * [32]wnpa-sec-2017-32
+       RGMP dissector crash ([33]Bug 13646) [34]CVE-2017-9354
+
+     * [35]wnpa-sec-2017-33
+       IPv6 dissector crash ([36]Bug 13675) [37]CVE-2017-9353
 
    The following bugs have been fixed:
-     * T30 FCF byte decoding masks DTC, CIG and NCS. ([27]Bug 1918)
-     * Wireshark gives decoding error during rnsap message dissection(SCCP
-       reassembly). ([28]Bug 3360)
-     * Added IEEE 802.15.4-2003 AES-CCM security modes
-       (packet-ieee802154). ([29]Bug 4912)
-     * Payload in 2 SCCP DT1 messages in the same frame isn't
-       (sub)dissected. ([30]Bug 11130)
-     * IEEE 802.15.4: an area of Payload IEs is dissected twice. ([31]Bug
-       13068)
-     * Qt UI: Wireshark crash when deleting IO graph string while it's in
-       editing mode. ([32]Bug 13234)
-     * Crash on exit due to an invalid frame data sequence state. ([33]Bug
-       13433)
-     * Access Violation using Lua dissector. ([34]Bug 13457)
-     * Some bytes ignored in every packet in NetScaler packet trace when
-       vmnames are included in packet headers. ([35]Bug 13459)
-     * VOIP RTP stream Find Reverse button doesn't work. ([36]Bug 13462)
-     * Lua dissector: ProtoField int&42; do not allow FT_HEX or FT_OCT,
-       crash when set to FT_HEX_DEC or FT_DEC_HEX. ([37]Bug 13484)
-     * GIOP LocateRequest v1.0 is improperly indicated as "malformed".
-       ([38]Bug 13488)
-     * Bug in ZigBee - Zone Status Change Notification. ([39]Bug 13493)
-     * Packet exception in packet-ua3g and incomplete strings in
-       packet-noe. ([40]Bug 13502)
-     * Wrong BGP capability dissect. ([41]Bug 13521)
-     * Endpoint statistics column labels seem incorrect. ([42]Bug 13526)
-     * Strange automatic jump in packet details for a certain DNS response
-       packet. ([43]Bug 13533)
-     * When a Lua enum or bool preference is changed via context menu,
-       prefs_changed isn't called with Qt Wireshark. ([44]Bug 13536)
-     * IO Graph selects wrong packet or displays "Packet number x isn't
-       displayed". ([45]Bug 13537)
-     * tshark's -z endpoints,ip ignores optional filter. ([46]Bug 13538)
-     * SSL: Handshake type in Info column not always separated by comma.
-       ([47]Bug 13539)
-     * libfuzzer: PEEKREMOTE dissector bug. ([48]Bug 13544)
-     * libfuzzer: packetBB dissector bug (packetbb.msg.addr.valuecustom).
-       ([49]Bug 13545)
-     * libfuzzer: WSP dissector bug (wsp.header.x_wap_tod). ([50]Bug
-       13546)
-     * libfuzzer: MIH dissector bug. ([51]Bug 13547)
-     * libfuzzer: DNS dissector bug. ([52]Bug 13548)
-     * libfuzzer: WLCCP dissector bug. ([53]Bug 13549)
-     * libfuzzer: TAPA dissector bug. ([54]Bug 13553)
-     * libfuzzer: lapsat dissector bug. ([55]Bug 13554)
-     * libfuzzer: wassp dissector bug. ([56]Bug 13555)
-     * Illegal reassembly of GSM SMS packets. ([57]Bug 13572)
-     * SSH Dissector uses incorrect length for protocol field
-       (ssh.protocol). ([58]Bug 13574)
-     * NBAP malformed packet for short Binding ID. ([59]Bug 13577)
-     * libfuzzer: WSP dissector bug (wsp.header.x_up_1.x_up_proxy_tod).
-       ([60]Bug 13579)
-     * libfuzzer: asterix dissector bug (asterix.021_230_RA). ([61]Bug
-       13580)
-     * RTPproxy dissector adds multi lines to info column. ([62]Bug 13582)
+     * DICOM dissection error. ([38]Bug 13164)
+     * Qt: drag & drop of one column header in PacketList moves other
+       columns. ([39]Bug 13183)
+     * Can not export captured DICOM objects in version 2.2.5. ([40]Bug
+       13570)
+     * False complain about bad checksum of ICMP extension header.
+       ([41]Bug 13586)
+
+     * LibFuzzer: ISUP dissector bug (isup.number_different_meaning).
+       ([42]Bug 13588)
+     * Dissector Bug, protocol BT ATT. ([43]Bug 13590)
+     * Wireshark dispalys
+       RRCConnectionReestablishmentRejectRRCConnectionReestablishmentRejec
+       t in Info column. ([44]Bug 13595)
+
+     * [oss-fuzz] UBSAN: shift exponent 105 is too large for 32-bit type
+       int in packet-ositp.c:551:79. ([45]Bug 13606)
+
+     * [oss-fuzz] UBSAN: shift exponent -77 is negative in
+       packet-netflow.c:7717:23. ([46]Bug 13607)
+
+     * [oss-fuzz] UBSAN: shift exponent 1959 is too large for 32-bit type
+       int in packet-sigcomp.c:2128:28. ([47]Bug 13610)
+
+     * [oss-fuzz] UBSAN: shift exponent 63 is too large for 32-bit type
+       guint32 (aka unsigned int) in packet-rtcp.c:917:24. ([48]Bug 13611)
+
+     * [oss-fuzz] UBSAN: shift exponent 70 is too large for 64-bit type
+       guint64 (aka unsigned long) in dwarf.c:42:43. ([49]Bug 13616)
+
+     * [oss-fuzz] UBSAN: shift exponent 32 is too large for 32-bit type
+       int in packet-xot.c:260:23. ([50]Bug 13618)
+
+     * [oss-fuzz] UBSAN: shift exponent -5 is negative in
+       packet-sigcomp.c:1722:36. ([51]Bug 13619)
+
+     * [oss-fuzz] UBSAN: index 2049 out of bounds for type char [2049] in
+       packet-quakeworld.c:134:5. ([52]Bug 13624)
+
+     * [oss-fuzz] UBSAN: shift exponent 35 is too large for 32-bit type
+       int in packet-netsync.c:467:25. ([53]Bug 13639)
+
+     * [oss-fuzz] UBSAN: shift exponent 32 is too large for 32-bit type
+       int in packet-sigcomp.c:3857:24. ([54]Bug 13641)
+
+     * [oss-fuzz] ASAN: stack-use-after-return
+       epan/dissectors/packet-ieee80211.c:14341:23 in add_tagged_field.
+       ([55]Bug 13662)
+     * Welcome screen invalid capture filter wihtout WinPcap installed
+       causes runtime error. ([56]Bug 13672)
+     * SMB protocol parser does not parse SMB_COM_TRANSACTION2_SECONDARY
+       (0x33) command correctly. ([57]Bug 13690)
+     * SIP packets with SDP marked as malformed. ([58]Bug 13698)
+
+     * [oss-fuzz] UBSAN: index 8 out of bounds for type gboolean const[8]
+       in packet-ieee80211-radiotap.c:1836:12. ([59]Bug 13713)
+     * Crash on "Show packet bytes..." context menu item click. ([60]Bug
+       13723)
+     * DNP3 dissector does not properly decode packed variations with
+       prefixed qualifiers. ([61]Bug 13733)
 
   New and Updated Features
 
@@ -104,18 +119,15 @@ What's New
 
   Updated Protocol Support
 
-   ASTERIX, BGP, BSSGP, BT AVRCP, BT HCI_CMD, BT HFP, BT PBAP, DNS, DOF,
-   EAPOL-MKA, GIOP, GSM SMS, HTTP, ICMP, IEEE 802.11, IEEE 802.15.4, IMAP,
-   ISIS LSP, iSNS, LAPSat, MIH, MySQL, NBAP, NBIFOM, PacketBB, PEEKREMOTE,
-   RPCoRDMA, RTPproxy, SCCP, SIGCOMP, SLSK, SSH, SSL, T.30, TAPA, UA3G,
-   WASSP, WBXML, WLCCP, WSP, and ZigBee ZCL IAS
+   Bazaar, BT ATT, BT L2CAP, DHCP, DICOM, DNP3, DNS, DOF, DWARF, ICMP,
+   IEEE 802.11, IPv6, ISUP, LTE RRC, MSNIP, Netflow, Netsync, openSAFETY,
+   OSITP, QUAKEWORLD, Radiotap, RGMP, ROS, RTCP, SIGCOMP, SMB, SoulSeek,
+   and XOT
 
   New and Updated Capture File Support
 
    There is no new or updated capture file support in this release.
 
-   NetScaler, and pcapng
-
   New and Updated Capture Interfaces support
 
    There are no new or updated capture interfaces supported in this
@@ -129,14 +141,14 @@ What's New
 Getting Wireshark
 
    Wireshark source code and installation packages are available from
-   [63]https://www.wireshark.org/download.html.
+   [62]https://www.wireshark.org/download.html.
 
   Vendor-supplied Packages
 
    Most Linux and Unix vendors supply their own Wireshark packages. You
    can usually install or upgrade Wireshark using the package management
    system specific to that platform. A list of third-party packages can be
-   found on the [64]download page on the Wireshark web site.
+   found on the [63]download page on the Wireshark web site.
      __________________________________________________________________
 
 File Locations
@@ -149,120 +161,119 @@ File Locations
 
 Known Problems
 
-   Dumpcap might not quit if Wireshark or TShark crashes. ([65]Bug 1419)
+   Dumpcap might not quit if Wireshark or TShark crashes. ([64]Bug 1419)
 
-   The BER dissector might infinitely loop. ([66]Bug 1516)
+   The BER dissector might infinitely loop. ([65]Bug 1516)
 
    Capture filters aren't applied when capturing from named pipes.
-   ([67]Bug 1814)
+   ([66]Bug 1814)
 
    Filtering tshark captures with read filters (-R) no longer works.
-   ([68]Bug 2234)
+   ([67]Bug 2234)
 
-   Application crash when changing real-time option. ([69]Bug 4035)
+   Application crash when changing real-time option. ([68]Bug 4035)
 
    Wireshark and TShark will display incorrect delta times in some cases.
-   ([70]Bug 4985)
+   ([69]Bug 4985)
 
-   Wireshark should let you work with multiple capture files. ([71]Bug
+   Wireshark should let you work with multiple capture files. ([70]Bug
    10488)
 
    Dell Backup and Recovery (DBAR) makes many Windows applications crash,
-   including Wireshark. ([72]Bug 12036)
+   including Wireshark. ([71]Bug 12036)
      __________________________________________________________________
 
 Getting Help
 
-   Community support is available on [73]Wireshark's Q&A site and on the
+   Community support is available on [72]Wireshark's Q&A site and on the
    wireshark-users mailing list. Subscription information and archives for
-   all of Wireshark's mailing lists can be found on [74]the web site.
+   all of Wireshark's mailing lists can be found on [73]the web site.
 
    Official Wireshark training and certification are available from
-   [75]Wireshark University.
+   [74]Wireshark University.
      __________________________________________________________________
 
 Frequently Asked Questions
 
-   A complete FAQ is available on the [76]Wireshark web site.
+   A complete FAQ is available on the [75]Wireshark web site.
      __________________________________________________________________
 
-   Last updated 2017-04-12 19:22:20 UTC
+   Last updated 2017-06-01 18:14:05 UTC
 
 References
 
-   1. https://www.wireshark.org/security/wnpa-sec-2017-12.html
-   2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13466
-   3. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7703
-   4. https://www.wireshark.org/security/wnpa-sec-2017-13.html
-   5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13477
-   6. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7702
-   7. https://www.wireshark.org/security/wnpa-sec-2017-14.html
-   8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13478
-   9. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7700
-  10. https://www.wireshark.org/security/wnpa-sec-2017-15.html
-  11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13558
-  12. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7705
-  13. https://www.wireshark.org/security/wnpa-sec-2017-16.html
-  14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13557
-  15. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7701
-  16. https://www.wireshark.org/security/wnpa-sec-2017-17.html
-  17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13453
-  18. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7704
-  19. https://www.wireshark.org/security/wnpa-sec-2017-18.html
-  20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13559
-  21. https://www.wireshark.org/security/wnpa-sec-2017-19.html
-  22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13576
-  23. https://www.wireshark.org/security/wnpa-sec-2017-20.html
-  24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13578
-  25. https://www.wireshark.org/security/wnpa-sec-2017-21.html
-  26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13581
-  27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1918
-  28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3360
-  29. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912
-  30. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11130
-  31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13068
-  32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13234
-  33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13433
-  34. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13457
-  35. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13459
-  36. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13462
-  37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13484
-  38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13488
-  39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13493
-  40. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13502
-  41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13521
-  42. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13526
-  43. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13533
-  44. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13536
-  45. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13537
-  46. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13538
-  47. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13539
-  48. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13544
-  49. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13545
-  50. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13546
-  51. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13547
-  52. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13548
-  53. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13549
-  54. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13553
-  55. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13554
-  56. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13555
-  57. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13572
-  58. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13574
-  59. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13577
-  60. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13579
-  61. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13580
-  62. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13582
-  63. https://www.wireshark.org/download.html
-  64. https://www.wireshark.org/download.html#thirdparty
-  65. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419
-  66. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516
-  67. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814
-  68. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234
-  69. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035
-  70. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985
-  71. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488
-  72. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036
-  73. https://ask.wireshark.org/
-  74. https://www.wireshark.org/lists/
-  75. http://www.wiresharktraining.com/
-  76. https://www.wireshark.org/faq.html
+   1. https://www.wireshark.org/security/wnpa-sec-2017-22.html
+   2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13599
+   3. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9352
+   4. https://www.wireshark.org/security/wnpa-sec-2017-23.html
+   5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13608
+   6. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9348
+   7. https://www.wireshark.org/security/wnpa-sec-2017-24.html
+   8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13609
+   9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13628
+  10. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9351
+  11. https://www.wireshark.org/security/wnpa-sec-2017-25.html
+  12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13631
+  13. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9346
+  14. https://www.wireshark.org/security/wnpa-sec-2017-26.html
+  15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13633
+  16. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9345
+  17. https://www.wireshark.org/security/wnpa-sec-2017-27.html
+  18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13685
+  19. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9349
+  20. https://www.wireshark.org/security/wnpa-sec-2017-28.html
+  21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13649
+  22. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9350
+  23. https://www.wireshark.org/security/wnpa-sec-2017-29.html
+  24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13701
+  25. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9344
+  26. https://www.wireshark.org/security/wnpa-sec-2017-30.html
+  27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13725
+  28. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9343
+  29. https://www.wireshark.org/security/wnpa-sec-2017-31.html
+  30. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13637
+  31. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9347
+  32. https://www.wireshark.org/security/wnpa-sec-2017-32.html
+  33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13646
+  34. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9354
+  35. https://www.wireshark.org/security/wnpa-sec-2017-33.html
+  36. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13675
+  37. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9353
+  38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13164
+  39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13183
+  40. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13570
+  41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13586
+  42. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13588
+  43. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13590
+  44. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13595
+  45. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13606
+  46. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13607
+  47. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13610
+  48. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13611
+  49. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13616
+  50. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13618
+  51. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13619
+  52. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13624
+  53. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13639
+  54. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13641
+  55. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13662
+  56. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13672
+  57. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13690
+  58. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13698
+  59. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13713
+  60. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13723
+  61. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13733
+  62. https://www.wireshark.org/download.html
+  63. https://www.wireshark.org/download.html#thirdparty
+  64. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419
+  65. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516
+  66. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814
+  67. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234
+  68. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035
+  69. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985
+  70. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488
+  71. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036
+  72. https://ask.wireshark.org/
+  73. https://www.wireshark.org/lists/
+  74. http://www.wiresharktraining.com/
+  75. https://www.wireshark.org/faq.html
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 2d6632bd1c..2a6e79dc8c 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -16,7 +16,7 @@ The following vulnerabilities have been fixed:
 +
 Bazaar dissector infinite loop
 (ws-buglink:13599[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9352[]
 // Fixed in master: afb4de3
 // Fixed in master-2.2: d8d7690
 // Fixed in master-2.0: 8c5e0ce
@@ -25,7 +25,7 @@ Bazaar dissector infinite loop
 +
 DOF dissector read overflow
 (ws-buglink:13608[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9348[]
 // Fixed in master: 6fdf8eb
 // Fixed in master-2.2: 7fe55f9
 // Fixed in master-2.0: n/a
@@ -34,7 +34,7 @@ DOF dissector read overflow
 +
 DHCP dissector read overflow
 (ws-buglink:13609[], ws-buglink:13628[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9351[]
 // Fixed in master: 508bec7
 // Fixed in master-2.2: 5673298
 // Fixed in master-2.0: a6e033c
@@ -43,7 +43,7 @@ DHCP dissector read overflow
 +
 SoulSeek dissector infinite loop
 (ws-buglink:13631[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9346[]
 // Fixed in master: 7eab596
 // Fixed in master-2.2: 8525318
 // Fixed in master-2.0: 6c0bd15
@@ -52,7 +52,7 @@ SoulSeek dissector infinite loop
 +
 DNS dissector infinite loop
 (ws-buglink:13633[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9345[]
 // Fixed in master: 129bdb5
 // Fixed in master-2.2: f6408d6
 // Fixed in master-2.0: e280c9b
@@ -61,7 +61,7 @@ DNS dissector infinite loop
 +
 DICOM dissector infinite loop
 (ws-buglink:13685[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9349[]
 // Fixed in master: 538abdf
 // Fixed in master-2.2: cb1b649
 // Fixed in master-2.0: 3af3aca
@@ -70,7 +70,7 @@ DICOM dissector infinite loop
 +
 openSAFETY dissector memory exhaustion
 (ws-buglink:13649[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9350[]
 // Fixed in master: f643169
 // Fixed in master-2.2: 3ce1ba9
 // Fixed in master-2.0: dbc7cb0
@@ -79,7 +79,7 @@ openSAFETY dissector memory exhaustion
 +
 BT L2CAP dissector divide by zero
 (ws-buglink:13701[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9344[]
 // Fixed in master: d566531
 // Fixed in master-2.2: 330bcb5
 // Fixed in master-2.0: 6308ae0
@@ -89,7 +89,7 @@ BT L2CAP dissector divide by zero
 +
 MSNIP dissector crash
 (ws-buglink:13725[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9343[]
 // Fixed in master: b2923e9
 // Fixed in master-2.2: 2755632
 // Fixed in master-2.0: 7c39a77
@@ -99,7 +99,7 @@ MSNIP dissector crash
 +
 ROS dissector crash
 (ws-buglink:13637[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9347[]
 // Fixed in master: c70d2ec
 // Fixed in master-2.2: 278e52f
 // Fixed in master-2.0: n/a
@@ -109,7 +109,7 @@ ROS dissector crash
 +
 RGMP dissector crash
 (ws-buglink:13646[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9354[]
 // Fixed in master: 3f7f131
 // Fixed in master-2.2: 5debcf5
 // Fixed in master-2.0: 3a77395
@@ -119,7 +119,7 @@ RGMP dissector crash
 +
 IPv6 dissector crash
 (ws-buglink:13675[])
-// cve-idlink:2017-xxxx[]
+cve-idlink:2017-9353[]
 // Fixed in master: 0e53c85
 // Fixed in master-2.2: 40b2d47
 // Fixed in master-2.0: n/a
@@ -133,8 +133,6 @@ The following bugs have been fixed:
 //* Wireshark accepted your prom invitation then cancelled at the last minute. (ws-buglink:0000[])
 // cp /dev/null /tmp/buglist.txt ; for bugnumber in `git log --stat v2.2.7rc0..| grep ' Bug:' | cut -f2 -d: | sort -n -u ` ; do gen-bugnote $bugnumber; pbpaste >> /tmp/buglist.txt; done
 
-// Left off at ba35a81
-
 * DICOM dissection error. (ws-buglink:13164[])
 
 * Qt: drag & drop of one column header in PacketList moves other columns. (ws-buglink:13183[])
@@ -189,7 +187,7 @@ The following bugs have been fixed:
 
 * SIP packets with SDP marked as malformed. (ws-buglink:13698[])
 
-// No CVE despite buffer read?
+// No CVE despite buffer read
 * [oss-fuzz] UBSAN: index 8 out of bounds for type 'gboolean const[8]' in packet-ieee80211-radiotap.c:1836:12. (ws-buglink:13713[])
 
 * Crash on "Show packet bytes..." context menu item click. (ws-buglink:13723[])
diff --git a/version.conf b/version.conf
index 6dedd7c96a..9480b2f829 100644
--- a/version.conf
+++ b/version.conf
@@ -1,9 +1,9 @@
 # Interim releases: Enable packaging, add a "rc" to the version.
-enable: 1
-pkg_format: rc0-%#
-pkg_enable: 1
+#enable: 1
+#pkg_format: rc0-%#
+#pkg_enable: 1
 
 # Final release: Disable package version stamps.
-#enable: 1
-#pkg_format:
-#pkg_enable: 0
+enable: 1
+pkg_format:
+pkg_enable: 0