Build 3.0.7.wireshark-3.0.7v3.0.7

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

4 files changed, 836 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29bb2..d2bb00c0e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,749 @@
+commit ee70129fa1
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Dec 3 16:15:36 2019 -0800
+
+    Prep for 3.0.7.
+    
+    Change-Id: I5adc18b0365cac1d73f30758b808f9885e3868aa
+    Reviewed-on: https://code.wireshark.org/review/35306
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit b61d3cf33e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Dec 1 22:02:58 2019 +0000
+
+    NSIS: The "Sshdump" option installs Ciscodump as well.
+    
+    Use consistent capitalization while we're here.
+    
+    Change-Id: I0591654b0e73d33528f9cfe990a1491ce6cccc8b
+    Reviewed-on: https://code.wireshark.org/review/35278
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit 63945535ac9232f74abe14c76024ff4c2a542137)
+    Reviewed-on: https://code.wireshark.org/review/35298
+
+commit 7de7b2962b
+Author: Tomasz Moń <desowin@gmail.com>
+Date:   Sun Sep 15 12:48:06 2019 +0200
+
+    wsutil: Respect working directory on Windows
+    
+    Pass working directory parameter to win32_create_process() in
+    ws_pipe_spawn_sync().
+    
+    Change-Id: I0abbc4fbf733138b20c2a34845b147530417c91e
+    Reviewed-on: https://code.wireshark.org/review/34533
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 1f2d36aa0bbb0b089d8d61afe53acc630581f15f)
+    Reviewed-on: https://code.wireshark.org/review/35293
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit dd9946f141
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Apr 21 19:48:11 2019 +0100
+
+    ws_pipe: fix memory leaks in spawn arguments handling
+    
+    On Windows, ws_pipe_spawn_sync always leaks 'winargs', and leaks 'argv'
+    on some error paths. Fix these and refactor the common argument parsing
+    functionality to reduce duplication of functionality.
+    
+    Change-Id: I8fa5ca45aec20b53f6fa243b0dd07241a345f7ab
+    Reviewed-on: https://code.wireshark.org/review/32932
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Tomasz Moń <desowin@gmail.com>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit dd1245f5be20e10f8ef917b20c302129b505cd97)
+    Reviewed-on: https://code.wireshark.org/review/35291
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 6c686c775c
+Author: Tomasz Moń <desowin@gmail.com>
+Date:   Tue Apr 30 15:52:38 2019 +0200
+
+    wsutil: Fix 30 seconds freeze if process fails to start
+    
+    In ws_pipe_wait_for_pipe() on Windows, the WaitForMultipleObjects() waits
+    on the pending pipe connection events and process handle. If the process
+    handle is signalled, then it means that the process did exit without
+    connecting to the pipes.
+    
+    The WaitForMultipleObjects() was not waiting on the process handle and thus
+    if the process did fail without connecting to pipes the Wireshark gui was
+    frozen for 30 seconds.
+    
+    This change fixes the freeze by increasing the number of handles, so
+    WaitForMultipleObjects() is aware of the process handle.
+    
+    Change-Id: Id13824a60baf4be7795cbe1d5ed1c7932edbff45
+    Reviewed-on: https://code.wireshark.org/review/33028
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit b075b8c7f7bc88b3d2811ac46c40bd677c5464ee)
+    Reviewed-on: https://code.wireshark.org/review/35292
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+
+commit 3dd28d31c9
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Apr 21 21:17:45 2019 +0100
+
+    ws_pipe: fix return value of ws_pipe_spawn_async on error path
+    
+    The function returns a GPid, not a gboolean. Callers (mmdbresolv and
+    extcap) only assume WS_INVALID_PID to be invalid (as documented).
+    
+    Change-Id: I40b491272a451f569864fa3259009d6d3fcce772
+    Fixes: v2.5.1rc0-413-g1a0987904f ("Generalize our process spawning code.")
+    Reviewed-on: https://code.wireshark.org/review/32933
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Tomasz Moń <desowin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 51ac1047a7e434a0b2e264780b2fa31f1d986898)
+    Reviewed-on: https://code.wireshark.org/review/35290
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 8b020e157a
+Author: Tomasz Moń <desowin@gmail.com>
+Date:   Fri Apr 19 16:08:46 2019 +0200
+
+    wsutil: Refactor WIN32 ws_pipe_wait_for_pipe()
+    
+    The ws_pipe_wait_for_pipe() implementation had multiple issues:
+      * Use auto-reset events with ConnectNamedPipe (should be manual-reset)
+      * Leaking event handles
+      * Not checking return value from CreateEvent()
+      * Waiting on closed handles
+    
+    This change fixes all the above mentioned issues.
+    
+    Bug: 15696
+    Change-Id: Ia0c389a902655f85eccb0c59288b4a7d49da48c9
+    Reviewed-on: https://code.wireshark.org/review/32896
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Tomasz Moń <desowin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit a051d5d869e1932a718eb43bc2089e88cadd30e3)
+    Reviewed-on: https://code.wireshark.org/review/35289
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 7901451905
+Author: Tomasz Moń <desowin@gmail.com>
+Date:   Sun Apr 14 11:39:27 2019 +0200
+
+    wsutil: Warn on empty arguments
+    
+    Callers should not include empty strings in arguments list. Log warning
+    message instead of silently dropping remaining arguments.
+    
+    Change-Id: Ia68c7b90cec860e032f81a4008aa005b07ebcfd5
+    Ping-Bug: 15586
+    Reviewed-on: https://code.wireshark.org/review/32849
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 1998de886cbeb5aceef017fe4c2d03e754a90bb9)
+    Reviewed-on: https://code.wireshark.org/review/35288
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Reviewed-by: Tomasz Moń <desowin@gmail.com>
+
+commit 45e55cc060
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Dec 2 08:41:34 2019 -0800
+
+    Release notes: The macOS installer ships with Qt 5.12.6.
+    
+    Change-Id: Ic3a0cbe40bd90a7a3f3d11e0df993a724c74fb65
+    Reviewed-on: https://code.wireshark.org/review/35284
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit ca8a801c3a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Dec 1 08:45:56 2019 +0000
+
+    [Automatic update for 2019-12-01]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I0f98f59d24ff0f8b1941515c2a45634b0f508660
+    Reviewed-on: https://code.wireshark.org/review/35271
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit d1cf9d411c
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Wed Nov 27 02:11:53 2019 +0000
+
+    Qt: focus the correct field when switching packets
+    
+    Instead of just visually marking a field after switching packets, make
+    sure that it is also focused such that arrow up/down keys select the
+    expected fields instead of the root node (the Frame layer).
+    
+    Change-Id: Ic16462198fb2189496f0cceeb5a5e885673636d2
+    Reviewed-on: https://code.wireshark.org/review/35236
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit 07a1753d447bf46d8f197c837983602258191529)
+    Reviewed-on: https://code.wireshark.org/review/35242
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+
+commit b82474130a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Nov 26 15:24:18 2019 -0800
+
+    Add more support for the 802.11ax PHY.
+    
+    Set it as the PHY type if we see the HE field in a radiotap header, and
+    report that PHY type as "802.11ax" in the generic radio metadata
+    dissector.
+    
+    Change-Id: I181d2717d82bdca73e04b6111b2483ca099d48bb
+    Ping-Bug: 13207
+    Reviewed-on: https://code.wireshark.org/review/35227
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 473900d102244dc83e81c1335ac456e54525ebfe)
+    Reviewed-on: https://code.wireshark.org/review/35239
+
+commit 44df504ee1
+Author: Richard Sharpe <realrichardsharpe@gmail.com>
+Date:   Mon May 20 12:28:52 2019 -0400
+
+    wtap: Add support for 802.11ah and 802.11ax PHYs.
+    
+    There may need to be more of these.
+    
+    Bug: 15740
+    Change-Id: I5d3a97ed50d66dfcb85df0ab7053e8a44c531134
+    Reviewed-on: https://code.wireshark.org/review/33280
+    Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    (cherry picked from commit 2b916d64242aacebb52b64d06738e25fe2ea14e6)
+    Reviewed-on: https://code.wireshark.org/review/35237
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit fcfbeb9c17
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Nov 24 18:21:03 2019 +0000
+
+    Qt: prevent inline completion from happening for filters
+    
+    Commit v3.1.0rc0-1170-ga854811c4a replaced the deprecated
+    `setAutoCompletion(false)` call by `setCompleter(0)`. However, the
+    former has as side-effect that it prevents setLineEdit from creating a
+    custom completer. setCompleter on the other hand had no effect since
+    there was no existing completer.
+    
+    To fix the issue, remove the completer after it is set by setLineEdit.
+    This has no effect on the completer from CaptureFilterEdit and
+    DisplayFilterEdit instances since they override the completer from
+    QLineEdit. To avoid any confusion, SyntaxLineEdit::setCompleter (and
+    completer) should probably be renamed, these are not used by QComboBox
+    since it is not marked as virtual method.
+    
+    Bug: 16132
+    Change-Id: Iad619122eddb43eb4963347982bf65dacd29629b
+    Fixes: v3.1.0rc0-1170-ga854811c4a ("Qt: fix more more Qt 5.13 deprecation warnings")
+    Reviewed-on: https://code.wireshark.org/review/35198
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit de0d3628f6cb1ad9025d93a2bafe940a344ffd60)
+    Reviewed-on: https://code.wireshark.org/review/35212
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+
+commit d6a66eedf3
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Mon Nov 25 03:10:27 2019 +0000
+
+    Qt: fix crash on Next/Previous Packet in Conversation without selection
+    
+    Protect against a NULL edt pointer. That can occur when the packet
+    details view is empty, e.g. when no packet is selected.
+    
+    Bug: 16228
+    Change-Id: Ie9621db4b84b504e4d9cee2add5004df2e383970
+    Reviewed-on: https://code.wireshark.org/review/35204
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit c9bb676118caade49e2f9365910a76cbc0a5f343)
+    Reviewed-on: https://code.wireshark.org/review/35210
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 91f1109c38
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Wed Nov 20 06:14:07 2019 +0000
+
+    Qt: fix display filter completion with few recent entries
+    
+    If 1) the recent filters menu has less than 10 entries and 2) the cursor
+    position is not at the end of the filter, then completion would fail.
+    Additionally, pressing Enter on filters with syntax errors would also
+    end up being saved, unintentionally.
+    
+    Fix these by disabling automatic addition of entries by Qt.
+    
+    Change-Id: I612c6cb8f317beb5459919b5c65b837db6150d07
+    Reviewed-on: https://code.wireshark.org/review/35150
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 27f96069325ce84c825252d9cdf35538e57ce8d0)
+    Reviewed-on: https://code.wireshark.org/review/35197
+
+commit 0923eddc11
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 24 08:48:33 2019 +0000
+
+    [Automatic update for 2019-11-24]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I213e67eef48ce95525d96113a3849840b8aca619
+    Reviewed-on: https://code.wireshark.org/review/35194
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit e964fc198c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Nov 20 16:02:32 2019 +0100
+
+    print: remove assert in get_field_data().
+    
+    The check in the caller suggests this function can fail. The
+    assert should not be necessary, then.
+    
+    Bug: 16218
+    Change-Id: Ic2186f3c51751db61436719bbf5bce609d364d40
+    Reviewed-on: https://code.wireshark.org/review/35162
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 986fec7f3ba9db9b60fe209fb5d41ba5d291cde5)
+    Reviewed-on: https://code.wireshark.org/review/35174
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+
+commit d512eb1db0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Nov 18 09:07:11 2019 -0800
+
+    Release notes: The Windows installers ship with Qt 5.12.6.
+    
+    Change-Id: I9b7c8a17e63889679ece11811554e66b460f4c80
+    Reviewed-on: https://code.wireshark.org/review/35124
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 5bcd128e4c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 17 08:33:48 2019 +0000
+
+    [Automatic update for 2019-11-17]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I199c485f229239a00f3d8caa91ace0f10f1e2eeb
+    Reviewed-on: https://code.wireshark.org/review/35109
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 8b68a774fe
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Mon Oct 14 21:46:29 2019 +0200
+
+    Fix display of pino protocols in display filter dropdown
+    
+    Qt GUI uses proto_get_first_protocol() to find the list of protocols
+    and build the autocompletion list. As pinfo protocols are stored in
+    another list, they are kept aside.
+    Let's add them in the same list as normal protocols.
+    
+    Bug: 16130
+    Change-Id: I9ff67ea4198a8cc6baf3ded584c48eadfb097092
+    Reviewed-on: https://code.wireshark.org/review/34778
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+    Reviewed-on: https://code.wireshark.org/review/35059
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+
+commit 9ca35141aa
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Nov 11 18:22:17 2019 -0800
+
+    Fix name of the "remove Wireshark from PATH" package.
+    
+    Bug: 16200
+    Change-Id: I0e9ab373eb3f7f533fe1ae9bf0448b66b4cdf522
+    Reviewed-on: https://code.wireshark.org/review/35056
+    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 46dc852dd235c5ed7c3e242210c125714b23f353)
+    Reviewed-on: https://code.wireshark.org/review/35057
+
+commit 05304190a4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Nov 11 12:31:08 2019 -0800
+
+    Don't report EPIPE errors writing out packet information.
+    
+    EPIPE almost certainly means "the next program after us in the pipeline
+    exited before we were finished writing", so this isn't a real error, it
+    just means we're done.  (We don't get SIGPIPE because libwireshark
+    ignores SIGPIPE to avoid getting killed if writing to the MaxMind
+    process gets SIGPIPE because that process died.)
+    
+    Presumably either that program exited deliberately (for example, "head
+    -N" read N lines and printed them), in which case there's no error to
+    report, or it terminated due to an error or a signal, in which case
+    *that's* the error and that error has been reported.
+    
+    (We don't do that for EINVAL, as that's presumably a real error.  It
+    shows up on Windows in bug 16192, but what we probably want to do there
+    is to, on Windows, use _doserrno, check for the equivalent Windows
+    errors, and, for the default case, convert _doserrno to the appropriate
+    string, using Windows APIs, and report *that* string; the MS C library
+    converts a whole bunch of Windows errors to EINVAL, thus losing
+    information and making it harder to determine what the real error is.
+    
+    Therefore, I'm just marking this with Ping-Bug, as it's only fixing the
+    problem on UN*Xes.)
+    
+    Change-Id: I94c392f478561e29501facd657487716a5882295
+    Ping-Bug: 16192
+    Reviewed-on: https://code.wireshark.org/review/35053
+    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 560f2e54ba4848fe1b776b29a3d63c2af192a0db)
+    Reviewed-on: https://code.wireshark.org/review/35054
+
+commit 13845d24cc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 10 08:33:55 2019 +0000
+
+    [Automatic update for 2019-11-10]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I3a05d898ae16164693738dc9f4bfdfcd7c751851
+    Reviewed-on: https://code.wireshark.org/review/35042
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 781e3b9607
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Nov 7 11:35:47 2019 +0000
+
+    Qt: Keep extcap control channels when capturing to multiple files
+    
+    When using the "Create a new file automatically" feature the capture in
+    Wireshark will stop and start, but the extcap utility will continue run
+    as normal. Ensure the control channels are kept when doing this.
+    
+    Rename the unused capture_session.session_started to session_will_restart
+    to detect this.
+    
+    Bug: 16178
+    Change-Id: I1ef7dec274b22b98f7808df610e006e6d2c0085e
+    Reviewed-on: https://code.wireshark.org/review/35024
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit ef32e00d31
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Nov 4 01:27:44 2019 +0100
+
+    gitlab-ci: bump opensuse image version to 15.1.
+    
+    According to https://en.wikipedia.org/wiki/OpenSUSE_version_history#Leap_15_series_[22][23]
+    15.0 is EOL in November 2019.
+    
+    Change-Id: I201fc2683078f7ae16b9317e3b34c312f442aeb1
+    Reviewed-on: https://code.wireshark.org/review/34944
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 8cfe3f5aeb8862e2ae4e89e054c51d3111334d6a)
+    Reviewed-on: https://code.wireshark.org/review/34997
+
+commit a03331d1dc
+Author: Jirka Novak <j.novak@netsystem.cz>
+Date:   Sun Nov 3 01:11:21 2019 +0100
+
+    RTP: rtp_audio_stream.cpp: fixed excess silence in visualisation on waveform
+    
+    When silence is inserted to waveform (VaD, no RTP, ...), waveform is shifted to correct time in visualisation. Code was inserting silence to audio waveform too therefore following audio was shifted twice.
+    This patch fixes it.
+    
+    Change-Id: I4f3e02328662f92b1dabec80ce9da31d0a839046
+    Reviewed-on: https://code.wireshark.org/review/34969
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 9eb6e05d98
+Author: Jirka Novak <j.novak@netsystem.cz>
+Date:   Thu Oct 31 23:14:52 2019 +0100
+
+    rtp_analysis_dialog: save as au: fix for streams with multiple codecs
+    
+    When the stream contains a mix of G.711A/U and silence, the RTP Analysis dialog
+     prevented it from being saved. Add an exception for silence to fix this.
+    
+    Change-Id: I46bb1392244ff0ba300c371fb5ccd110fbd59a7e
+    Reviewed-on: https://code.wireshark.org/review/34901
+    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 0f35832fce91d4202f788939056d47d6abf2feb3)
+    Reviewed-on: https://code.wireshark.org/review/34968
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+
+commit c500ad4f72
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Tue Nov 5 11:58:39 2019 +0000
+
+    TLS: report encrypted TLS alerts as such
+    
+    Encrypted alerts could be misreported as plain encrypt messages. Be sure
+    to check the length before interpreting it as unencrypted alert message.
+    Rename SSL to TLS while at it, and support unknown alerts.
+    
+    Bug: 16180
+    Change-Id: I223568f8502cd629fed4642a786c9f5fcb488e8e
+    Reviewed-on: https://code.wireshark.org/review/34982
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 3ccb01666bb1c4f0fad79472cf7626d3ce0eb77e)
+    Reviewed-on: https://code.wireshark.org/review/34983
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 51fea6d567
+Author: Jirka Novak <j.novak@netsystem.cz>
+Date:   Sat Nov 2 22:33:03 2019 +0100
+
+    rtp_analysis_dialog.cpp: Correct src/dst info for two independent streams
+    
+    Display the source and destination for the second reverse stream in case
+    it differs from the first forward stream.
+    
+    Change-Id: I117899acca47713a42efcfef28f893d9be26c337
+    Reviewed-on: https://code.wireshark.org/review/34915
+    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 d1128e58c46d27bb73b9ed8290a80c1ce396d59b)
+    Reviewed-on: https://code.wireshark.org/review/34970
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit e3872f8795
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Mon Nov 4 15:08:22 2019 +0100
+
+    CMS: reset object_identifier_id after dissecting ContentInfo
+    
+    Bug: 15961
+    Change-Id: I3d6b3e96103b69f88fcb512da81fa20ff6a1c40e
+    Reviewed-on: https://code.wireshark.org/review/34960
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit 23850a3342d64b9c9808f14c20bfea6d22b7dc08)
+    Reviewed-on: https://code.wireshark.org/review/34974
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+
+commit c57452e130
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Mon Nov 4 16:40:01 2019 +0100
+
+    Show correct format of --display command line parameter
+    
+    The --display command line parameter must not have an equal sign
+    between it and the value in order to work. Otherwise it is interpreted
+    as a abbreviation of the display-filter long option.
+    
+    Bug: 16167
+    Change-Id: Ifcdd4cb8c41b24faccf01936a019a318fb1c3e0c
+    Reviewed-on: https://code.wireshark.org/review/34961
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit 2336547a5fd239b97d86cb8213a438562d96fc55)
+    Reviewed-on: https://code.wireshark.org/review/34966
+
+commit 26234929c2
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Nov 3 18:50:52 2019 +0000
+
+    TLS: workaround broken TLS reassembly with multiple TLS records
+    
+    Break nested TLS in TLS in favor of keeping TLS reassembly working.
+    
+    Bug: 16109
+    Change-Id: I10da5392635ea5224c1c7b31f24cebc45d8926ee
+    Reviewed-on: https://code.wireshark.org/review/34942
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit a596d269e8d39674a1ac336c6d80eeabeae25522)
+    Reviewed-on: https://code.wireshark.org/review/34956
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 56bffd9a0c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Nov 4 13:29:48 2019 +0000
+
+    macOS: Properly sign our extra packages.
+    
+    Use productsign to sign product archives.
+    
+    Change-Id: I40fd329e6f2b0abc49f1b4b0247eae380de8101b
+    Reviewed-on: https://code.wireshark.org/review/34951
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit 89890097bdc4c1dd1fbdfb1a6a3b36ff75616e4c)
+    Reviewed-on: https://code.wireshark.org/review/34955
+
+commit 81c706f581
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Fri Nov 1 22:24:27 2019 +0100
+
+    BGP: IPv6 Linkstate Prefix Reachability info
+    
+    Add IP version to call the right decode_prefix function.
+    
+    Bug: 16144
+    Change-Id: I06239863b98beeef9ff80e1a8b6e13b4113fb065
+    Reviewed-on: https://code.wireshark.org/review/34913
+    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: Roland Knall <rknall@gmail.com>
+    (cherry picked from commit 7dfe906176d36b24d3cc39457569794b239501f3)
+    Reviewed-on: https://code.wireshark.org/review/34930
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+
+commit 73f7d42d51
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 3 08:40:09 2019 +0000
+
+    [Automatic update for 2019-11-03]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: Ib5bcc69a6c34dbe71175cf47489c5b74eab9f1ed
+    Reviewed-on: https://code.wireshark.org/review/34919
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 6888c97b27
+Author: Eugene Adell <eugene.adell@gmail.com>
+Date:   Thu Oct 31 11:20:06 2019 -0700
+
+    Correct JPEG file saving for french language
+    
+    Bug: 16165
+    Change-Id: I555cd7fc4265ad8f8766f5e3b0d99b9e2e5b93b9
+    Reviewed-on: https://code.wireshark.org/review/34897
+    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 c93b7f64772b9384fc42e403e9ad819c227837a2)
+    Reviewed-on: https://code.wireshark.org/review/34898
+
+commit ee4adc10af
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Oct 30 14:56:32 2019 -0700
+
+    Fix the temporary file string buffer expansion.
+    
+    The buffer needs to be big enough to include the trailing '\0', so we
+    need to compare the buffer's length against strlen(name) + 1, not
+    against strlen(name).
+    
+    Bug: 15751
+    Change-Id: I75ae65f8c818284834d761d9dd911d029cfca3b1
+    Reviewed-on: https://code.wireshark.org/review/34892
+    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 d0f8691d3ff9a0c7a93ccd66de915b58dbc906bc)
+    Reviewed-on: https://code.wireshark.org/review/34893
+
+commit b671c13149
+Author: John Serock <serock-wireshark-dev@outlook.com>
+Date:   Sun Oct 27 18:28:15 2019 -0400
+
+    HomePlug AV: Fix dissection of MMTYPE and FMI
+    
+    Get MMTYPE MSB from the three most significant bits, bits 5 through 7,
+    instead of bits 1 and 2. Get FMI Fragment count from the four most
+    significant bits instead of the four least significant bits. Get FMI
+    Fragment index from the four least significant bits instead of the four
+    most significant bits.
+    
+    Bug: 16158
+    Change-Id: Ib51789486be4562f76114081cbbf3aa22a41ff2e
+    Reviewed-on: https://code.wireshark.org/review/34868
+    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 d3b3b120344b1f4b98c68edfcd8dcc607e9d0e40)
+    Reviewed-on: https://code.wireshark.org/review/34869
+
+commit 1e013393cd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Oct 27 08:38:12 2019 +0000
+
+    [Automatic update for 2019-10-27]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I50f6ff0237def46ab530e14496d0cd85869896de
+    Reviewed-on: https://code.wireshark.org/review/34862
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 9f421e4f7c
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Wed Oct 23 11:26:14 2019 +0200
+
+    asn2wrs.py: fix parsing of integer unions with extension
+    
+    When parsing the description
+    ExpectedActivityPeriod ::= INTEGER (1..30|40|50|60|80|100|120|150|180|181,...)
+    asn2wrs.py was generating some code where the has_extension flag was
+    wrongly set to false, leading to a decoding error.
+    
+    Bug: 16145
+    Change-Id: I0d54994c0656f5b48f3dcd1864218c45a4ebc308
+    Reviewed-on: https://code.wireshark.org/review/34837
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+    (cherry picked from commit eb4e83d5891165ca1f958cf57641200a8cb5a0b4)
+    Conflicts:
+            epan/dissectors/packet-ngap.c
+    Reviewed-on: https://code.wireshark.org/review/34848
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+
+commit 76f3c581ce
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Oct 23 12:08:14 2019 -0700
+
+    3.0.6 → 3.0.7.
+    
+    Change-Id: I5791cc8a20d8b2a0abbf5680d80288ca2d330e7f
+    Reviewed-on: https://code.wireshark.org/review/34846
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
diff --git a/NEWS b/NEWS
index b5e81b2d4e..48dc96988b 100644
--- a/NEWS
+++ b/NEWS
@@ -7,17 +7,62 @@ Wireshark 3.0.7 Release Notes
 
  What’s New
 
-  The Windows installers now ship with Qt 5.12.6. They previously
-  shipped with Qt 5.12.5.
+  The Windows and macOS installers now ship with Qt 5.12.6. They
+  previously shipped with Qt 5.12.5.
 
   Bug Fixes
 
    The following vulnerabilities have been fixed:
 
-     • wnpa-sec-2019-22[1] Foo dissector {crash,infinite loop}.
+     • wnpa-sec-2019-22[1] CMS dissector crash. Bug 15961[2].
+       CVE-2019-19553[3].
 
    The following bugs have been fixed:
 
+     • ws_pipe_wait_for_pipe() can wait on closed handles. Bug 15696[4].
+
+     • Support for 11ax in PEEKREMOTE. Bug 15740[5].
+
+     • The temporary file …​ could not be opened: Invalid argument. Bug
+       15751[6].
+
+     • Reassembling of the two TLS records is not working correctly. Bug
+       16109[7].
+
+     • Display Filter Area: Dropdown Missing pkt_comment and
+       tcp.options.sack_perm (likely others). Bug 16130[8].
+
+     • Display Filter autocompletion should be disabled. Bug 16132[9].
+
+     • BGP Linkstate IP Reachability information is incorrect. Bug
+       16144[10].
+
+     • NGAP: ExpectedUEActivityBehaviour decode error. Bug 16145[11].
+
+     • HomePlug AV dissector: MMTYPE and FMI fields are dissected
+       incorrectly. Bug 16158[12].
+
+     • JPEG files cannot be saved on Windows with french language. Bug
+       16165[13].
+
+     • X11 --display interpreted as --display-filter which maps to -Y
+       option. Bug 16167[14].
+
+     • "Create new file automatically after" not working with extcap.
+       Bug 16178[15].
+
+     • Encrypted TLS alerts sometimes listed as decrypted. Bug
+       16180[16].
+
+     • The "Remove Wireshark from the system path" package has "Add
+       Wireshark to the system PATH" as its title. Bug 16200[17].
+
+     • tshark -T ek -x causes get_field_data: code should not be
+       reached. Bug 16218[18].
+
+     • Crash on Go → Next/Previous Packet in Conversation when no packet
+       is selected. Bug 16228[19].
+
   New and Updated Features
 
    There are no new features in this release.
@@ -28,6 +73,8 @@ Wireshark 3.0.7 Release Notes
 
   Updated Protocol Support
 
+   BGP, HomePlug AV, IEEE 802.11, and TLS
+
   New and Updated Capture File Support
 
    There is no new or updated capture file support in this release.
@@ -39,14 +86,14 @@ Wireshark 3.0.7 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[20].
 
   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[21] on the Wireshark web site.
 
  File Locations
 
@@ -58,27 +105,45 @@ Wireshark 3.0.7 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/[22]
 
-  Community support is available on Wireshark’s Q&A site[5] and on the
+  Community support is available on Wireshark’s Q&A site[23] 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[24].
 
-  Bugs and feature requests can be reported on the bug tracker[7].
+  Bugs and feature requests can be reported on the bug tracker[25].
 
  Frequently Asked Questions
 
-  A complete FAQ is available on the Wireshark web site[8].
+  A complete FAQ is available on the Wireshark web site[26].
 
-  Last updated 2019-12-01 08:35:35 UTC
+  Last updated 2019-12-04 16:18:05 UTC
 
  References
 
    1. https://www.wireshark.org/security/wnpa-sec-2019-22
-   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. https://www.wireshark.org/faq.html
+   2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15961
+   3. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19553
+   4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15696
+   5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15740
+   6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15751
+   7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16109
+   8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16130
+   9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16132
+  10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16144
+  11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16145
+  12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16158
+  13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16165
+  14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16167
+  15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16178
+  16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16180
+  17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16200
+  18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16218
+  19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16228
+  20. https://www.wireshark.org/download.html
+  21. https://www.wireshark.org/download.html#thirdparty
+  22. https://www.wireshark.org/docs/
+  23. https://ask.wireshark.org/
+  24. https://www.wireshark.org/lists/
+  25. https://bugs.wireshark.org/
+  26. https://www.wireshark.org/faq.html
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 9037d2cc42..f563ee2921 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -23,7 +23,7 @@ The following vulnerabilities have been fixed:
 * wssalink:2019-22[]
 CMS dissector crash.
 wsbuglink:15961[].
-// cveidlink:2019-XXXXX[].
+cveidlink:2019-19553[].
 // Fixed in master: 23850a3342
 // Fixed in master-3.0: e3872f8795
 // Fixed in master-2.6: 34d2e0d531
diff --git a/wireshark.appdata.xml b/wireshark.appdata.xml
index bb201dc773..b730f2236d 100644
--- a/wireshark.appdata.xml
+++ b/wireshark.appdata.xml
@@ -47,6 +47,9 @@
 	<screenshot>https://www.wireshark.org/~morriss/Screenshot-Wireshark2.0-Stevens-graph.png</screenshot>
     </screenshots>
     <releases>
+        <release version="3.0.7" date="2019-12-04">
+            <url>https://www.wireshark.org/docs/relnotes/wireshark-3.0.7.html</url>
+        </release>
         <release version="3.0.6" date="2019-10-23">
             <url>https://www.wireshark.org/docs/relnotes/wireshark-3.0.6.html</url>
         </release>