commit 55cfe3bef6
Author: Gerald Combs <gerald@wireshark.org>
Date:   Tue Feb 13 13:54:50 2024 -0800

    Prep for 3.6.21

commit 50e4e6aaf7
Author: Gerald Combs <gerald@wireshark.org>
Date:   Mon Feb 12 17:09:03 2024 -0800

    CMake: Fix some version checks

    Make sure we check our minimum macOS version when we check our Qt version
    so that we don't clobber the value set by CMAKE_OSX_DEPLOYMENT_TARGET.

    (cherry picked from commit 098462e70340c0388ca58a18849063867db830b1)

    Conflicts:
            CMakeLists.txt

commit e30684578a
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Feb 11 09:21:11 2024 +0000

    [Automatic update for 2024-02-11]

    Update manuf, services enterprise numbers, translations, and other items.

commit 1a1dfd8fcd
Author: Gerald Combs <gerald@wireshark.org>
Date:   Thu Feb 8 18:21:34 2024 -0800

    Qt: Fix the FilterExpressionToolBar context menu position

    When we open a FilterExpressionToolBar menu and right click on it, make
    sure we open our context menu using coordinates relative to the toolbar.

    (cherry picked from commit eebe0a38be66b153112aee1fda36c267684f77a8)

commit ff68eecb98
Author: Gerald Combs <gerald@wireshark.org>
Date:   Thu Feb 8 09:39:41 2024 -0800

    wsutil: Add null checks to wmem_map

    Check for a valid wmem_map pointer in each of our lookup routines. This
    keeps us from having to do so in various dissectors.

    Fixes #19642

    (cherry picked from commit 4ec1ae4523281fea10728afa60d8fb14c628ec86)

    Conflicts:
            wsutil/wmem/wmem_map.c
            wsutil/wmem/wmem_map.h

commit 70a2ee4ea3
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Feb 4 09:20:37 2024 +0000

    [Automatic update for 2024-02-04]

    Update manuf, services enterprise numbers, translations, and other items.

commit 6b95aa0fc0
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jan 28 09:20:12 2024 +0000

    [Automatic update for 2024-01-28]

    Update manuf, services enterprise numbers, translations, and other items.

commit df8390494d
Author: Sergio de Paula <sergio.paula@dsr-corporation.com>
Date:   Fri Jan 26 17:00:31 2024 -0300

    [Zigbee GP] Fixed move and step cmd dissectors

    * Move up/down command should not consider the rate field mandatory
    * Step up/down command should not consider the transition time field mandatory

    (cherry picked from commit dd846520f44d68ae6cf30044509d1cb33ce3b483)

commit adf1b3b2b7
Author: John Thacker <johnthacker@gmail.com>
Date:   Thu Jan 25 18:38:38 2024 -0500

    Qt: Restore drag and drop filter buttons

    Commit 9c75c1dc18199ea6b282177e21fe1d445af5bbb3 introduced
    a new eventFilter function for FilterExpressionToolBar but
    called the wrong base class function in it, removing the
    drag and drop buttons.

    Fix #19447

    (cherry picked from commit cb259891f7da0a98a39dd0ff2ba37fef9650844e)

commit eb31d7df81
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jan 21 09:20:22 2024 +0000

    [Automatic update for 2024-01-21]

    Update manuf, services enterprise numbers, translations, and other items.

    services failed.

commit 82438d29d8
Author: Chloe Pelling <cpelling@google.com>
Date:   Thu Jan 18 17:28:15 2024 +1100

    X11: ConfigureWindow: Fix 'window' and bitmask fields.

    Only 1 of the 4 bytes comprising the window field was actually
    being read, causing the value to be incorrect. The offset pointer
    was correctly increased by 4 on the following line, so this is
    clearly just an oversight.

    The configure-window-mask field was being dissected using the
    "window value mask" bitmasks. It was interpreted correctly when
    dissecting the actual fields, though, so this is clearly just
    another minor oversight.

    Before:

      window: 0x00000001
      configure-window-mask: 0x0003, background-pixmap, background-pixel
      x: 448
      y: 156

    After:

      window: 0x03800001
      configure-window-mask: 0x0003, x, y
      x: 448
      y: 156

    (cherry picked from commit 1058293e787783f33537e8e5749a8d39e2aa25b6)

commit d3383d59d0
Author: John Thacker <johnthacker@gmail.com>
Date:   Thu Jan 18 06:46:30 2024 -0500

    netflow: Handle variable length fields with zero length

    If a variable length field has length zero, skip to the next field.

    Fix #19605

    (cherry picked from commit 87f06bfd583525eaec51c94d4643f6b9366b80e3)

commit f7417611c4
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jan 7 19:51:22 2024 -0800

    ISUP: Add recursion checks

    (cherry picked from commit f67b74550b32b23b0f8d036295688655ff0fb590)

commit 05df76b11b
Author: Jaap Keuter <jaap.keuter@xs4all.nl>
Date:   Sun Jan 14 15:00:11 2024 +0000

    IPv4/v6: fix field offset calculation for GeoIP entries

    (cherry picked from commit f5615dd9f9b7d958296a68c28ec141b7b66c0a5e)

commit 8dfd37811a
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jan 14 09:19:18 2024 +0000

    [Automatic update for 2024-01-14]

    Update manuf, services enterprise numbers, translations, and other items.

    services failed.

commit 57482ed858
Author: Zackhardtoname <zack.hardtoname@gmail.com>
Date:   Thu Jan 11 17:27:07 2024 -0500

    Fix uintptr_t not found error

    (cherry picked from commit 6c26a3c7dc0d47ac95e9a8c2e304cb92c34d73c4)

commit fe077908c2
Author: Gerald Combs <gerald@wireshark.org>
Date:   Mon Jan 8 10:20:19 2024 -0800

    Parlay: Add a recursion check

    (cherry picked from commit 10a77d7b46158512eacc476e0e8a7328a5a7bcfb)

    Conflicts:
            epan/dissectors/packet-parlay.c

commit aab9713229
Author: Guy Harris <gharris@sonic.net>
Date:   Thu Jan 11 23:29:42 2024 -0800

    tftp: fix a typo.

    The mode string for a Net-ASCII transfer is "netascii", not "netscii".

    Fixes #19589.

    (cherry picked from commit 2d04c107418eb504c6d338a107483f266f38e5f1)

commit b00baa09de
Author: Gerald Combs <gerald@wireshark.org>
Date:   Mon Jan 8 09:52:35 2024 -0800

    asn2wrs: Fix our recursion checks

    Don't subtract our cycle size when resetting our proto depth.

    Fixes #19580

    (cherry picked from commit 218db319559a9f18d4ae105442799b9a8a3c75e1)

    Conflicts:
            epan/dissectors/packet-e2ap.c
            epan/dissectors/packet-h225.c
            epan/dissectors/packet-h245.c
            epan/dissectors/packet-ieee1609dot2.c
            epan/dissectors/packet-ldap.c
            epan/dissectors/packet-p22.c

commit f76f8f9229
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jan 7 09:20:26 2024 +0000

    [Automatic update for 2024-01-07]

    Update manuf, services enterprise numbers, translations, and other items.

    services failed.

commit 6e8cd77142
Author: John Thacker <johnthacker@gmail.com>
Date:   Sat Jan 6 08:49:11 2024 -0500

    rtmpt: Fix iteration check

    This check should be for when the maximum number of iterations
    reaches zero, rather than declaring a loop the first time it is reached.
    AMF dissection is being aborted and never succeeding.

    Fixup 24403a9a35cd7fbe5ea6e596b1c6deb9d8633566

    (cherry picked from commit 822a95d15665cfc8a209ad9b10e27784ef84ad5d)

commit 64dffa610e
Author: John Thacker <johnthacker@gmail.com>
Date:   Thu Jan 4 08:28:36 2024 -0500

    RSVP: Fix typo

    The variable type is being passed for the encoding instead of
    ENC_BIG_ENDIAN

    (cherry picked from commit 75fa97e7f2decfb4a772a3d03f17299a1ac0d649)

commit 0add92262d
Author: Guy Harris <gharris@sonic.net>
Date:   Wed Jan 3 16:32:12 2024 -0800

    Add ".snoop" to the list of capture file extensions.

    It's in other such lists.

    Update some comments while we're at it.

    Fixes #19565.

    (backported from commit dd7df70be8cbf7e47e7ad855b5ff2daa771e651a)

commit ded7064546
Author: Gerald Combs <gerald@wireshark.org>
Date:   Wed Jan 3 11:16:23 2024 -0800

    GitLab CI: Generate our release notes

    (cherry picked from commit 40111d9e8fa069fd2cf221792c8c1b3708b1975e)

    Conflicts:
            .gitlab-ci.yml

commit 95101fef84
Author: Gerald Combs <gerald@wireshark.org>
Date:   Wed Jan 3 12:46:59 2024 -0800

    Version: 3.6.20 → 3.6.21

    [skip ci]
