Build 3.4.1.

1 files changed, 1045 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29bb2..ed3060c76a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,1045 @@
+commit 181eb5cf82
+Author: John Thacker <johnthacker@gmail.com>
+Date:   Tue Dec 8 23:21:13 2020 +0000
+
+    epan: Fix format_text treament of Greek, Arabic, etc.
+    
+    format_text uses the wrong bitmask when checking for two byte UTF-8
+    characters, resulting in rejecting half the possible two bytes characters,
+    including all of Arabic and Greek, and substituting REPLACEMENT CHARACTER
+    for them. Fixes #17070, and add some comments about the current behavior
+    that doesn't match existing comments.
+    
+    
+    (cherry picked from commit 770746cca810f0979f4b8dc82e2b2f1150f98dcc)
+
+commit 9cee503a87
+Author: Yoshihiro Ueda <uyoshihiro@users.noreply.gitlab.com>
+Date:   Sun Dec 6 12:47:04 2020 +0000
+
+    SOME/IP: Fixed incorrect resetting offset of static array.
+    
+    Fixed resetting offset of array to enable only when created tvb subset. Fixes #17057
+    
+    
+    (cherry picked from commit 2ab153527dd38ce3528b02ed25c89b54e1b4aa6c)
+
+commit b668d0a9d5
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Oct 30 13:52:54 2020 +0000
+
+    Qt: Support ampersand in funnel menu and button
+    
+    An ampersand in the menu item or a button is used as shortcut, so
+    use "&&" to get a real ampersand.
+    
+    
+    (cherry picked from commit c84681aca2fb1144df94880d9997a5800006c2e0)
+
+commit d5ea403f8d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Nov 30 12:31:55 2020 +0100
+
+    Qt: Fix packet bytes hover rectangle position
+    
+    For Qt 5.11 and newer use horizontalAdvance() instead of boundingRect().width()
+    to calculate the width of a QString to position the hover rectangle position,
+    and to select which byte(s) to highlight.
+    
+    Closes #17033.
+    
+    (cherry picked from commit cb3b469d7fa25b5e0cd288c1bc2fbfad11242b1f)
+
+commit 3cd179d007
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Oct 29 15:01:27 2020 +0000
+
+    Lua: Improve Listener error handling
+    
+    Fix error handlers in Listener draw() and reset() to avoid getting
+    LUA_ERRERR from lua_pcall(). Added error handler for Listener draw()
+    callback.
+    
+    Handle LUA_ERRERR from lua_pcall() to avoid assert on this.
+    Changed some capitalized words in various error message.
+    
+    Closes #16974.
+    
+    
+    (cherry picked from commit d104571e8a5f8d1d808296aebf45d0a40dd3203c)
+
+commit 41a97c978d
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Mon Dec 7 21:46:38 2020 +0000
+
+    SMB/SMB2: FS Name is always Unicode
+    
+    According to MS-CIFS sections 2.2.8.2.6 [1] FS Name (or Label) string
+    is in unicode.
+    
+    [1]: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/1011206a-55c5-4dbf-aff0-119514136940
+    
+    Fixes: wireshark/wireshark#17064
+    
+    
+    (cherry picked from commit c876b34ed10399454f3c87fd17a9e57c526584de)
+
+commit 1296e05a52
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Dec 7 18:41:32 2020 -0800
+
+    Prep for 3.4.1.
+
+commit 3501e40941
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Dec 8 19:44:42 2020 +0000
+
+    GitLab CI: Update lintian excludes.
+    
+    Add "copyright-excludes-files-in-native-package" to the lintian exclude
+    list. The wireshark/wireshark-ubuntu-dev image was updated to 20.04
+    recently, and its lintian added
+    https://lintian.org/tags/copyright-excludes-files-in-native-package.html.
+    
+    
+    (cherry picked from commit 7a8a3a8702d8f5c5b33173d0598ecb0cf0a1df34)
+
+commit fa02a5779f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Dec 6 09:26:00 2020 +0000
+
+    [Automatic update for 2020-12-06]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit e507bee854
+Author: Andrii Vladyka <a.vladyka@ukr.net>
+Date:   Sat Dec 5 07:41:04 2020 +0000
+
+    DOCSIS: Add FDX Sub-band TLV support in MDD Downstream Active Channel List
+    
+    
+    (cherry picked from commit 18ae9bd4e22cc9919652818c9db4df96682b35c1)
+
+commit d6be39038c
+Author: Guy Harris <gharris@sonic.net>
+Date:   Sat Dec 5 21:22:49 2020 +0000
+
+    editcap: add IDBs to second and subsequent output files.
+    
+    Remember all the IDBs we've seen from the input file so far and, if
+    we're writing multiple files (splitting an input file into multiple
+    output files), add all those IDBs to each of the output files.
+    
+    Fixes issue #17060.
+    
+    
+    (cherry picked from commit a11e5261e1875b024a0674e657f9cc5b6c7579fc)
+
+commit c3aef32766
+Author: Andrii Vladyka <a.vladyka@ukr.net>
+Date:   Thu Dec 3 00:26:08 2020 +0000
+
+    DOCSIS: Fixed FDX Sub-band ID/offset TLVs dissection
+    
+    
+    (cherry picked from commit 708ada8381305bf8156977782d3ff33af929048c)
+
+commit 2491a8f7f3
+Author: Guy Harris <gharris@sonic.net>
+Date:   Fri Dec 4 12:37:32 2020 +0000
+
+    wlan: fix a bug-number typo in comments.
+    
+    
+    (cherry picked from commit 00d45cc71a629cfad3be9aa63e5e136b4edafbd8)
+
+commit db14720d63
+Author: John Thacker <johnthacker@gmail.com>
+Date:   Tue Dec 1 01:20:25 2020 +0000
+
+    qt+export objects: Don't sort the header in with the content types
+    
+    The Export Objects Content-Type filter combobox should not sort the
+    header of "All Content-Types" in with the list of content types, but
+    should ensure that it is always the first item, especially as the first
+    item position is used to show all content. This is particularly an issue
+    in some localizations; e.g., すべてのコンテントタイプ alphabetizes
+    after actual content types. Fixes bug #17048
+    
+    
+    (cherry picked from commit 2d8dd9ed4f3f99f715adaed04e682ab45cfe1f35)
+
+commit c2d9eb4cfd
+Author: Teyut <teyut@free.fr>
+Date:   Thu Dec 3 22:22:02 2020 +0000
+
+    RadioTap: skip present bits for vendor NS.
+    
+    An error messages was shown when more than 1 present bits was set for a vendor NS because these bits were not skipped properly. Closes https://gitlab.com/wireshark/wireshark/-/issues/17047
+    
+    
+    (cherry picked from commit 96e31cb1163172b61841070e7b67f44dce9b4153)
+
+commit 787e19080e
+Author: Guy Harris <gharris@sonic.net>
+Date:   Thu Dec 3 20:03:54 2020 +0000
+
+    wlan: never treat DMG frames as if they have an HT Control field.
+    
+    At least one ns-3 capture has DMG frames (as indicated by the channel
+    number being in the 60 GHz band - radiotap currently has no DMG metadata
+    field) that have the +HTC/Order flag subfield set but have no HT Control
+    field, causing them to be misdissected.
+    
+    802.11-2016 says that DMG frames should never have +HTC/Order set; if it
+    *is* set in a QoS frame known to be a DMG frame, flag it with an expert
+    info item and don't treat it as having an HT Control field.
+    
+    Update a bunch of comments to give more information, put comments in the
+    appropriate places, and speak of 802.11-2016 rather than older standards.
+    
+    While we're at it, update the title and description of the +HTC/Order
+    flag to reflect its name as of 802.11-2016.
+    
+    
+    (cherry picked from commit 3c640ca04a4710fa5d69f632c215c611572a6ff4)
+
+commit 1a79e899df
+Author: Guy Harris <gharris@sonic.net>
+Date:   Thu Dec 3 11:42:19 2020 +0000
+
+    PI_MALFORMED is not a valid error severity; fix it to PI_ERROR.
+    
+    
+    (cherry picked from commit ac0cf10ab08755797e7484f487cf76c8264a1f22)
+
+commit d88fadf46d
+Author: Nardi Ivan <nardi.ivan@gmail.com>
+Date:   Wed Nov 11 09:33:20 2020 +0000
+
+    QUIC: fix decryption when "loss-bits" feature is enabled
+    
+    If the "loss bits" feature has been negotiated between the peers, the
+    algorithm used by Header Protection cipher must be updated.
+    
+    See: https://tools.ietf.org/html/draft-ferrieuxhamchaoui-quic-lossbits-03
+    
+    Close #17010
+    
+    
+    (cherry picked from commit 5798b91c1526747bf688b6746b33562c1b24a9e0)
+
+commit fa53725469
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Dec 1 20:00:13 2020 +0000
+
+    Kafka: Limit our decompression size.
+    
+    Don't assume that the Internet has our best interests at heart when it
+    gives us the size of our decompression buffer. Assign an arbitrary limit
+    of 50 MB.
+    
+    This fixes #16739 in that it takes care of
+    
+    ** (process:17681): WARNING **: 20:03:07.440: Dissector bug, protocol Kafka, in packet 31: ../epan/proto.c:7043: failed assertion "end >= fi->start"
+    
+    which is different from the original error output. It looks like *that*
+    might have taken care of in one of the other recent Kafka bug fixes.
+    
+    The decompression routines return a success or failure status. Use
+    gbooleans instead of ints for that.
+    
+    
+    (cherry picked from commit f4374967bbf9c12746b8ec3cd54dddada9dd353e)
+
+commit 5edf715c04
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Dec 1 21:45:39 2020 +0000
+
+    epan: Fix a memory leak.
+    
+    Make sure _proto_tree_add_bits_ret_val allocates a bits array using the
+    packet scope, otherwise we leak memory. Fixes #17032.
+    
+    
+    (cherry picked from commit a9fc769d7bb4b491efb61c699d57c9f35269d871)
+
+commit 970e9bfb2c
+Author: Harald Welte <laforge@osmocom.org>
+Date:   Mon Nov 30 19:14:02 2020 +0000
+
+    packet-ehdlc: Fix TEI in COL_INFO
+    
+    Back in 2017, commit d7bab0b46e72eb30e50ad1b6a0b56275394406b4 introduced
+    printing the TEI in COL_INFO.  Unfortunatelky it contained a typo and
+    stated "TEI:1%u" instead of "TEI:%u".  So TEI 0 became TEI 10, etc. -
+    causing some confusion.
+    
+    Let's remote that extraneous '1' and at the same time print the sapi
+    with two digits for better alignment of multiple lines. It is a
+    two-digit decimal value (0..63).
+    
+    
+    (cherry picked from commit 9c5ea50b0a8ed812b9c2f24a2be215f332718ecd)
+
+commit 29e59a0e20
+Author: Orgad Shaneh <orgad.shaneh@audiocodes.com>
+Date:   Mon Nov 30 11:52:13 2020 +0200
+
+    Qt: fix Qt 5.15 deprecation warning
+    
+    QFont::ForceIntegerMetrics is deprecated.
+
+commit 65c6d829db
+Author: Guy Harris <gharris@sonic.net>
+Date:   Mon Nov 30 03:11:32 2020 +0000
+
+    wlan: don't treat non-QoS frames as having an HT Control field.
+    
+    That's QoS-frame only; for non-QoS frames, the +HTC/Order subfield
+    doesn't mean there's an HT Control field.
+    
+    Update the reference to the part of the 802.11 standard mentioning that
+    subfield to 802.11-2016.
+    
+    
+    (cherry picked from commit 1fa5687fad88963b8a4857a856981da8cc304678)
+
+commit be38cd2edb
+Author: Guy Harris <gharris@sonic.net>
+Date:   Mon Nov 30 02:23:48 2020 +0000
+
+    wlan: clean up some tests.
+    
+    It's clearer to say
+    
+        if (A) {
+            if (B) {
+                do this;
+            } else {
+                do that;
+            }
+        }
+    
+    than to say
+    
+        if (A && B) {
+            do this;
+        } else if (A && !B) {
+            do that;
+        }
+    
+    
+    (cherry picked from commit baee4a41c787080af4497d038c2b4f9794cb29fc)
+
+commit 3d62a28f06
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 29 09:26:49 2020 +0000
+
+    [Automatic update for 2020-11-29]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit 127f8e47ee
+Author: Guy Harris <gharris@sonic.net>
+Date:   Sun Nov 29 10:17:47 2020 +0000
+
+    802.11: clean up data frame handling.
+    
+    Change
+    
+        case DATA_FRAME:
+            if (condition) {
+                do stuff;
+                break;
+            }
+            do other stuff;
+            break;
+    
+    to
+    
+        case DATA_FRAME:
+            if (condition) {
+                do stuff;
+            } else {
+                do other stuff;
+            }
+            break;
+    
+    to make it clearer that it's "do this if condition is true, else do
+    that".
+    
+    
+    (cherry picked from commit 258fb148212047b1b544c80dd478ac439a8fa7ee)
+
+commit d73b87e52a
+Author: Guy Harris <gharris@sonic.net>
+Date:   Sun Nov 29 09:28:59 2020 +0000
+
+    llc: don't fetch the etype until it's needed and if it's present.
+    
+    This avoids throwing exceptions in some cases.
+    
+    
+    (cherry picked from commit ee764b8d7dc3815df6a0003d1ffa32a31ed1a7cb)
+
+commit 2f391e81d6
+Author: Guy Harris <gharris@sonic.net>
+Date:   Sun Nov 29 08:53:45 2020 +0000
+
+    llc: clean up indentation.
+    
+    
+    (cherry picked from commit 3f8423c26760b30ef7bf9aa3d31fa4b859f8fe0f)
+
+commit 5a3c08e27f
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Nov 17 15:18:12 2020 +0100
+
+    github: fix actions.
+    
+    The command add-path within the changed actions has been deprecated
+    according to
+    
+    https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
+    
+    Use shogo82148/actions-setup-perl for strawberryperl on windows.
+    Upgrade setup-ruby to 1.1.2 on macos.
+
+commit 4d2c7b9940
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Tue Nov 24 13:05:21 2020 +0000
+
+    S1AP: fix decoding of inter eNB transparent container from NGAP
+    
+    
+    (cherry picked from commit 74c0b2134b5e776a97db1b0927b529fe5b725a4d)
+
+commit 095cb11a36
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Thu Nov 19 17:06:44 2020 +0000
+
+    QUIC: fix compilation without HAVE_LIBGCRYPT_AEAD
+    
+    
+    (cherry picked from commit 8c99f4de8d12602ce17341ff2dbfaeafe42d2b78)
+
+commit dcd7a99f1d
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Mon Nov 23 22:09:30 2020 +0000
+
+    NAS 5GS: request type field is 3 bits long
+    
+    
+    (cherry picked from commit 9fdc3fb3ce6cddcc23349c729d211b2f7e0aabe8)
+
+commit 8fdffc1113
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Sat Nov 21 21:29:36 2020 +0000
+
+    tshark: set cf values when quiet and tempfile
+    
+    When there is no do_dissection cf is missing some variables
+    for cf_close() call. Therefore we have to set them explicitly.
+    
+    Fixes: wireshark/wireshark#17021
+    
+    
+    (cherry picked from commit 0fad19b7d93a238a12ebfaab961fb9b21e3d32f7)
+
+commit 7097d817a2
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Mon Nov 23 16:42:34 2020 +0100
+
+    NAS 5GS: fix PDU address type, PDU session type and  SSC mode bit width
+
+commit 436cddcc84
+Author: Nardi Ivan <nardi.ivan@gmail.com>
+Date:   Mon Oct 26 12:22:36 2020 +0000
+
+    QUIC: fix handling of Key Update
+    
+    After a key update, we should update Packet Protection cipher but
+    we shouldn't touch the Header Protection one.
+    With the current code, PP and HP ciphers are quite entangled and we
+    always reset both of them. Therefore, at the second key update we
+    reset the used 1-RTT HP cipher too; no wonder even header decryption
+    fails from that point on.
+    
+    To properly fix this issue, all the ciphers structures has been rewritten,
+    clearly separating PP code from HP one.
+    
+    Close #16920
+    Close #16916
+    
+    
+    (cherry picked from commit 5e45f770fd79ca979c41ed397fee72d2e8fb5f1e)
+
+commit e3c543984d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 22 09:25:59 2020 +0000
+
+    [Automatic update for 2020-11-22]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit 5016b41e6a
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Nov 21 18:55:15 2020 +0000
+
+    Avoid python deprecation warning
+    
+    Fixes ad69ec2e118cbe23230378f2895416ceee398f9b
+    
+    
+    (cherry picked from commit 68313f497278c320b02a154c10df6f8e75de8f63)
+
+commit 233f80f21b
+Author: Joakim Andersson <joakim.andersson@nordicsemi.no>
+Date:   Sat Nov 21 11:08:50 2020 +0100
+
+    bluetooth: Fix dissecting of packets received on LE Coded PHY
+    
+    Fix dissecting of packets received on LE Coded PHY. These packets
+    will include the extra field "coding indicator" after the access
+    address.
+    The assignment of phy in the common bluetooth context was missing,
+    leading to this field being left out and the offset being wrong.
+    
+    (cherry picked from commit c586f71a5c1a79d41f5e9338144cb704d1316be2)
+
+commit 899899533c
+Author: Guy Harris <gharris@sonic.net>
+Date:   Thu Nov 19 07:50:28 2020 +0000
+
+    PacketListRecord: add an ensureColorized() method and use it.
+    
+    Don't call the columnString() and discard the result in order to force
+    colorization; instead, add a separate method to force colorization and
+    use that.
+    
+    This avoids the need to choose a column; we were using 1 as the column
+    number, but column numbers are zero-origin, so that's column 2, which
+    isn't guaranteed to exist (a crash ensued if it didn't).
+    
+    
+    (cherry picked from commit 58aea1de62b9499d7b767f4aa631394f9fbb889e)
+
+commit 793142cbec
+Author: John Thacker <johnthacker@gmail.com>
+Date:   Wed Nov 18 01:13:06 2020 +0000
+
+    RFC2190: Fix bitmasks for several fields in mode A
+    
+    Fixes some errors that the packet diagram helped make obvious.
+    Closes #17025.
+    
+    
+    (cherry picked from commit 5d374fed36d06d745440123944cbbeebaf7fcb20)
+
+commit dd88e7a90b
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Wed Nov 18 11:22:38 2020 +0000
+
+    HTTP: Restore SSTP support
+    
+    Add exclusion for SSTP having Contents-Length and no body.
+    Closes #17024
+    
+    
+    (cherry picked from commit 0250e4e2e44a73773dbaad64cfb244a0db463d7e)
+
+commit d304fa8431
+Author: Jason Cohen <j.cohen@f5.com>
+Date:   Mon Nov 16 15:18:00 2020 -0600
+
+    f5ethtrailer: Replace ingressslot and ingressport with reserved
+
+commit 96d5d2b091
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 15 22:07:16 2020 +0000
+
+    Tools: Update the usb.ids URL in make-usb.py.
+    
+    The canonical location for the usb.ids file is
+    http://www.linux-usb.org/usb.ids. Unfortunately that site isn't
+    accessible over HTTPS so we were using https://usb-ids.gowdy.us/usb.ids
+    instead. *That* site is down, so switch to the Linux USB project's
+    SourceForge repository URL, which appears to house the assets for
+    www.linux-usb.org, including the usb.ids file.
+    
+    
+    (cherry picked from commit 01d5e8ee513cd17f2f86bcb1a2b76384e272428e)
+
+commit df635a196b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 15 19:12:07 2020 +0000
+
+    [Automatic update for 2020-11-15]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit f79f407cae
+Author: Guy Harris <gharris@sonic.net>
+Date:   Sun Nov 15 06:51:58 2020 +0000
+
+    Pass an address-family-appropriate socket length to connect().
+    
+    Some UN*Xes (4.4-lite-derived, such as the obscure, little-known macOS,
+    FreeBSD, NetBSD, OpenBSD, and DragonFly BSD) have a length field in the
+    socket address structure.
+    
+    That was originally done for OSI address support; unlike most transport
+    addresses, such as IPv4 (and IPv6) addresses, where the size of the
+    address is fixed, the size of an OSI transport layer address is *not*
+    fixed, so it cannot be inferred from the address type.
+    
+    With the dropping of OSI support, that field is no longer necessary in
+    userland.  System calls that take a socket address argument also take an
+    address length argument; in newer (all?) versions of the {macOS,
+    FreeBSD, NetBSD, OpenBSD, DragonFly BSD} kernel, the system call code
+    sets the length field in the kernel's copy of the address to the address
+    length field value.
+    
+    However, that means that you have to pass in the appropriate length; if
+    you have a sockaddr_storage that might contain an IPv4 address or an
+    IPv6 address, connect() (and bind()) calls should use the IPv4 address
+    size for IPv4 addresses and the IPv6 address size for IPv6 addresses,
+    otherwise, at least on macOS, the call fails.
+    
+    In cap_open_socket(), report socket() and connect() errors separately,
+    to make it easier to determine where TCP@ captures fail, if they do
+    fail.  (That's how I got here in the first place.)
+    
+    
+    (cherry picked from commit e3047d9b385cb4787995ed87505495fc0a54bba5)
+
+commit cd6afd7c9b
+Author: John Thacker <johnthacker@gmail.com>
+Date:   Sun Nov 15 04:39:18 2020 +0000
+
+    Encodings: Fix missing pointer increment in 3GPP TS 28.038 unpacked
+    
+    The pointer isn't incremented in get_ts_23_038_7bits_string_unpacked
+    so it just decodes the first octet length times.
+    
+    
+    (cherry picked from commit 5df3f5d05d67caef7f83520aa28d24b0af9e0443)
+
+commit a0ce8fa84d
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Sat Nov 14 15:02:16 2020 +0000
+
+    NAS EPS: fix inverted description of 2 N1 UE network capability IE fields
+    
+    
+    (cherry picked from commit 8c29bfe8b2118c201ed49ffe09976d8fc5244c8b)
+
+commit 5010face74
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Fri Nov 13 18:10:20 2020 +0000
+
+    NAS-EPS: remove an extra spare bit
+    
+    It has been replaced by the 15 bearers capability during R15 development
+    
+    
+    (cherry picked from commit 440d8ceff98348a476ad6fa56c9b2cf0f46c9ba0)
+
+commit 7e94496598
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Fri Nov 13 13:33:19 2020 +0000
+
+    MBIM: fix mbim.control.ms_app_info.app_name display
+    
+    
+    (cherry picked from commit ea311f2e217eaa91dcbfc7bcffd90c763cebca06)
+
+commit f7e8752d2f
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Nov 11 13:31:13 2020 +0000
+
+    MMRP: Fix wrong offset for service attribute type
+    
+    Issue reported by Nils Andersen
+    
+    Close #17005
+    
+    
+    (cherry picked from commit 8b512665fcd59070b28abc91c8c6a3dac555f010)
+
+commit 6ece1c896d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Nov 9 23:14:18 2020 +0000
+
+    RTPS: Fixup our coherent set map.
+    
+    coherent_set_tracking.coherent_set_registry_map uses a struct as a key,
+    but the hash and comparison routines treat keys as a sequence of bytes.
+    Make sure every key byte is initialized. Fixes #16994.
+    
+    Call wmem_strong_hash on our key in coherent_set_key_hash_by_key instead
+    of creating and leaking a GBytes struct.
+    
+    
+    (cherry picked from commit 33e63d19e5496c151bad69f65cdbc7cba2b4c211)
+
+commit d88dc7f29a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Nov 5 21:20:06 2020 +0000
+
+    wiretap: Update pcapng systemd timestamp handling.
+    
+    It's easy to create systemd blocks with a missing or invalid
+    __REALTIME_TIMESTAMP= field when fuzz testing. If that's the case, leave
+    WTAP_HAS_TS unset instead of returning an error. Fixes #16965.
+    
+    
+    (cherry picked from commit 51145c62e6629f1f967dd2666669a437828c898a)
+
+commit c8fedf65b2
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Nov 6 01:37:13 2020 +0000
+
+    epan: Limit our bits in decode_bits_in_field.
+    
+    Limit the number of bits we process in decode_bits_in_field, otherwise
+    we'll overrun our buffer. Fixes #16958.
+    
+    
+    (cherry picked from commit d5f2657825e63e4126ebd7d13a59f3c6e8a9e4e1)
+
+commit 263d7a5272
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Nov 3 19:22:14 2020 +0000
+
+    Tools+test: Call python3 explicitly.
+    
+    PEP 394[1] says,
+    
+    "In cases where the script is expected to be executed outside virtual
+     environments, developers will need to be aware of the following
+     discrepancies across platforms and installation methods:
+    
+      * Older Linux distributions will provide a python command that refers
+        to Python 2, and will likely not provide a python2 command.
+    
+      * Some newer Linux distributions will provide a python command that
+        refers to Python 3.
+    
+      * Some Linux distributions will not provide a python command at all by
+        default, but will provide a python3 command by default."
+    
+    Debian has forced the issue by choosing the third option[2]:
+    
+    "NOTE: Debian testing (bullseye) has removed the "python" package and
+     the '/usr/bin/python' symlink due to the deprecation of Python 2."
+    
+    Switch our shebang from "#!/usr/bin/env python" to "#!/usr/bin/env
+    python3" in some places. Remove some 2/3 version checks if we know we're
+    running under Python 3. Remove the "coding: utf-8" in a bunch of places
+    since that's the default in Python 3.
+    
+    [1]https://www.python.org/dev/peps/pep-0394/#for-python-script-publishers
+    [2]https://wiki.debian.org/Python
+    
+    
+    (cherry picked from commit 30c392f166475a251ea8c3cfde305b40971bbbef)
+
+commit 6891c21fe1
+Author: Pau Espin Pedrol <pespin@sysmocom.de>
+Date:   Mon Nov 9 10:37:13 2020 +0000
+
+    rlcmac: Fix EGPRS UL data block TLLI endianess
+    
+    According to TS 44.060, figure 10.3a.2.1, note 2, the TLLI is
+    encoded in little endian for EGPRS (while big endian is used in GPRS).
+    
+    
+    (cherry picked from commit dfa8a3fe5a1408a4355bb325d358dd1ab2c27d31)
+
+commit ba9ae589ad
+Author: Nardi Ivan <nardi.ivan@gmail.com>
+Date:   Sun Oct 18 13:20:48 2020 +0000
+
+    QUIC: improve migration support
+    
+    We should keep track of CID reported in Preferred Address Transport Parameter
+    
+    Close #16915
+    
+    
+    (cherry picked from commit a175435c0ac1cf5fb9a7848063a7888d212df3ed)
+
+commit 2714dd9e6f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 8 09:25:29 2020 +0000
+
+    [Automatic update for 2020-11-08]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit 6988aad8b6
+Author: Nardi Ivan <nardi.ivan@gmail.com>
+Date:   Sat Oct 31 14:08:23 2020 +0000
+
+    STUN: fix heuristic over TCP
+    
+    STUN heuristic over TCP (added in 770872790d) doesn't handle multiple
+    STUN messages in the same TCP payload.
+    
+    While at it, added a comment (forgotten in 354bbbe7cb) about different
+    TURN channel support among STUN versions
+    
+    
+    (cherry picked from commit 905f304d545e8cae06ff020bc6703cc7c0558b85)
+
+commit de66fa058f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Oct 27 17:09:40 2020 +0000
+
+    CI+RPM: Disable the Fedora build for now.
+    
+    Fedora 33's RPM environent added changes that break CMake. Disable it
+    for now.
+    
+    
+    (cherry picked from commit 05bd5cd91eeee9004efc6ea82d62cad831cda05f)
+
+commit b387f0c4db
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Nov 5 15:32:55 2020 +0000
+
+    giop: free the buffer where its at
+    
+    Followup on commit 40ce72f1a8cfbc9df1fd0dd637f2b8f00b4f5042
+    
+    
+    (cherry picked from commit 57b666692051969d874a5b272258b9f3d8447949)
+
+commit 30ca9a975e
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Nov 5 10:47:10 2020 +0000
+
+    giop: don't use packet scope for allocating a buffer at init time
+    
+    Followup on commit 2c2ee172eb1eadda5a418558fe35d2e3e2c03317
+    Also when reading in lines from the file don't use packet scope.
+    
+    Fixes #16984
+    
+    
+    (cherry picked from commit 40ce72f1a8cfbc9df1fd0dd637f2b8f00b4f5042)
+
+commit a00ac1eb9c
+Author: Pau Espin Pedrol <pespin@sysmocom.de>
+Date:   Tue Nov 3 20:01:32 2020 +0000
+
+    rlcmac: Handle properly LI=0 in GPRS data blocks and identify spare bits
+    
+    The previous handling of LI=0 was a confusion with the LI=0 meaning from
+    EGPRS (see TS 44.060 B.8.2 Example 2) data block.
+    
+    
+    (cherry picked from commit 9d5de22a88b9cbd01e9f16953b2e372835d3d0d6)
+
+commit b97332b12e
+Author: Huang Qiangxiong <qiangxiong.huang@qq.com>
+Date:   Wed Nov 4 12:38:23 2020 +0000
+
+    Protobuf: fix bug about parsing negative enum value number
+    
+    Change PT_DECIMALLIT, PT_OCTALLIT and PT_HEXLIT tokens to uint64
+    type, and make PT_IDENT excluding '-' numbers which will be parsed
+    in protobuf_lang.y. That negative enum number and number type of
+    constant can be correctly parsed.
+    Note, intLit is uint32 for parsing fieldNumber and enumNumber,
+    but might be uint64 as constant.
+    
+    close #16988
+    
+    
+    (cherry picked from commit 1fff3cb10654441baac206360e19e33e81ede799)
+
+commit 4e0dbcbc97
+Author: John Thacker <johnthacker@gmail.com>
+Date:   Wed Oct 28 19:30:12 2020 +0000
+
+    Encodings: Add FT_STRINGZ support for GB18030, EUC-KR
+    
+    
+    (cherry picked from commit abf3eaace8cf937b281e2ed5a2cccafb4ec5bf4e)
+
+commit 99238a0198
+Author: Guy Harris <gharris@sonic.net>
+Date:   Thu Nov 5 00:37:30 2020 +0000
+
+    giop: don't use packet scope for allocating a buffer at init time.
+    
+    You can't use packet scope if you're not dissecting a packet;
+    read_IOR_strings_from_file() is called from giop_init(), which is called
+    when a file is opened, not when dissecting a packet.
+    
+    Use NULL as the scope, which just does a regular allocation, and free
+    the buffer when we're done.
+    
+    Expand a comment to indicate that using dissection routines is *also* a
+    bad idea in code that's not used when dissecting packets.
+    
+    Fixes #16984.
+    
+    
+    (cherry picked from commit 2c2ee172eb1eadda5a418558fe35d2e3e2c03317)
+
+commit 5cac5d3254
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Nov 4 07:16:47 2020 +0000
+
+    QUIC: Fix typo
+    
+    Reported by Martin Thomson
+    
+    
+    (cherry picked from commit ad1cf5eeb049a345601707df03fa56436e3d18fa)
+
+commit bc09f1a334
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Nov 4 11:03:56 2020 -0800
+
+    Tools: Allow cherry pick lines in validate-commit.py.
+    
+    Cherry picking tends to add an extra blank line to the commit message.
+    Update the body check in validate-commit.py to allow for this.
+    
+    Revert "tools: Skip over commit body checks." This reverts commit
+    24450d9c51ca48ef09eec2cb68426fb274eee998.
+    
+    (cherry picked from commit dd6b6f48dc4b485740edbaa286b248556c9c03d6)
+
+commit b3de664f2b
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Wed Nov 4 09:39:41 2020 +0000
+
+    QT: progress UI: Fix TextLabel string to loading
+    
+    Change TextLabel to Loading for progress UI
+    Fixes: wireshark/wireshark#16987
+    
+    
+    (cherry picked from commit 48c09fe046e28148c7e31aa456038c535096e3d5)
+
+commit 2533f666a9
+Author: Orgad Shaneh <orgad.shaneh@audiocodes.com>
+Date:   Sun Nov 1 13:17:59 2020 +0200
+
+    ACDR: Fix dissection of control packets
+    
+    The recorded protocol on this case is eth and not ip.
+
+commit 4d7b07dfe4
+Author: Dr. Lars Völker <lars.voelker@technica-engineering.de>
+Date:   Thu Oct 29 15:26:37 2020 +0000
+
+    SOME/IP: Cleanup of length field parsing (BUG FIX)
+    
+    This patch makes the parsing of length fields consistent by moving them
+    below their parent element and adjusting the length of the parent
+    element. And it fixes some problems by doing this.
+    
+    Problems fixed by this:
+    - Bytes skipped after dynamic length arrays. This resolves #16951
+    - A byte was ignored before unparsed payload.
+    - Unions not marking the correct byte range.
+    - String having the length field twice.
+    
+    Signed-off-by: Dr. Lars Völker <lars.voelker@technica-engineering.de>
+    
+    
+    (cherry picked from commit 9ac8dcb3a124eb42c57d4c0aa8d626ff1fefbb4e)
+
+commit 5497552ab1
+Author: Chuck Craft <bubbasnmp@gmail.com>
+Date:   Fri Oct 30 15:10:46 2020 +0000
+
+    win32: fix MR180 - broke "-i -" input pipe
+    
+    
+    (cherry picked from commit 44241f694e984ea3935348e571155bbc8ff73cc7)
+
+commit 15f52841ca
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Wed Oct 28 21:01:47 2020 +0000
+
+    RTCP: Extended Reports: check for padding
+    
+    Check if padding flag is set and alter length accordingly.
+    Display rtcp.xr.bl the same way as rtcp.length.
+    
+    Fixes: wireshark/wireshark#16933
+    
+    
+    (cherry picked from commit e07bb433b2d86b17d014ad3a2178dfdb910b490b)
+
+commit 746cf80cce
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Nov 1 09:29:34 2020 +0000
+
+    [Automatic update for 2020-11-01]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit daca140dfe
+Author: Nardi Ivan <nardi.ivan@gmail.com>
+Date:   Thu Oct 29 19:49:28 2020 +0000
+
+    QUIC: fix connection lookup for Version Negotiation packets
+    
+    VN packets don't have any real packet type, even if they have a long header
+    
+    
+    (cherry picked from commit 9613c943e074a3ef56e1736db9effb6788497992)
+
+commit b46c3e2537
+Author: Nardi Ivan <nardi.ivan@gmail.com>
+Date:   Tue Oct 27 18:48:21 2020 +0000
+
+    QUIC: allow dissection of sessions forcing version negotiation
+    
+    Right now, these sessions are not dissected as QUIC, let alone decrypted
+    
+    
+    (cherry picked from commit cafdab3967050caedfaef66a60d5162b695f161a)
+
+commit 78ac817a84
+Author: Sylvain Munaut <tnt@246tNt.com>
+Date:   Sat Oct 31 10:06:28 2020 +0000
+
+    usbvideo: Fix dissection of PROBE infos structure
+    
+    Refer to USB Device Class Definition for Video Devices
+    document revision 1.5.
+    
+     * bmFramingInfo is 1 byte
+     * Cut & Paste error for bMaxVersion label
+    
+    Change-Id: Ib1221886f864a6ab9dbab70a8e5fca6482bf4267
+    Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
+    
+    
+    (cherry picked from commit b6222766cce1befd7f696a67df57c9e63ad963b6)
+
+commit 006537ad22
+Author: Martin Mathieson <martin.mathieson@keysight.com>
+Date:   Sat Oct 31 12:09:23 2020 +0000
+
+    GSM A: Uncertainty speed is only 1 byte.
+    
+    
+    (cherry picked from commit b925734fe29306d575347ce56ec8d4910f712d3e)
+
+commit 26a0ee2c4b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Oct 29 14:10:55 2020 -0700
+
+    3.4.0 → 3.4.1.