Build 3.0.4.wireshark-3.0.4v3.0.4

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

3 files changed, 1079 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29bb2..aad3d852b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,968 @@
+commit 362b1d4fca
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Sep 11 12:26:22 2019 -0700
+
+    Build 3.0.4.
+    
+    Change-Id: I40db73894db160bf682769d55b66e469a5776c35
+
+commit 668d69d223
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Sep 8 13:15:32 2019 +0000
+
+    macos-setup: Update to libssh 0.9.0
+    
+    Bug: 16032
+    Change-Id: Iaf9a58f76cef7906e00c1f3c3fecf51260b627a5
+    Reviewed-on: https://code.wireshark.org/review/34477
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit 27ebed0a5c1dbfd24a393be3b22b789bba478b65)
+    Reviewed-on: https://code.wireshark.org/review/34504
+
+commit 96efbbe7b2
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Sep 10 15:38:39 2019 -0700
+
+    Prep for 3.0.4.
+    
+    Change-Id: I5952140c9b407a1f563e4504be35bb6d7bbbe4aa
+    Reviewed-on: https://code.wireshark.org/review/34500
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 879bfa2228
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Tue Sep 10 15:42:23 2019 +0200
+
+    FC-dNS: add missing fields registration
+    
+    Issue reported by Christian Svensson in
+    https://www.wireshark.org/lists/wireshark-dev/201909/msg00016.html
+    
+    Change-Id: I362bb9ad861d5b87d3d21997621011654a8b86ef
+    Reviewed-on: https://code.wireshark.org/review/34492
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+    (cherry picked from commit 0eecdf653e4b16830b168311195c5eb37d79452c)
+    Reviewed-on: https://code.wireshark.org/review/34493
+
+commit eeff9ff91f
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Fri Sep 6 12:32:08 2019 +0200
+
+    BACNET: Update vendor ID list
+    
+    Update build-in vendor ID list with last years additions.
+    
+    Change-Id: I1916e160f6bcea5e94ce203b50f4a27a6ca1d261
+    Reviewed-on: https://code.wireshark.org/review/34460
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    (cherry picked from commit de4efb6af781969cd8fd9d5ca4815f20ce0674ed)
+    Reviewed-on: https://code.wireshark.org/review/34478
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 347d3c9d9e
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 19 17:33:32 2019 -0700
+
+    Remove the UTF-8 validation from proto_tree_add_string().
+    
+    proto_tree_add_item() does no validation if ENC_UTF_8 is used as the
+    encoding, so there's no guarantee that the value of a string field is
+    valid UTF-8, and in some dissectors UTF-8 strings are fetched with other
+    mechanisms and then added with proto_tree_add_string().
+    
+    We need to do some cleanup on string handling.
+    
+    Bug: 15848
+    Change-Id: Ifc43111dbb47c478fa11280f2f771d90202499fa
+    Reviewed-on: https://code.wireshark.org/review/33677
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 088b3d63a00d57183a24805a6bf7390f8136352b)
+    Reviewed-on: https://code.wireshark.org/review/34488
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit d956535455
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Sep 7 11:49:29 2019 +0200
+
+    Qt UI: Warn about not saving non-PCM encoded audio
+    
+    When saving audio data from RTP stream(s) in Sun AU format we (still) do
+    not harness the build-in codec framework. This results in empty Audio
+    files for all but PCM encoded RTP streams. At least warn the user about
+    the codec not being supported for saving in Audio file.
+    
+    Change-Id: Ia76caf71d0d5319a66dbf1cee517c0922bf7a561
+    Reviewed-on: https://code.wireshark.org/review/34466
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit bc1c3dc9a0d27722bab62a1f1f96c764764524ae)
+    Reviewed-on: https://code.wireshark.org/review/34474
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+
+commit 34f40964ea
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Sep 7 11:53:27 2019 +0200
+
+    Qt UI: remove empty jitter buffer label tooltip
+    
+    The jitter buffer label in the RTP player dialog has an effectively
+    empty tooltip. Since on the label itself there's little to tell this
+    tooltip can be removed.
+    
+    Change-Id: I9429e4f02991734b800280e2cae73a27f71c3663
+    Reviewed-on: https://code.wireshark.org/review/34467
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit a585a65a608c47be836b3c29208e97c1ee057040)
+    Reviewed-on: https://code.wireshark.org/review/34475
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+
+commit 93ac613a0a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Sep 8 08:36:24 2019 +0000
+
+    [Automatic update for 2019-09-08]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: Ia5b739335801df27ef901fb1e66c6a2a6ef870a9
+    Reviewed-on: https://code.wireshark.org/review/34473
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 1bb7df810f
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Thu Sep 5 22:41:47 2019 +0200
+
+    Windows: upgrade Npcap to 0.9983
+    
+    Change-Id: If693fe7343b2699dd7605327e769f6fb7fb3d051
+    Reviewed-on: https://code.wireshark.org/review/34458
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+
+commit b0d7205951
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Sep 4 13:27:45 2019 -0700
+
+    Put the year field of the timestamp out in little-endian byte order.
+    
+    Change-Id: I9de300b05e8d66e71359241fddfe10d90f3f8d33
+    Reviewed-on: https://code.wireshark.org/review/34454
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit b769c584ba014200bb3e6659e5d67af5a87d54bb)
+    Reviewed-on: https://code.wireshark.org/review/34455
+
+commit 8e4d72d0b6
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Wed Sep 4 21:56:27 2019 +0200
+
+    Wiretap: Write commview files with valid headers
+    
+    When writing a capture as a commview file the header written is two
+    bytes longer than the specification. Even though we count 24, we
+    actually write 26. This makes the commview file corrupt, as is apparent
+    when reading such file, eg., after using Save As... with this format.
+    
+    Replace writing 2 bytes for the last two fields in the header by 1 byte
+    each, as per the header specification.
+    
+    Change-Id: I9436f7837b2e3617a389619884bf93ad146e95f3
+    Reviewed-on: https://code.wireshark.org/review/34450
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 35062c2bdd57ef865431a837e513691bb20e50ce)
+    Reviewed-on: https://code.wireshark.org/review/34452
+
+commit 5ab732f7bd
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Sep 2 16:09:24 2019 -0700
+
+    What we're testing for is byte-swappedness, not raw endianness.
+    
+    On a big-endian machine, if the upper 16 bits of the length are non-zero
+    and the lower 16 bits are zero, that means that the length is
+    *little*-endian.
+    
+    What we really care about is whether the file is in the reading host's
+    native format, so we can just fetch integral values without swapping, or
+    not in that format, in which case we have to byte-swap integral values.
+    
+    Rename the variable and redo the code to match.
+    
+    (This may have caused the PacketLogger reader to fail on big-endian
+    machines.)
+    
+    Change-Id: Ie1a82a7d40e2c58c0b8d482d7c95ab60061ca980
+    Ping-Bug: 10861
+    Reviewed-on: https://code.wireshark.org/review/34434
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 45eadc049e5dce4d0181050f55a0d5709ac9c3c8)
+    Reviewed-on: https://code.wireshark.org/review/34435
+
+commit f880c373c2
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Sep 1 08:37:29 2019 +0000
+
+    [Automatic update for 2019-09-01]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: Ib05412efc1d295b3120ebb86b2a50242695a5815
+    Reviewed-on: https://code.wireshark.org/review/34416
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 8c2939f382
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Aug 31 21:15:08 2019 -0400
+
+    IEEE 802.11: RSN Information tag, more fields optional.
+    
+    IEEE 802.11-2016 Section 9.4.2.25 RSNE
+    All information after Element ID, Length, and Version are optional; therefore the minimal IE length is 2.
+    
+    Bug: 15905
+    Change-Id: I231e31c6a0fe5a26d5dd7c1c36be4e9816a7bb50
+    Reviewed-on: https://code.wireshark.org/review/34411
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit fc1c7155c418ad6381fbf1eab38e7ae09ccace1f)
+    Reviewed-on: https://code.wireshark.org/review/34413
+
+commit 02ddd49885
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Aug 28 22:27:58 2019 -0400
+
+    Gryphon: Prevent endless loop
+    
+    Bug: 16020
+    Change-Id: I59c24d3bdb3f3a85f6e498683594ee12db9642a8
+    Reviewed-on: https://code.wireshark.org/review/34392
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 627917faff4889f763bf8e6570f62d66656047bd)
+    Reviewed-on: https://code.wireshark.org/review/34396
+
+commit 2ef082803a
+Author: Ralph Boehme <slow@samba.org>
+Date:   Sun Aug 25 10:36:26 2019 +0200
+
+    DCERPC: workaround that pidl always emits dissect_deferred_pointers()
+    
+    Commit f57cf9e56c90c0c0c724f415eff35821afaaf849 introduced a DISSECTOR_ASSERT()
+    that revealed a deficiency in pidl: currently pidl unconditionally adds calls to
+    dissect_deferred_pointers() which breaks dissecting any RPC function that
+    has only scalar arguments:
+    
+      Warn Dissector bug, protocol RPCMDSSVC, in packet 51:
+      epan/dissectors/packet-dcerpc.c:2940:
+      failed assertion "list_ndr_pointer_list"
+    
+    Bug: 16022
+    Change-Id: I9d3522a3e17ef79b9a8a5acb018104ab398a512a
+    Reviewed-on: https://code.wireshark.org/review/34364
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit c9f2b9b3edcc7d99a0eb9b506ff3b5f0101bd1a8)
+    Reviewed-on: https://code.wireshark.org/review/34391
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 91e37ba6e1
+Author: Tomasz Moń <desowin@gmail.com>
+Date:   Sun Aug 25 20:28:47 2019 +0200
+
+    NFS: Fix hash table key memory corruption
+    
+    When the same (as determined by key_equal_func) key gets added to the
+    GHashTable, old value gets freed and replaced with the new one. This is
+    fine for hash tables where the key validity is not tightly coupled to
+    the actual data.
+    
+    In the nfs_name_snoop_matched hash table the key becomes invalid once
+    the value gets destroyed (because it shares the data pointed to by fh,
+    which gets freed once the value is destroyed).
+    
+    A problematic capture includes packets such that the matching fh gets
+    added twice to the nfs_name_snoop_matched hash table. Prior to this
+    change the hash table would end up in a state where the new value is
+    associated with the old key (which contains pointer to already freed
+    memory). According to the nfs_name_snoop_matched_equal(), the old key
+    was equal to the key intended for new value *at the time* of insertion.
+    
+    This change fixes the bug by using g_hash_table_replace() which does
+    update the key in case it already exists in the GHashTable.
+    
+    Bug: 16017
+    Bug: 16019
+    Change-Id: Ib3943f1e27e82c05d9abaa1e436554b37a98488e
+    Reviewed-on: https://code.wireshark.org/review/34360
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit efe2926a66d3d7187a260226678daeb2aa6e4832)
+    Reviewed-on: https://code.wireshark.org/review/34361
+    Reviewed-by: Tomasz Moń <desowin@gmail.com>
+
+commit 1961aced20
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Aug 24 21:53:21 2019 +0200
+
+    tshark: Complement manual page synopsis
+    
+    Add '-J' option to synopsis and reshuffle '-j' to correct place.
+    
+    Change-Id: I351b3ce464fca3b52a75614e1e8f8c91f9a30df2
+    Reviewed-on: https://code.wireshark.org/review/34352
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit ef014f76d587918f6e6e305626e56daca6b11d64)
+    Reviewed-on: https://code.wireshark.org/review/34358
+
+commit b05e9091ae
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Aug 24 12:27:32 2019 +0200
+
+    WSUG: Update Control Protocol dissection chapter
+    
+    With the design changes made in the Qt interface with respect to the
+    Deocode as dialogs the Users Guide content is confusing. Update the
+    graphics and text to accurately describe the current design. Update
+    references in other parts of the document too.
+    
+    Change-Id: I6b8315b4e5e50bc0189154bdc56ff2b90f7816d1
+    Reviewed-on: https://code.wireshark.org/review/34348
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 829631dd7e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 25 09:32:44 2019 +0000
+
+    [Automatic update for 2019-08-25]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: Ifa0d3acddb3df898298e05895717b446781406a6
+    Reviewed-on: https://code.wireshark.org/review/34354
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 503e88ae78
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Aug 19 21:16:46 2019 -0700
+
+    Boost the maximum packet size for LINKTYPE_USBPCAP in pcap/pcapng.
+    
+    Bug: 15985
+    Change-Id: I8e043431bbf874d640d4407335d525a44815ee73
+    Reviewed-on: https://code.wireshark.org/review/34327
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit ceca5a7f681118141cb3e4dcff5cdb4991509112)
+    Reviewed-on: https://code.wireshark.org/review/34328
+
+commit f5b2ccdb09
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 18 08:33:29 2019 +0000
+
+    [Automatic update for 2019-08-18]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I12741b0784df010fbf95cd10958b8596922524f3
+    Reviewed-on: https://code.wireshark.org/review/34316
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit cb8fc78cbe
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Fri Aug 16 23:39:00 2019 +0200
+
+    Windows: upgrade Npcap to 0.9982 and nghttp2 to 1.39.2
+    
+    Change-Id: Ib623338f20ff9de64c027278251681c8d1bf2737
+    Reviewed-on: https://code.wireshark.org/review/34308
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+
+commit 6544cb671d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 16 12:12:31 2019 -0700
+
+    cppcheck: Make sure it's installed.
+    
+    Change-Id: I1e33de118c8e022e63f4a2783927e05fe88c364c
+    Reviewed-on: https://code.wireshark.org/review/34305
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit ee625d32aa933cfd8ee08a575d08966076c23068)
+    Reviewed-on: https://code.wireshark.org/review/34306
+
+commit 1727434ccf
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Fri Aug 16 12:52:16 2019 +0200
+
+    DNS: fix bytes highlight for name length and labels count
+    
+    Those generated fields are linked to the dns.qry.name field, so highlight
+    the same bytes.
+    
+    Bug: 15999
+    Change-Id: Ia989b79a9ec14140472b79fdf7acea6e67baee68
+    Reviewed-on: https://code.wireshark.org/review/34299
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+    (cherry picked from commit 32102247cefcdbf582131b4564aa8ccc46b741c2)
+    Conflicts:
+            epan/dissectors/packet-dns.c
+    Reviewed-on: https://code.wireshark.org/review/34301
+
+commit bac1fa433c
+Author: Tomasz Moń <desowin@gmail.com>
+Date:   Tue Aug 13 18:41:23 2019 +0200
+
+    Wiretap: Fix temporary filename memory corruption
+    
+    The pointer returned by create_tempfile() must not be freed. As the
+    wtap_dump_open_tempfile() callers are freeing the returned filename,
+    duplicate the string so it can be freed.
+    
+    Bug: 15377
+    Change-Id: Ib0b23aaee748ef67600ef3f7d40610ebbbec721c
+    Reviewed-on: https://code.wireshark.org/review/34272
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit c4b68b4935081f291795d60a91518a98b6ba9d0d)
+    Reviewed-on: https://code.wireshark.org/review/34295
+
+commit 08cf54446e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 14 10:08:35 2019 -0700
+
+    macos-setup: Update nghttp2 to 1.39.2.
+    
+    1.39.2 fixes CVE-2019-9511 and CVE-2019-9513.
+    
+    Change-Id: Id8f8ed52769522671ffc80c90014cf3b4c6f38ec
+    Reviewed-on: https://code.wireshark.org/review/34287
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit 8e55d856f9fac1347b82fac20113d1ac7d00da7e)
+    Reviewed-on: https://code.wireshark.org/review/34289
+
+commit de2cf9d112
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Wed Aug 14 21:13:34 2019 +0200
+
+    User Guide: document dfilter_macros file
+    
+    In the configuration files overview the dfilter_macros file was missing.
+    Add its description and slay a few typos on the way.
+    
+    Bug: 15973
+    Change-Id: Ib46b8e51f5eb3f5425cfbf04c827ef9c42d0e312
+    Reviewed-on: https://code.wireshark.org/review/34288
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit a5bd19cedf
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 13 15:32:45 2019 -0700
+
+    cppcheck: Fix our target selection.
+    
+    Change-Id: If0fdd7737150357026524a0884b938b809e1244f
+    Reviewed-on: https://code.wireshark.org/review/34277
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit 707fc902b8957357cead83dd18cd976298f03465)
+    Reviewed-on: https://code.wireshark.org/review/34278
+
+commit 94082a2c51
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Mon Aug 12 22:50:41 2019 +0200
+
+    DNS: Add few DNS type full names
+    
+    Items as SSIG, NSEC and DNSKEY had no descriptive. Add these.
+    
+    Bug: 15970
+    Change-Id: I95916e628505c227338346c7aca8ae2dd5050f95
+    Reviewed-on: https://code.wireshark.org/review/34256
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 48ac902807f0b82b1d2b56a0528e7aa70e67f150)
+    Reviewed-on: https://code.wireshark.org/review/34262
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 24a15601e8
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Mon Aug 12 01:54:48 2019 +0100
+
+    EAP: force a new conversation at EAP-Request/Identify
+    
+    TLS requires unique conversations for every TLS session. With EAP-TTLS
+    over EAPOL, only a single conversation was created, breaking TLS.
+    Force a new conversation at the start of the EAP protocol to fix this.
+    
+    This alone was not sufficient, the right conversation was not always
+    matched. This happened due to wildcard matching in EAP (NO_PORT_B) while
+    TLS does not use NO_PORT_B. TLS ended up setting a dummy port via
+    "conversation_set_port2" because PT_NONE is considered connection-less.
+    Even after treating PT_NONE as *not* connection-less in conversation.c,
+    the EAP Success message was not correctly matched against a conversation
+    and resulted into creation of another conversation.
+    
+    To avoid all of that mess, just use the same conversation matching logic
+    as TLS, without NO_PORT_B. The original conversation tracking logic in
+    EAP was presumably added to avoid multiple conversations for EAP over
+    RADIUS (UDP), but that requirement does not seem necessary.
+    
+    Verified with `tshark -2r eap-tls-bug-cert.pcap -otls.log_file:out.txt`,
+    two different `conversation =` values exist for the two sessions.
+    
+    Bug: 15983
+    Change-Id: I3376624ee3ea627eaa6233d39ae3c1d19bdc98bb
+    Reviewed-on: https://code.wireshark.org/review/34247
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 40b19131c26bdcff06af8085c14ea4433b011894)
+    Reviewed-on: https://code.wireshark.org/review/34255
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 56bdb0f4b4
+Author: Roland Knall <rknall@gmail.com>
+Date:   Mon Aug 12 12:43:38 2019 +0200
+
+    Qt: Fix drop event for main window
+    
+    Make sure, that the main window only recognizes drop events containing
+    text/uri-list mime-types, as those are the only ones containing file
+    drops. All other mime-types (e.g. display filter drops) will be ignored
+    
+    Bug: 15986
+    Change-Id: Id4338f75c563d2d177d858d2de470db1ab3499f7
+    Reviewed-on: https://code.wireshark.org/review/34248
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit e01ee242bde88d117e83041cc6c484823585d306)
+    Reviewed-on: https://code.wireshark.org/review/34249
+
+commit 2bd3f63d5e
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Aug 11 17:36:30 2019 +0100
+
+    EAP: show reassembled TLS fragments only on the final frame
+    
+    This avoids multiple dissections on the second pass which could
+    potentially break decryption and TLS handshake reassembly.
+    
+    Bug: 15982
+    Change-Id: I9f83fbd51c732140b831f7d5f29f46e9694e405c
+    Reviewed-on: https://code.wireshark.org/review/34237
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 7bd3edccf12f9eb51c5c36ab1770387a9bdcf3d2)
+    Reviewed-on: https://code.wireshark.org/review/34244
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 5cfd0262f5
+Author: Richard Sharpe <realrichardsharpe@gmail.com>
+Date:   Sun Aug 11 11:35:24 2019 -0400
+
+    radiotap: Comment that there are no more header bit numbers left.
+    
+    The new approach for radiotap headers is TLVs. Let people know there
+    are no more bits available for headers and point them to the correct
+    place: www.radiotap.org.
+    
+    Change-Id: I8393c6ea32edd3cb09bcbf8c5e624c222b422c06
+    Reviewed-on: https://code.wireshark.org/review/34233
+    Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
+    Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit de172153e0e4a4d202ab1e5d509dbd306582294a)
+    Reviewed-on: https://code.wireshark.org/review/34240
+
+commit f5fccadb0f
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sat Aug 10 00:57:00 2019 +0100
+
+    Qt: fix wrong default packet list order in Qt 5.13
+    
+    Workaround a Qt 5.13 bug that made QTreeView::sortByColumn(-1)
+    ineffective and results in sorting rows by the first column in reverse
+    order.
+    
+    This must be called before setModel since that already triggers sorting.
+    
+    Bug: 15979
+    Change-Id: I86c26959d3cb9dd4118193dcda4b1308cc911290
+    Reviewed-on: https://code.wireshark.org/review/34226
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit e1e41c0db5538c58bcbe907cb8020ea89c830fc7)
+    Reviewed-on: https://code.wireshark.org/review/34232
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 8fd4d82692
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sat Jun 29 17:02:59 2019 +0200
+
+    Qt: fix more more Qt 5.13 deprecation warnings
+    
+    Potential functional changes:
+    - rect_on_screen: the new function no longer subtracts the space needed
+      for the dock, task bar, etc.
+    - fontMetrics().width(text) -> fontMetrics.boundingRect(text).width():
+      the bounding box width could be larger than horizontalAdvance(text).
+      For the bytes view, they should be the same due to monospace font.
+      The display filter field calculation was made more accurate (it
+      assumes that textMargins() is 0 which is the default).
+    
+    Change-Id: I70b7937f9215d3bef278befdac7c36a023ffff84
+    Reviewed-on: https://code.wireshark.org/review/33770
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit a854811c4aa40d717c17499ead06cfec5f077fa5)
+    Reviewed-on: https://code.wireshark.org/review/34236
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 462f640afd
+Author: Anders Broman <anders.broman@ericsson.com>
+Date:   Fri Feb 15 15:13:46 2019 +0100
+
+    Replace Qsort with std::sort
+    
+    Change-Id: Ia3741e7b3542524370ac69f731db072d19a44616
+    Reviewed-on: https://code.wireshark.org/review/32044
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 97d34eb1bdc4153cb7f1baf23f67f5ce9289fc55)
+    Reviewed-on: https://code.wireshark.org/review/34235
+
+commit 8a33e74fc5
+Author: Roland Knall <rknall@gmail.com>
+Date:   Fri Jun 28 12:37:02 2019 +0200
+
+    Qt: Fix 5.13 deprecated warnings
+    
+    With Qt 5.13 some methods are deprecated. Fixing those warnings
+    
+    Change-Id: Ia290f06f2b681de1d5b437624de77d8a5c2f5266
+    Reviewed-on: https://code.wireshark.org/review/33761
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit 8e80415aaff15ea68a1aea106cbfc43347fa86af)
+    Reviewed-on: https://code.wireshark.org/review/34234
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 36d281ccea
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 11 08:32:29 2019 +0000
+
+    [Automatic update for 2019-08-11]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I82dd9241d85df904833625b71155c10a7c2be5a6
+    Reviewed-on: https://code.wireshark.org/review/34229
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 5d016fcc74
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 8 08:40:34 2019 +0200
+
+    Qt: Respect recent values on startup
+    
+    Do not call showHideMainWidgets() in initShowHideMainWidgets() because
+    this will override loaded recent values on startup.
+    
+    Setting checked and visible based on recent values is done in layoutPanes()
+    and updateRecentActions().
+    
+    This affects the following View settings: Main Toolbar, Filter Toolbar,
+    Wireless Toolbar, Status Bar, Packet List, Packet Details and Packet Bytes.
+    
+    Also always hide empty_pane because it's never useful to show this.
+    
+    Bug: 15976
+    Change-Id: Id63b8a5fdd263793a283137134f424d7cb4caf82
+    Reviewed-on: https://code.wireshark.org/review/34209
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit dc4084fb822e4669aac95a6dc8c0b6b36597e9bd)
+    Reviewed-on: https://code.wireshark.org/review/34212
+
+commit bded958afe
+Author: Daniel Kamil Kozar <dkk089@gmail.com>
+Date:   Thu Jun 6 17:45:04 2019 +0200
+
+    LSD: Fix valid headers being marked as malformed
+    
+    Due to a change in the meaning of wmem_strsplit's max_tokens argument, the
+    returned field_and_value[1] was always null, causing the dissector code to
+    mistakenly mark it as malformed.
+    
+    Bug: 15971
+    Change-Id: Ifea9e3bf8ec6e18646fb83bc85661a143ce0126b
+    Reviewed-on: https://code.wireshark.org/review/33511
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    (cherry picked from commit 92d0a67f4ea9ff454397ae423a9882c3b493e77b)
+    Reviewed-on: https://code.wireshark.org/review/34201
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit b190a15ef2
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 6 09:44:32 2019 +0200
+
+    Qt: Fix indentation
+    
+    Change-Id: I0e23b981cb1fea4b698711dba4182c749f1fc84c
+    Reviewed-on: https://code.wireshark.org/review/34196
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 14e6fa318b
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Mon Jul 29 22:10:49 2019 +0100
+
+    Qt: do not adjust the time origin for empty graphs
+    
+    If a graph does not contain any visible data (for example, "TCP Errors"
+    in a capture without TCP packets), the start offset is bogus. Ignore it
+    to avoid Time of Day being displayed as 01.01.1970.
+    
+    Bug: 15247
+    Change-Id: I0e0a113dac6aebd42a4b48b89bbf563e96a8807a
+    Reviewed-on: https://code.wireshark.org/review/34129
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit c11fe6483408817255980281828c6edbaece60fe)
+    Reviewed-on: https://code.wireshark.org/review/34192
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit c38ba2ef6d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 4 08:32:05 2019 +0000
+
+    [Automatic update for 2019-08-04]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I568fde112b33dd5029a5636ff80c3f495ed4fb61
+    Reviewed-on: https://code.wireshark.org/review/34178
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 0d210d01aa
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 31 12:26:14 2019 -0700
+
+    epan: Work around a p11-kit bug on Windows.
+    
+    The version of p11-kit that we ship with Windows will crash if we feed
+    gnutls_pkcs11_add_provider an invalid path. Work around this by checking
+    for the file's existence ourselves.
+    
+    Bug: 15957
+    Change-Id: I81484b8bd8f837a49bc17a6c9cb0b10fd33c3f6e
+    Reviewed-on: https://code.wireshark.org/review/34144
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit a7e02fe3b9c795ba881d34b102ae87bf4de06614)
+    Reviewed-on: https://code.wireshark.org/review/34158
+
+commit 7795e921eb
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Jul 31 20:22:58 2019 +0200
+
+    Qt: Check for invalid filters after coloring rules import
+    
+    Check for invalid coloring filters after doing an import to give a
+    proper warning to the user, and to avoid the same warning the next
+    time the coloring rules dialog is opened.
+    
+    Change-Id: If6feee8ad00b3a221d157a46cbfb2462e7b7d6ef
+    Reviewed-on: https://code.wireshark.org/review/34143
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit af59b00f2dd15e739af3673b50a20daa2e4ee7ce)
+    Reviewed-on: https://code.wireshark.org/review/34146
+
+commit 5a1f1be7f5
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 1 12:27:51 2019 +0200
+
+    Qt: Fix typo in extcap options dialog
+    
+    Bug: 15929
+    Change-Id: Ibdc689691711866ab4ed5bb8239a2219f86555bc
+    Reviewed-on: https://code.wireshark.org/review/34147
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 774a32d6044b82b8107fce1b1efdf5ff16c1081d)
+    Reviewed-on: https://code.wireshark.org/review/34148
+
+commit 576a4a1651
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Jul 28 17:58:53 2019 +0100
+
+    proto: fix proto_item_add_bitmask_tree with zero length
+    
+    packet-frame.c calls proto_item_add_bitmask_tree with a zero length, be
+    sure not to trigger undefined behavior (right shift by 64). Observed
+    with the capture from Bug 15247.
+    
+    Change-Id: I5b5b7f920a37365295603be7b915f51b39d99faf
+    Fixes: v2.1.0rc0-1776-gb9fb2ceb88 ("Add heuristic dissectors for the variable part of COTP CR and CC PDUs.")
+    Reviewed-on: https://code.wireshark.org/review/34108
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 78cb716071bfa8a636b9268deea096041293f7de)
+    Reviewed-on: https://code.wireshark.org/review/34126
+
+commit eea69065e7
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Mon Jul 29 01:17:04 2019 +0100
+
+    doc: document WIRESHARK_CONFIG_DIR
+    
+    WIRESHARK_CONFIG_DIR was introduced with Wireshark 3.0 and is more
+    cross-platform than WIRESHARK_APPDATA. The latter was presumably created
+    for use by PortableApps. Let's consider that an internal, undocumented
+    detail that might be change, and document WIRESHARK_CONFIG_DIR instead.
+    
+    Change-Id: I0042d607b282cc6dee4b017b1e80b44087bd62e9
+    Reviewed-on: https://code.wireshark.org/review/34113
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    (cherry picked from commit 04c12dd67bd040958e295584e340905b0ec680ff)
+    Reviewed-on: https://code.wireshark.org/review/34125
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 1ba37d67f7
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jul 28 08:33:50 2019 +0000
+
+    [Automatic update for 2019-07-28]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I7291ec5b5b01e0163200d4d1434722e954739d74
+    Reviewed-on: https://code.wireshark.org/review/34105
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 03d7535f39
+Author: Roland Knall <rknall@gmail.com>
+Date:   Thu Jul 25 23:08:16 2019 +0200
+
+    Qt: Fix coloring rules dialog
+    
+    Invalid filters now lead to the correct enable/disable behavior of the button
+    
+    Bug: 15153
+    Change-Id: I3ea9e27e246146dbeedab89be841bccbb00739e4
+    Reviewed-on: https://code.wireshark.org/review/34085
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit 3a53b8643b8b2f9eba24fef4bfea794f37615a88)
+    Reviewed-on: https://code.wireshark.org/review/34092
+
+commit 869e6e714e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jul 21 08:39:19 2019 +0000
+
+    [Automatic update for 2019-07-21]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I1acc4f7b04983e3c9f31173551885ef4adcb1f09
+    Reviewed-on: https://code.wireshark.org/review/34036
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 475be6a073
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jul 19 11:42:19 2019 -0700
+
+    Provide only one data rate per user for VHT frames.
+    
+    Don't provide an extra not-per-user data rate equal to the data rate for
+    the highest user number; that makes no sense.
+    
+    Bug: 15928
+    Change-Id: Ie6bf5853d630bbf33afd423dc7a8eca26abdf83a
+    Reviewed-on: https://code.wireshark.org/review/34018
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit f08ed173838324166dc9bb817c9cafac1600cd85)
+    Reviewed-on: https://code.wireshark.org/review/34019
+
+commit 879f7e6ff0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jul 18 08:05:43 2019 -0700
+
+    NSIS: Upgrade Npcap to 0.996.
+    
+    Change-Id: I40f435766eee4cdaf1d3d078bb82636b2ddeb01f
+    Reviewed-on: https://code.wireshark.org/review/34005
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 266e73cd3f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 17 12:07:31 2019 -0700
+
+    3.0.3 → 3.0.4.
+    
+    Change-Id: I167f3ada6f428b42fb321f2e320637623ab8e3fb
+    Reviewed-on: https://code.wireshark.org/review/33993
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
diff --git a/NEWS b/NEWS
index 4dc03bd653..7f4e829869 100644
--- a/NEWS
+++ b/NEWS
@@ -7,14 +7,75 @@ Wireshark 3.0.4 Release Notes
 
  What’s New
 
+    • The Windows installers now ship with Npcap 0.9983. They previously
+      shipped with Npcap 0.996.
+
+    • The macOS installer now ships with Qt 5.12.3. It previously
+      shipped with Qt 5.12.4.
+
   Bug Fixes
 
    The following vulnerabilities have been fixed:
 
-     • wnpa-sec-2019-21[1] A dissector went awry.
+     • wnpa-sec-2019-21[1] Gryphon dissector infinite loop. Bug
+       16020[2].
 
    The following bugs have been fixed:
 
+     • Coloring Rules dialog - enable/disable coloring rule issues. Bug
+       15153[3].
+
+     • Enabling Time-Of-Day in IO Graph causes the x-axis origin to be
+       set to 01.01.1970. Bug 15247[4].
+
+     • Wireshark GUI crashes when attempting to DnD multiple (possibly
+       corrupted) pcapng files. Bug 15377[5].
+
+     • Buildbot crash output: randpkt-2019-06-14-14291.pcap. Bug
+       15848[6].
+
+     • 802.11 RSN IE may be shorter than 18 bytes. Bug 15905[7].
+
+     • Tshark outputs two data rate instead of one. Bug 15928[8].
+
+     • Typo in checkbox label at bottom of sshdump configuration screen
+       (save parameters). Bug 15929[9].
+
+     • Invalid pkcs11_libs entry crashes on Windows. Bug 15957[10].
+
+     • Add additional text output for DNS types (DNSSEC). Bug 15970[11].
+
+     • LSD bittorent. Bug 15971[12].
+
+     • dfilter_macros is missing from Configuration Files article. Bug
+       15973[13].
+
+     • Pane configuration inconsistencies. Bug 15976[14].
+
+     • Packet list is sorted in reverse order after applying a display
+       filter in Qt 5.13. Bug 15979[15].
+
+     • EAP-TLS fragments are repeatedly displayed. Bug 15982[16].
+
+     • Broken TLS handshake reassembly in EAP-TTLS with multiple TLS
+       sessions. Bug 15983[17].
+
+     • Wireshark does not support USB packets with size greater than 256
+       KiB. Bug 15985[18].
+
+     • "Unable to drop files during capture." when drag’n’drop entry to
+       create display filter or filter button. Bug 15986[19].
+
+     • Packet Bytes highlight for dns.qry.name.len and dns.count.labels
+       off by one. Bug 15999[20].
+
+     • Segmentation fault in nfs_name_snoop_fh. Bug 16017[21].
+
+     • Changing the protocol preferences caused a crash. Bug 16019[22].
+
+     • DCERPC dissector broken for functions with only scalar variables.
+       Bug 16022[23].
+
   New and Updated Features
 
    There are no new features in this release.
@@ -25,9 +86,12 @@ Wireshark 3.0.4 Release Notes
 
   Updated Protocol Support
 
+   BACnet, DCERPC, DNS, EAP, FC-dNS, Gryphon, IEEE 802.11, LSD, NFS, and
+   Radiotap
+
   New and Updated Capture File Support
 
-   There is no new or updated capture file support in this release.
+   CommView and PacketLogger
 
   New and Updated Capture Interfaces support
 
@@ -36,14 +100,14 @@ Wireshark 3.0.4 Release Notes
  Getting Wireshark
 
   Wireshark source code and installation packages are available from
-  https://www.wireshark.org/download.html[2].
+  https://www.wireshark.org/download.html[24].
 
   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 download page[3] on the Wireshark web site.
+   be found on the download page[25] on the Wireshark web site.
 
  File Locations
 
@@ -55,31 +119,53 @@ Wireshark 3.0.4 Release Notes
  Getting Help
 
   The User’s Guide, manual pages and various other documentation can be
-  found at https://www.wireshark.org/docs/[4]
+  found at https://www.wireshark.org/docs/[26]
 
-  Community support is available on Wireshark’s Q&A site[5] and on the
+  Community support is available on Wireshark’s Q&A site[27] and on the
   wireshark-users mailing list. Subscription information and archives
-  for all of Wireshark’s mailing lists can be found on the web site[6].
+  for all of Wireshark’s mailing lists can be found on the web site[28].
 
-  Bugs and feature requests can be reported on the bug tracker[7].
+  Bugs and feature requests can be reported on the bug tracker[29].
 
   Official Wireshark training and certification are available from
-  Wireshark University[8].
+  Wireshark University[30].
 
  Frequently Asked Questions
 
-  A complete FAQ is available on the Wireshark web site[9].
+  A complete FAQ is available on the Wireshark web site[31].
 
-  Last updated 2019-09-08 08:24:38 UTC
+  Last updated 2019-09-11 19:27:49 UTC
 
  References
 
    1. https://www.wireshark.org/security/wnpa-sec-2019-21
-   2. https://www.wireshark.org/download.html
-   3. https://www.wireshark.org/download.html#thirdparty
-   4. https://www.wireshark.org/docs/
-   5. https://ask.wireshark.org/
-   6. https://www.wireshark.org/lists/
-   7. https://bugs.wireshark.org/
-   8. http://www.wiresharktraining.com/
-   9. https://www.wireshark.org/faq.html
+   2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16020
+   3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15153
+   4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15247
+   5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15377
+   6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15848
+   7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15905
+   8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15928
+   9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15929
+  10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15957
+  11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15970
+  12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15971
+  13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15973
+  14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15976
+  15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15979
+  16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15982
+  17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15983
+  18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15985
+  19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15986
+  20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15999
+  21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16017
+  22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16019
+  23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16022
+  24. https://www.wireshark.org/download.html
+  25. https://www.wireshark.org/download.html#thirdparty
+  26. https://www.wireshark.org/docs/
+  27. https://ask.wireshark.org/
+  28. https://www.wireshark.org/lists/
+  29. https://bugs.wireshark.org/
+  30. http://www.wiresharktraining.com/
+  31. https://www.wireshark.org/faq.html
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 6d20ead1d3..5676178990 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -13,6 +13,12 @@ used for troubleshooting, analysis, development and education.
 
 == What’s New
 
+* The Windows installers now ship with Npcap 0.9983. They previously
+  shipped with Npcap 0.996.
+
+* The macOS installer now ships with Qt 5.12.3. It previously
+  shipped with Qt 5.12.4.
+
 === Bug Fixes
 
 The following vulnerabilities have been fixed: