Build 3.0.12.wireshark-3.0.12v3.0.12

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

4 files changed, 613 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29bb2..d768b9a261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,571 @@
+commit 8a882161ab
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Jul 1 09:10:08 2020 +0200
+
+    coap: Fix "End of Block #" indication
+    
+    The M bit is used in Block1 Option in a request and in Block2 Option
+    in a response. Use this to determine when to prefix the block number
+    information with "End of".
+    
+    Change-Id: I11c741b15f97f68d668d6cbec97660a6ea392dc1
+    Reviewed-on: https://code.wireshark.org/review/37632
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 52200b7621
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Tue Jun 30 11:50:19 2020 +0200
+
+    ASTERIX: Fix data item I002/070
+    
+    I002/070 dissection is broken in two ways
+    - According to spec the name is "Plot Count Values"
+    - The bitfield for IDENT is interpreted incorrectly
+    
+    Bug: 16663
+    Change-Id: I224a53bcecf11a3cbc98bfaa3533caf51bea21ec
+    Reviewed-on: https://code.wireshark.org/review/37615
+    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 47a1b736bdbbf52b819c0a6525728467fccce800)
+    Reviewed-on: https://code.wireshark.org/review/37620
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+
+commit 836e94aa55
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jun 30 11:25:01 2020 -0700
+
+    Prep for 3.0.12.
+    
+    Change-Id: Id73e4f499012e38ad1556189e2be303fcfed4af0
+    Reviewed-on: https://code.wireshark.org/review/37625
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 371cc51914
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Jun 29 10:16:41 2020 +0200
+
+    Qt: Accept changes in Decode As when combo box has focus
+    
+    Accept changes in the Decode As dialog on Save and Ok even when the
+    Field or Current combox box still has focus.
+    
+    Change-Id: I9d6277ff57714679b574756cbc6d4c4dcb06f8e2
+    Reviewed-on: https://code.wireshark.org/review/37580
+    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 52512329c2046190251eecfd5270029f6c0c15ee)
+    Reviewed-on: https://code.wireshark.org/review/37608
+
+commit d23e2cf4bd
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Jun 29 13:13:09 2020 +0200
+
+    epan: Always clear all decode-as when loading entries
+    
+    Always call decode_clear_all() when loading decode_as entries because
+    this function will create decode_build_reset_list based on entries that
+    has been changed from its original state.
+    
+    Ping-Bug: 16635
+    Change-Id: Ib589d4bc863b680146063ad682398f6180125a38
+    Reviewed-on: https://code.wireshark.org/review/37582
+    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 09777ecc046b0e0aa3d6ab110dab6be5461ac0d7)
+    Reviewed-on: https://code.wireshark.org/review/37607
+
+commit 06314894f9
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Jun 29 09:58:51 2020 +0200
+
+    epan: Keep decode_as_list when changing profile
+    
+    The decode_as_list is built at startup and contains all protocols
+    registered for "decode as". Do not clear this list on profile change,
+    only on exit.
+    
+    Bug: 16635
+    Change-Id: I832a042327603ae0f01b10ab620fccc03d4fd3a3
+    (cherry picked from commit 036188d09b426ec152f5313e809dc177bfb9788c)
+    Reviewed-on: https://code.wireshark.org/review/37606
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit c59ed304dd
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Fri Jun 26 22:10:17 2020 +0200
+
+    DOC: fix layout mergecap manual page
+    
+    Bug: 16652
+    Change-Id: I2c0e0363b3ea77a616191476d6e27cca1204b7cc
+    Reviewed-on: https://code.wireshark.org/review/37564
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 5bd9a50e27cb9c2b21bdfd621ed0294d4b9aaea3)
+    Reviewed-on: https://code.wireshark.org/review/37595
+
+commit 27083fc01c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 28 08:44:23 2020 +0000
+
+    [Automatic update for 2020-06-28]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I9966ab60cd5e913ba45235abadcca0a70475ed5f
+    Reviewed-on: https://code.wireshark.org/review/37571
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 007a9507d6
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Sat Jun 13 15:25:16 2020 +0200
+
+    TCP: show relative numbers only when tcp_analyze_seq is enabled
+    
+    Relative sequence numbers work only with tcp.analyze_sequence_numbers
+    is enabled. Therefore we should also show relative seq numbers only
+    when both options are enabled.
+    
+    Expert info for TFO works also only when tcp_analyze_seq is enabled.
+    
+    Bug: 16604
+    Change-Id: I0a535c3c8b07a7a7d2c42761df49b5e8ac5b7563
+    Reviewed-on: https://code.wireshark.org/review/37469
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/37549
+
+commit a21b97a973
+Author: Guy Harris <gharris@sonic.net>
+Date:   Sun Jun 21 16:14:25 2020 -0700
+
+    RTPS: set the "we have an entity ID" flag whenever the entity ID is set.
+    
+    Also, remove a comment leftover from an earlier uncommitted version of
+    these changes.
+    
+    Change-Id: I0990a186bc280e11a6d0fda05748f5871fb227f1
+    Reviewed-on: https://code.wireshark.org/review/37542
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (cherry picked from commit 74d7c3d14f0ad79dbf657d80fcfb68bc16cff717)
+    Reviewed-on: https://code.wireshark.org/review/37544
+
+commit 2a527f9450
+Author: Guy Harris <gharris@sonic.net>
+Date:   Sun Jun 21 12:01:07 2020 -0700
+
+    RTPS: don't use incompletely filled in GUIDs.
+    
+    Add to the GUID type a bitmask that indicates which fields have been
+    filled in; start it out as 0, and then set bits in it as fields get
+    filled in.
+    
+    Do not add a type mapping object to the hash table unless the GUID is
+    completely filled in, and don't look for a type mapping object in the
+    hash table with a GUID that hasn't been completely filled in as a key.
+    
+    Bug: 16642
+    Change-Id: I31db92238adcb2ec2d70b2650e41b14d99001908
+    Reviewed-on: https://code.wireshark.org/review/37537
+    Petri-Dish: Guy Harris <gharris@sonic.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (backported from commit f97e20a011144a56bf72dd92c49167d17713a909)
+    Reviewed-on: https://code.wireshark.org/review/37540
+
+commit 81af4a1990
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 21 08:41:26 2020 +0000
+
+    [Automatic update for 2020-06-21]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I1e90420cfd577c269b34178e84bce32d3d333718
+    Reviewed-on: https://code.wireshark.org/review/37533
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 6b7fc84c7c
+Author: Guy Harris <gharris@sonic.net>
+Date:   Sat Jun 20 03:14:43 2020 -0700
+
+    RTPS: initialize the fields_visited memer of a new type mapping object.
+    
+    Bug: 16639
+    Change-Id: Iac8957b3e2ebd41b636d5853c359954cff796527
+    Reviewed-on: https://code.wireshark.org/review/37521
+    Petri-Dish: Guy Harris <gharris@sonic.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (cherry picked from commit 2eb87432f71cee0d546a1d2178ad9c531ec656ff)
+    Reviewed-on: https://code.wireshark.org/review/37523
+
+commit d0fdf09d1d
+Author: Guy Harris <gharris@sonic.net>
+Date:   Thu Jun 18 11:44:01 2020 -0700
+
+    radiotap: make tables that we modify automatic rather than static.
+    
+    Another instance of this problem that showed up when working on the fix
+    to the data types of those tables (fixing the data types mean that these
+    errors cause the conpile to fail; as indicated, that's one reason to fix
+    them).
+    
+    Change-Id: Ia1953b95968101f27fedd98a5fc2854101779deb
+    Reviewed-on: https://code.wireshark.org/review/37509
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (cherry picked from commit fdf9610b84af9036d7a24ec4b46ffeb68cb66060)
+    Reviewed-on: https://code.wireshark.org/review/37512
+
+commit 362c17d7f1
+Author: Guy Harris <gharris@sonic.net>
+Date:   Thu Jun 18 00:27:31 2020 -0700
+
+    radiotap: make tables that we modify automatic rather than static.
+    
+    The arrays of pointers to header field hf_ values were getting
+    overwritten if the fields in question are unknown; that meant that, in
+    all future dissections, they would be dissected as unknown *even for
+    packets where they are known*.
+    
+    Make them auto arrays, instead, so that each call to the dissector has
+    its own copy, properly initialized at run time, that it can scribble
+    over as it chooses without damaging the array for the next call.
+    
+    This involves a cast to work around the type of the array argument being
+    "const int **", which means "pointer to pointer to const int",
+    not "pointer to const pointer to (non-const) int".  That meant that the
+    scribbling on the static array was *not* detected at compile time.
+    
+    Fixing the type is a *lot* of work, but may catch other instances of
+    this problem, and may prevent future instances of it.  That's a project
+    for a separate commit, however.
+    
+    Bug: 16636
+    Change-Id: I985157063488739bb59f87780c017e94e2380343
+    Reviewed-on: https://code.wireshark.org/review/37502
+    Petri-Dish: Guy Harris <gharris@sonic.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (cherry picked from commit 7a526325e9568a0722798dc1f386576464744e77)
+    Reviewed-on: https://code.wireshark.org/review/37505
+
+commit fee277488b
+Author: Sébastien Deronne <sebastien.deronne@gmail.com>
+Date:   Wed Sep 11 20:55:39 2019 +0200
+
+    802.11 radiotap: Fix wrong data structure in the dissector for HE TRIGGER frames
+    
+    (patch from Getachew Redieteab)
+    
+    Change-Id: I180b20b513e901c2c157da9a2318a90c91fd040b
+    Reviewed-on: https://code.wireshark.org/review/34505
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 841c27c5a0bcbc1a91cae1d94b8c3501dcf59b01)
+    Reviewed-on: https://code.wireshark.org/review/37504
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+
+commit 857dbba138
+Author: Guy Harris <gharris@sonic.net>
+Date:   Wed Jun 17 21:21:16 2020 -0700
+
+    radiotap: fix typo.
+    
+    Prof. Doppler's name is spelled with two "p"s.
+    
+    Change-Id: Ia25d45b0a890be8c954a67b1ce5860753c1de25d
+    Reviewed-on: https://code.wireshark.org/review/37498
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (cherry picked from commit 8b168e998f3c0e8f6bb31a684bc44b40b7b541c7)
+    Reviewed-on: https://code.wireshark.org/review/37500
+
+commit ef7ee004c6
+Author: Guy Harris <gharris@sonic.net>
+Date:   Tue Jun 16 01:32:41 2020 -0700
+
+    proto: clean up comments.
+    
+    Say "attempt to XXX", as the attempt might not succeed.
+    
+    Fix a copied-and-pasted comment to reflect what
+    proto_is_frame_protocol() does.
+    
+    Change-Id: Ia16a98064b87001f019fda43f2db2970a89e355e
+    Reviewed-on: https://code.wireshark.org/review/37486
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (cherry picked from commit 67e70dcad2dc219085ea044752fde0d4bce991a4)
+    Reviewed-on: https://code.wireshark.org/review/37488
+
+commit f42caf7032
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 14 08:39:51 2020 +0000
+
+    [Automatic update for 2020-06-14]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I10762b54ec83c78a6a1b8146dc0411db5535edac
+    Reviewed-on: https://code.wireshark.org/review/37473
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 9b5e40ab2d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 11 09:52:25 2020 -0700
+
+    epan: Fix compilation.
+    
+    PROTO_ITEM_SET_GENERATED is a macro in Wireshark 3.0 and earlier.
+    
+    Change-Id: Iaa08237e0bca5fd31c37bd9142acf7374b719652
+    Reviewed-on: https://code.wireshark.org/review/37461
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit c9c9f364bc
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Wed Jun 10 23:27:45 2020 +0200
+
+    NSIS: remove translations sub folder before styles parent folder
+    
+    Bug: 16601
+    Change-Id: I8abe331109fdf4287a6ee5a6d054e85aa710e559
+    Reviewed-on: https://code.wireshark.org/review/37447
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+    (cherry picked from commit 761985036d3fbb74bb4f17f32bf37a3316be95f4)
+    Reviewed-on: https://code.wireshark.org/review/37455
+
+commit 0376625aaa
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jun 4 18:50:27 2020 +0000
+
+    NSIS: Add styles/translations to uninstallation
+    
+    Bug:16601
+    Change-Id: I5a1ce4fb373f5eb3a88eedda3395dcb1599fbbe0
+    Reviewed-on: https://code.wireshark.org/review/37383
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit c125e306c6bcf6b2b3c56e3b1ec60d553df708bd)
+    Reviewed-on: https://code.wireshark.org/review/37453
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+
+commit a0f7a346d3
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Jun 10 15:54:56 2020 +0200
+
+    coap: Fix "More Flag" value
+    
+    Use the raw value for the block "More Flag", not the already adjusted one.
+    
+    Change-Id: I13ddd24c4f9b9201798d18abe008945879f03774
+    Reviewed-on: https://code.wireshark.org/review/37442
+    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 86c6befcabf00fa5ff68075c1012731edf2e12f2)
+    Reviewed-on: https://code.wireshark.org/review/37451
+
+commit 14c1dad0bd
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Jun 10 15:52:28 2020 +0200
+
+    epan: Reassembled in link is generated
+    
+    Mark the "Reassembled in" link item as generated.
+    
+    Change-Id: Id8f7b26cf77aa5bc82de07799bb1468c8b8a4209
+    Reviewed-on: https://code.wireshark.org/review/37441
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit b77a435aee80adbde54cb67ef549c6c948a7cdc9)
+    Reviewed-on: https://code.wireshark.org/review/37448
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 2dd506d30c
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Mon Dec 16 20:01:13 2019 +0100
+
+    CMake: fix CMake 3.16 warning about CMP0071
+    
+    Prevent a file from being processed by moc/uic as it is not needed. This
+    addresses a new CMake warning "Policy CMP0071 is not set: Let AUTOMOC
+    and AUTOUIC process GENERATED files."
+    
+    Change-Id: I8ed458099cdf29472dad29168786cf16b95595fa
+    Reviewed-on: https://code.wireshark.org/review/35468
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit 5cfd8bca953e7cd87bd9253609c63f86e6c2009b)
+    Reviewed-on: https://code.wireshark.org/review/37435
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 37923676a0
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Fri Mar 15 23:12:21 2019 +0100
+
+    assa_r3: fix field type.
+    
+    Change-Id: I357019216d858f08d43e4c4118584c7a530ddb73
+    Reviewed-on: https://code.wireshark.org/review/32448
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
+    (cherry picked from commit 694d7fb349dc97c334efc569e76c43332235dfce)
+    Reviewed-on: https://code.wireshark.org/review/37421
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+
+commit c6c8744a1d
+Author: Guy Harris <gharris@sonic.net>
+Date:   Tue Jun 9 15:56:44 2020 -0700
+
+    assa_r3: don't use proto_tree_add_string() on a non-string field.
+    
+    Do as we do elsewhere; use proto_tree_add_none_format().
+    
+    (Should this be done with an expert info?)
+    
+    Change-Id: I7f4514b6f4b6687b21c1912292f1153593bf8440
+    Reviewed-on: https://code.wireshark.org/review/37416
+    Petri-Dish: Guy Harris <gharris@sonic.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (cherry picked from commit cf66efa82e1b2cad44653be2f1f53661d828a79f)
+    Reviewed-on: https://code.wireshark.org/review/37419
+
+commit 0d2b1d3b6a
+Author: Guy Harris <gharris@sonic.net>
+Date:   Mon Jun 8 01:23:37 2020 -0700
+
+    icmp: fix indentation.
+    
+    Change-Id: I2a9e4ae098fd3c71cc4bfbf5ee56507933a205b7
+    Reviewed-on: https://code.wireshark.org/review/37402
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (cherry picked from commit bc21aa158c1394e16c18038b27c72c2996072ab5)
+    Reviewed-on: https://code.wireshark.org/review/37404
+
+commit af59003e3f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 7 08:44:35 2020 +0000
+
+    [Automatic update for 2020-06-07]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: Ie13951f32002d1a3bfc867a1eb79f9774edd3a28
+    Reviewed-on: https://code.wireshark.org/review/37392
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit a4f83d97c1
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Thu Jun 4 17:19:51 2020 +0200
+
+    GTPv2: the header sequence number is 3 bytes long, display it as FT_UINT24
+    
+    Change-Id: Id47b720a1ac4e11c0d3c4322fc4929e3d6ab8e9d
+    Reviewed-on: https://code.wireshark.org/review/37379
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    (cherry picked from commit 1bab3c4a0f61ef6c1532d57275aaa33c50042636)
+    Reviewed-on: https://code.wireshark.org/review/37381
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+
+commit 1600b06afe
+Author: Pau Espin Pedrol <pespin@sysmocom.de>
+Date:   Tue Jun 2 17:08:08 2020 +0200
+
+    GSM RR: Fix wrong expert warning about missing P1 Rest Octets
+    
+    3GPP TS 04.08 sec 9.1.22 "Paging request type 1" states that "P1 Rest
+    Octets" is (M)andatory, but then in the same table states its length
+    ranges from 0 to 17, which means it can actually be missing on some
+    cases:
+    "The sum of the length of this IE and the L2 Pseudo Length of the
+    message equals 22."
+    
+    So that happens (l2 plen = 22) for instance when 2 IMSIs are provided in
+    a Paging Request Type 1 message. In that case, we shouldn't be warning
+    about the packet being malformed having the IE missing, since it's
+    actually expected.
+    
+    The l2 Pseudo Length is shifter 2 bits because that's how it's defined
+    in the spec (sec 10.5.2.19).
+    
+    Change-Id: I3dcb1d23c7d6fd2f1e370462481086516f24c7bb
+    Reviewed-on: https://code.wireshark.org/review/37361
+    Reviewed-by: Vadim Yanitskiy <axilirator@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Harald Welte <laforge@gnumonks.org>
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+    (cherry picked from commit 469b0b2765ccfb63be1eb1bb3219d0d831094884)
+    Reviewed-on: https://code.wireshark.org/review/37364
+
+commit ff415cf418
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun May 31 08:45:06 2020 +0000
+
+    [Automatic update for 2020-05-31]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: Icf473e5ad9e5fc98027e41bc09c78b4cdf25d145
+    Reviewed-on: https://code.wireshark.org/review/37341
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 3a4fb2c0ef
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun May 24 08:43:43 2020 +0000
+
+    [Automatic update for 2020-05-24]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I0c008abff6b8eb3cad1bde7dd565ce5cebd81581
+    Reviewed-on: https://code.wireshark.org/review/37295
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 6722f1cfaa
+Author: Guy Harris <gharris@sonic.net>
+Date:   Wed May 20 04:17:06 2020 -0700
+
+    peekremote: go to the Wayback Machine for a URL.
+    
+    That URL is now dead - Wildpackets is now (part of) LiveAction.
+    
+    Change-Id: I2dea461fa6e97034d9070cef397038bf606de98b
+    Reviewed-on: https://code.wireshark.org/review/37263
+    Reviewed-by: Guy Harris <gharris@sonic.net>
+    (cherry picked from commit 1aac1aa09c6a0eeb14132dc55118fc6de45b52b2)
+    Reviewed-on: https://code.wireshark.org/review/37265
+
+commit 3fcc55e0f9
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue May 19 13:33:17 2020 -0700
+
+    3.0.11 → 3.0.12.
+    
+    Change-Id: I4b5dc08c1c03e682c59c93f57e2fcc8a6475ff63
+    Reviewed-on: https://code.wireshark.org/review/37259
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
diff --git a/NEWS b/NEWS
index 310464ded0..94f92b7c14 100644
--- a/NEWS
+++ b/NEWS
@@ -11,10 +11,26 @@ Wireshark 3.0.12 Release Notes
 
    The following vulnerabilities have been fixed:
 
-     • wnpa-sec-2020-09[1] A dissector went awry.
-
    The following bugs have been fixed:
 
+     • Windows Uninstall does not remove all files in Program Files. Bug
+       16601[1].
+
+     • The "relative sequence number" is same as "raw sequence number"
+       when tcp.analyze_sequence_numbers:FALSE. Bug 16604[2].
+
+     • Decode as not working correctly with multiple user profiles. Bug
+       16635[3].
+
+     • Wireshark can misdissect the HE Radiotap field if it’s ever
+       dissected one with any value unknown. Bug 16636[4].
+
+     • Buildbot crash output: fuzz-2020-06-19-5981.pcap. Bug 16639[5].
+
+     • Buildbot crash output: fuzz-2020-06-20-7665.pcap. Bug 16642[6].
+
+     • mergecap man page contains invalid formatting. Bug 16652[7].
+
   New and Updated Features
 
    There are no new features in this release.
@@ -25,6 +41,8 @@ Wireshark 3.0.12 Release Notes
 
   Updated Protocol Support
 
+   ASTERIX, CoAP, GSM RR, GTPv2, R3, Radiotap, RTPS, and TCP
+
   New and Updated Capture File Support
 
    There is no new or updated capture file support in this release.
@@ -43,7 +61,7 @@ Wireshark 3.0.12 Release Notes
    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[2] on the Wireshark web site.
+   be found on the download page[8] on the Wireshark web site.
 
  File Locations
 
@@ -57,23 +75,29 @@ Wireshark 3.0.12 Release Notes
   The User’s Guide, manual pages and various other documentation can be
   found at https://www.wireshark.org/docs/
 
-  Community support is available on Wireshark’s Q&A site[3] and on the
+  Community support is available on Wireshark’s Q&A site[9] 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[4].
+  for all of Wireshark’s mailing lists can be found on the web site[10].
 
-  Bugs and feature requests can be reported on the bug tracker[5].
+  Bugs and feature requests can be reported on the bug tracker[11].
 
  Frequently Asked Questions
 
-  A complete FAQ is available on the Wireshark web site[6].
+  A complete FAQ is available on the Wireshark web site[12].
 
-  Last updated 2020-06-28 08:33:05 UTC
+  Last updated 2020-07-01 17:35:06 UTC
 
  References
 
-   1. https://www.wireshark.org/security/wnpa-sec-2020-09
-   2. https://www.wireshark.org/download.html#thirdparty
-   3. https://ask.wireshark.org/
-   4. https://www.wireshark.org/lists/
-   5. https://bugs.wireshark.org/
-   6. https://www.wireshark.org/faq.html
+   1. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16601
+   2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16604
+   3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16635
+   4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16636
+   5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16639
+   6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16642
+   7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16652
+   8. https://www.wireshark.org/download.html#thirdparty
+   9. https://ask.wireshark.org/
+  10. https://www.wireshark.org/lists/
+  11. https://bugs.wireshark.org/
+  12. https://www.wireshark.org/faq.html
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 74d0d39c3f..1196db26a9 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -69,6 +69,7 @@ There are no new protocols in this release.
 // Add one protocol per line between the -- delimiters.
 [commaize]
 --
+ASTERIX
 CoAP
 GSM RR
 GTPv2
diff --git a/wireshark.appdata.xml b/wireshark.appdata.xml
index 311ddc24c0..5fc7cfbdca 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.12" date="2020-07-01">
+            <url>https://www.wireshark.org/docs/relnotes/wireshark-3.0.12.html</url>
+        </release>
         <release version="3.0.11" date="2020-05-19">
             <url>https://www.wireshark.org/docs/relnotes/wireshark-3.0.11.html</url>
         </release>