Build 2.4.0rc2.

Change-Id: Iaaa89c4eb9026217934073298689e08aa224c6aa Reviewed-on: https://code.wireshark.org/review/22444 Reviewed-by: Gerald Combs <gerald@wireshark.org>
author: Gerald Combs <gerald@wireshark.org> 2017-06-28 10:34:58 -0700
committer: Gerald Combs <gerald@wireshark.org> 2017-06-28 17:36:07 +0000
commit: 739ff7576460e3cb98bee6858a6cbf3e0ca18e89 (patch)
tree: 754aeea47ae1037f5c49aee06acd810a56295662
parent: f975c1712ed36be1eca5d99130d82c0a65353b08 (diff)
download: wireshark-739ff7576460e3cb98bee6858a6cbf3e0ca18e89.tar.gz
5 files changed, 1107 insertions, 54946 deletions
diff --git a/ChangeLog b/ChangeLog
index c655394c5b..6d0ebfca96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,55739 +1,1894 @@
-commit 7db8e54
-Author: Simon Barber <simon.barber@meraki.net>
-Date:   Wed Jun 7 13:38:08 2017 -0700
-
-    ieee80211-radio: Fix description of packet start and end time fields
-    
-    Change-Id: I8b0acaa689c468b6da553d47a15a9d47fe9d45a6
-    Reviewed-on: https://code.wireshark.org/review/22021
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    (cherry picked from commit 23a2f56b0fcfb72c183f0ace8f30e25400036408)
-    Reviewed-on: https://code.wireshark.org/review/22022
-
-commit 316d09a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jun 7 12:37:44 2017 -0700
-
-    WiX: Switch to Visual Studio 2015.
-    
-    The Windows builders now use Visual Studio 2015.
-    
-    Change-Id: I0fe4defd090930a0b8531e544d03ad4f3b36dac1
-    Reviewed-on: https://code.wireshark.org/review/22018
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit fdd7757
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jun 7 12:42:19 2017 +0200
-
-    epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Id5dde66c6473cd7ba3c7cc981d7b86f564f7ca9f
-    Reviewed-on: https://code.wireshark.org/review/22004
-    Reviewed-by: Ahmad Fatoum <ahmad@a3f.at>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit 8aa84c630e258654db4ca99b4eb6c1a1ac3bc8bd)
-    Reviewed-on: https://code.wireshark.org/review/22014
-
-commit ece3dec
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jun 7 12:35:48 2017 +0200
-
-    epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Id8e5c3622f5186fcab530b9d329a0ff1d42bd6f3
-    Reviewed-on: https://code.wireshark.org/review/22002
-    Reviewed-by: Ahmad Fatoum <ahmad@a3f.at>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit 831828878d998cdf12fbba66f5b8cabdfadac7a1)
-    Reviewed-on: https://code.wireshark.org/review/22012
-
-commit 404aa22
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jun 7 14:18:52 2017 +0200
-
-    RANAP: prevent heuristic dissector from adding info to tree or triggering exception
-    
-    Bug: 13770
-    Change-Id: I6ba5dfb5098ea1a4d4d1e2d740382326c7d58f8c
-    Reviewed-on: https://code.wireshark.org/review/22006
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Ivan Nardi <nardi.ivan@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    (cherry picked from commit e82fa761d671fd4e1c6cdeccd57473fb18982e87)
-    Reviewed-on: https://code.wireshark.org/review/22009
-
-commit a6a92ad
-Author: Anton Butenko <ant.butenko@gmail.com>
-Date:   Wed Jun 7 13:07:04 2017 +0300
-
-    CoAP: added new TLV code 11542 according to changes in LwM2M OMA Spec.
-    
-    Bug: 13761
-    Change-Id: I3cd5bca6e6959aeb74bf3ae8141c3b2afa70e028
-    Reviewed-on: https://code.wireshark.org/review/21999
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit 5598faa3429b36a904e3ebc4cb5cd20f94a2b3ab)
-    Reviewed-on: https://code.wireshark.org/review/22008
-
-commit 593bbbf
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Jun 7 10:08:46 2017 +0200
-
-    Qt: Wireless Timeline improvements
-    
-    - Change keyboard shortcuts to Ctrl+Shift+[IOU]
-    - Use UTF8_MICRO_SIGN in tooltip text
-    - Change 0xffffffffffffffff with G_MAXUINT64
-    - Check for valid wlan_radio *ri before use
-    - Small whitespace cleanups
-    
-    Change-Id: I9fa85c0d675ef3837510afaf5f1b723d89ac134c
-    Ping-Bug: 13769
-    Reviewed-on: https://code.wireshark.org/review/21993
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Simon Barber <simon.barber@meraki.net>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    (cherry picked from commit f1496b6dff0460e5137673bf55bd49a1f19d361d)
-    Reviewed-on: https://code.wireshark.org/review/22007
-
-commit 2be6f4a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 6 13:34:47 2017 +0000
-
-    epl: fix code will never be executed [-Wunreachable-code]
-    
-    false positive when declare variable after a switch(){
-    
-    Change-Id: Ief4770b2200a356b061cf84c7828c8ebe76a1fbb
-    Reviewed-on: https://code.wireshark.org/review/21983
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit dd52b1653791a7e4367d134f740b724155063db6)
-    Reviewed-on: https://code.wireshark.org/review/21996
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-
-commit bf13a89
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 6 13:22:21 2017 +0000
-
-    epl: fix no previous prototype for function 'profile_load' [-Wmissing-prototypes]
-    
-    Change-Id: I5c3119436984cc7de3dcf4dffd1961481cacc553
-    Reviewed-on: https://code.wireshark.org/review/21982
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit a5a4a0bd55769ad63fa568897b0da504aab9a6c2)
-    Reviewed-on: https://code.wireshark.org/review/21997
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit c56ad1a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jun 7 11:58:23 2017 +0200
-
-    umts_fp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Iae6425704cdd72476bcadf9912564dc162684ef5
-    Reviewed-on: https://code.wireshark.org/review/22000
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    (cherry picked from commit 26eb40cf3b84c14bafa7a8bda571a02fdee7aba2)
-    Conflicts:
-            epan/dissectors/packet-umts_fp.c
-    Reviewed-on: https://code.wireshark.org/review/22005
-
-commit 60ba41c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 6 11:15:03 2017 +0000
-
-    epl (profiler-parser): fix parameter 'cmp/allocator' not found in the function declaration [-Wdocumentation]
-    
-    Change-Id: I76a7c66fd4d1872b5cc63447b5acfac2ab8821fd
-    Reviewed-on: https://code.wireshark.org/review/21981
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    (cherry picked from commit 874f8ade9c4b5b2b5a2100cc50186daab9af6d6d)
-    Reviewed-on: https://code.wireshark.org/review/21994
-
-commit ce7bedb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 6 13:54:45 2017 +0000
-
-    netflow/cflow: fix hf conflict
-    
-    'cflow.pie.ntop.retransmitted_out_bytes' exists multiple times with NOT compatible types: FT_IPv6 and FT_UINT32
-    
-    Change-Id: I9caed4c28a5e8322008b4cae4f625a681343a136
-    Reviewed-on: https://code.wireshark.org/review/21984
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit ba86dc303da0d62650c0136967c18eba62cc8eaa)
-    Reviewed-on: https://code.wireshark.org/review/21995
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2183118
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Jun 7 08:57:44 2017 +0200
-
-    ieee80211: Explain TSF in wlan_radio.timestamp blurb
-    
-    Also exchange 0xFFFFFFFFFFFFFFFF with G_MAXUINT64.
-    
-    Change-Id: Ie9ecca6268afc1788ce79015295b706350490476
-    Reviewed-on: https://code.wireshark.org/review/21990
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    (cherry picked from commit 067716557403254cd9c476a8340dd318d58efa49)
-    Reviewed-on: https://code.wireshark.org/review/21992
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit a5c64ec
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jun 6 21:24:52 2017 +0200
-
-    CQL: add an expert info when a list count is negative
-    
-    Bug: 13764
-    Change-Id: Ied78911c7089c9b7ca50d4df0e478cd4946af372
-    Reviewed-on: https://code.wireshark.org/review/21988
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Benoît Canet <benoit@scylladb.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    (cherry picked from commit 8e738bad90eb0ede94c56fb7709f0081564cd225)
-    Reviewed-on: https://code.wireshark.org/review/21991
-
-commit e11a11b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon May 15 19:30:30 2017 +0000
-
-    .mailmap: update (of May)
-    
-    Change-Id: I40cf8db41036a6ba1d6a67fb0a4f3e194ad1107b
-    Reviewed-on: https://code.wireshark.org/review/21671
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit 6216e576fc063661a36eea3f9596bc0d1ca034e2)
-    Reviewed-on: https://code.wireshark.org/review/21980
-
-commit a55756d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jun 5 15:45:29 2017 -0700
-
-    Fixup version.conf.
-    
-    Change-Id: I2d3ab0866f34fbcf25ad65ba01c5c035cefd3dd0
-    Reviewed-on: https://code.wireshark.org/review/21974
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 104cd28
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jun 5 08:17:00 2017 -0400
-
-    Add wireless timeline view to release notes
-    
-    Change-Id: I7180a685b7c89a52bd756556a4954b7152771297
-    Reviewed-on: https://code.wireshark.org/review/21959
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ab92ca3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jun 3 11:29:28 2017 +0200
-
-    Transifex: Add master-24 branch
-    
-    TODOlist for create a new branch
-    
-    Edit .tx/config and set the new branch (don't support . or -)
-    
-    tx push -s for push source file
-    tx -push -t -f for push translation (and force...)
-    
-    Push a new commit on new branch for modification of .tx/config
-    
-    Change-Id: Icc3682e055adf728a14197186ec14da7728df890
-    Reviewed-on: https://code.wireshark.org/review/21912
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit ef274e6
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Jun 5 18:54:56 2017 +0200
-
-    Qt: Build wireless_timeline.cpp with -Wshorten-64-to-32
-    
-    [...]/wireshark/ui/qt/wireless_timeline.cpp:190:50: error: implicit
-       conversion loses integer precision: 'unsigned long' to 'guint' (aka 'unsigned int')
-       [-Werror,-Wshorten-64-to-32]
-         guint half_window = (end_tsf - start_tsf)/2;
-               ~~~~~~~~~~~   ~~~~~~~~~~~~~~~~~~~~~^~
-    
-    Change-Id: I675408f8a6c0809588ce89b2b98e05d7bfb10ed9
-    Reviewed-on: https://code.wireshark.org/review/21969
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    (cherry picked from commit eb15222af228a9f08ba7031ddec635f0e08300c5)
-    Reviewed-on: https://code.wireshark.org/review/21971
-
-commit 3cd64be
-Author: Gerald Combs <gerald@zing.org>
-Date:   Mon Jun 5 08:05:04 2017 -0700
-
-    More 2.4 initialization.
-    
-    Change-Id: I9d79c7b4b23e3194ff9e333151040f69476897a7
-    Reviewed-on: https://code.wireshark.org/review/21968
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a0c5878
-Author: Ivan Nardi <nardi.ivan@gmail.com>
-Date:   Mon Jun 5 13:24:03 2017 +0200
-
-    [Bssmap] Fix and improve dissection
-    
-    See TS 48.008:
-    * in "Perform Location Request" msg, "Cell Identifier" ie is optional, not mandatory (3.2.1.71)
-    * in "Uplink Releae Command" msg, "Cause" ie is mandatory (3.2.1.62)
-    * fixed and improved "Service Handover" ie dissection (3.2.2.75)
-    
-    Change-Id: I2194bf56ef21a2cccbd4f2ed7ff22565af04cddd
-    Reviewed-on: https://code.wireshark.org/review/21957
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit 795077b3ea95b1c2fb8f8cf5c6971da05a0c3ed2)
-    Reviewed-on: https://code.wireshark.org/review/21960
-
-commit 17c2586
-Author: Simon Barber <simon.barber@meraki.net>
-Date:   Thu Apr 6 17:45:33 2017 -0400
-
-    Add a timeline view for packets, with the timing data used to generate the display
-    taken from the timing analysis done in the wlan_radio dissector. QT only.
-    
-    The timeline background is light gray, white for packets displayed in the packetlist,
-    and blue for the currently selected packet. Packets are coloured according to the
-    colouring rules foreground colour. The timeline can be zoomed with controls on the
-    toolbar.
-    
-    At higher zoom levels the duration (NAV) field is plotted as a horizontal line to the
-    right of a packet.
-    
-    The height of a packet in the timeline is proportional to the RSSI.
-    
-    The bottom half of the packet is only shown if it matches the display filter.
-    
-    Todo:
-    Auto detect TSF timing reference point (start/end of packet)
-    Add a scrollbar
-    Add a ruler showing time
-    Improve handling of focus.
-    Do not display NAV for packets with bad FCS.
-    Show related packets graphically
-    Different Y axis modes
-    - bandwidth/channel use display
-    - different transmitters per line
-    - background color from coloring rules
-    Live capture support
-    
-    Change-Id: Ic31fffb0d6854966361ade7abb5c0be50db9a247
-    Reviewed-on: https://code.wireshark.org/review/21956
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4336954
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jun 4 18:58:40 2017 -0700
-
-    Allow bigger snapshot lengths for D-Bus captures.
-    
-    Use WTAP_MAX_PACKET_SIZE_STANDARD, set to 256KB, for everything except
-    for D-Bus captures.  Use WTAP_MAX_PACKET_SIZE_DBUS, set to 128MB, for
-    them, because that's the largest possible D-Bus message size.  See
-    
-            https://bugs.freedesktop.org/show_bug.cgi?id=100220
-    
-    for an example of the problems caused by limiting the snapshot length to
-    256KB for D-Bus.
-    
-    Have a snapshot length of 0 in a capture_file structure mean "there is
-    no snapshot length for the file"; we don't need the has_snap field in
-    that case, a value of 0 mean "no, we don't have a snapshot length".
-    
-    In dumpcap, start out with a pipe buffer size of 2KB, and grow it as
-    necessary.  When checking for a too-big packet from a pipe, check
-    against the appropriate maximum - 128MB for DLT_DBUS, 256KB for
-    everything else.
-    
-    Change-Id: Ib2ce7a0cf37b971fbc0318024fd011e18add8b20
-    Reviewed-on: https://code.wireshark.org/review/21952
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    (cherry picked from commit d0865fd619454a9ac06b1c7d287dc438aff50bb0)
-    Reviewed-on: https://code.wireshark.org/review/21955
-
-commit 2a776cd
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 6 19:38:54 2016 -0500
-
-    [TDS] Convert to using tcp_dissect_pdus.
-    
-    Bring some modernity to this dissector and use tcp_dissect_pdus.  Also an excuse to
-    remove the conversation_set_dissector in the heuristic dissector which was generating
-    some false positives because the heuristic isn't that strong.
-    
-    Bug: 12882
-    Change-Id: Ibb04fd4fbc819acd1dc96d6259b047c897ec2de6
-    Reviewed-on: https://code.wireshark.org/review/19125
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit 17965f57f178aa7e4027f2d363658098e2f1abb3)
-    Reviewed-on: https://code.wireshark.org/review/21954
-
-commit 0c5ac6a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jun 4 18:43:01 2017 -0400
-
-    Add DCE/RPC over TCP dissector to "force" DCE/RPC when heuristics fail
-    
-    Add a simple dissection function for DCE/RPC that just calls tcp_dissect_pdus
-    and doesn't do any heuristics checks.  This can be used to handle cases
-    where TCP PDU is too small for DCE/RPC heuristics checks and user
-    knows the data is DCE/RPC and can set it through Decode As.
-    
-    Bug: 6392
-    Change-Id: I9e4960282ea64d20499f7d5a330f48f30a092b30
-    Reviewed-on: https://code.wireshark.org/review/21951
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit aabb8fd5946110767479e2863ffe4fc40d63ac53)
-    Reviewed-on: https://code.wireshark.org/review/21953
-
-commit 0ec22de
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jun 4 12:15:34 2017 -0700
-
-    Allocate the pipe capture data buffer upfront.
-    
-    We were allocating it every time we called cap_pipe_dispatch() (or,
-    prior to I0256daae8478f1100fdde96a16a404465ec200b3, in
-    capture_loop_dispatch()) and freeing it before the routine in question
-    returned.
-    
-    However, we were treating that buffer as if it persisted from call to
-    call, which worked *only* if freeing and re-allocating the buffer meant
-    that we'd get back the same buffer with its previous contents intact.
-    
-    That is *not* guaranteed to work.
-    
-    Instead, allocate the buffer when we open the capture pipe, and free it
-    when we close the capture pipe.
-    
-    Change-Id: Ic785b1f47b71b55aba426db3b1e868186c265263
-    Reviewed-on: https://code.wireshark.org/review/21948
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    (cherry picked from commit b58e23846e4f21318efebca138f9aa3b0e26792d)
-    Reviewed-on: https://code.wireshark.org/review/21949
-
-commit aab5454
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jun 4 16:42:48 2017 +0200
-
-    GSM A DTAP: fix detection of missing first mandatory element
-    
-    Bug: 13760
-    Change-Id: I1c062420f96104a46e5d1478eb054f086f942b54
-    Reviewed-on: https://code.wireshark.org/review/21946
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    (cherry picked from commit 6d29f50d61de03f73a2a9336378b1c846ae65924)
-    Reviewed-on: https://code.wireshark.org/review/21947
-
-commit 674d1d7
-Author: Ivan Nardi <nardi.ivan@gmail.com>
-Date:   Sun Jun 4 12:46:50 2017 +0200
-
-    [SGsAP] Fix Release-Request msg
-    
-    "SGs Cause" is an optional ie, not a mandatory one. See TS 29.118 8.23.1
-    
-    Change-Id: I74ad90d159e667fa41f8c099520ce5f662a4d85e
-    Reviewed-on: https://code.wireshark.org/review/21939
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    (cherry picked from commit 88cf898c4409d4267ef11eb6676cca5c8b05c435)
-    Reviewed-on: https://code.wireshark.org/review/21943
-
-commit 3e3fc78
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jun 4 08:16:23 2017 +0000
-
-    [Automatic update for 2017-06-04]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I3a58a0486a2904fc98693d58255c58f6d9fe0bdb
-    Reviewed-on: https://code.wireshark.org/review/21933
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit fa9f5b1
+commit f975c17
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 3 21:57:39 2017 -0700
+Date:   Tue Jun 27 18:34:30 2017 -0700
 
-    Allocate a buffer in cap_pipe_dispatch(), not in capture_loop_dispatch().
+    Don't worry about initializing auto aggregates with non-constant values.
     
-    The buffer is only used when reading from a pipe; no need to allocate it
-    when capturing from a pcap_t.
+    On UN*X, you can get C99-or-later compilers, and we request that in the
+    autoconf script, so it's really a requirement.
     
-    Doing it in cap_pipe_dispatch() makes it clearer when the buffer exists
-    and when it doesn't.
+    At least as I read
     
-    Change-Id: I0256daae8478f1100fdde96a16a404465ec200b3
-    Reviewed-on: https://code.wireshark.org/review/21930
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    (cherry picked from commit b70a2370c14d647b122eedfe7f9f3d6ba79595c4)
-    Reviewed-on: https://code.wireshark.org/review/21931
-
-commit 9f01026
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jun 3 20:07:12 2017 -0400
-
-    Bugfix GTK Decode As
+            https://msdn.microsoft.com/en-us/library/34h23df8%28v=vs.100%29.aspx
     
-    Current layer number needs to be unconditionally saved after v2.3.0rc0-3740-ge1f84f985e,
-    which increased the number of dissectors that use current layer number to
-    determine Decode As value.
+    Visual Studio 2010 (and earlier, going back to VS .NET 2003) supports
+    the "Use of block-scope variables initialized with nonconstant
+    expressions", with an example of an aggregate (array) initialization
+    involving function calls, so it sounds as if it's available on Windows
+    with any version of VS that we support.
     
-    Change-Id: Ib82370af94ea00613a337890369e228cffa1ed81
-    Reviewed-on: https://code.wireshark.org/review/21928
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit 0c166f947e9c0f92f3c9bd56fe3db59589511b60)
-    Reviewed-on: https://code.wireshark.org/review/21929
-
-commit 20ec1a7
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Jun 3 23:13:17 2017 +0200
-
-    capture-pcap-util.c: fix a typo
-    
-    Change-Id: I674d02be665afc331e266725c0a0cbc0a33d9403
-    Reviewed-on: https://code.wireshark.org/review/21926
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    (cherry picked from commit 2ba951b984253135ba4dced906dd56a9d487ea65)
-    Reviewed-on: https://code.wireshark.org/review/21927
-
-commit 317cebe
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 3 12:58:36 2017 -0700
-
-    Don't keep the pcap/pcapng link-layer header type as interface data.
+    (If I've missed something, it'll presumably show up when something is
+    built with MSVC, and we can update this at that point.)
     
-    Either 1) it can be determined from the libwiretap encapsulation type,
-    in which case it's redundant information or 2) there *is* no pcap/pcapng
-    link-layer header type for that encapsulation type, in which case you
-    need to check for the attempt to determine it failing and handle that
-    failure appropriately.
-    
-    Change-Id: Ie9557b513365c1fc8c6df74b9c8239e29aad46bc
-    Reviewed-on: https://code.wireshark.org/review/21924
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    (cherry picked from commit 30c86f8b34233b1cf262c14660d32388bc7362d9)
-    Reviewed-on: https://code.wireshark.org/review/21925
-
-commit e20b38b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 3 10:57:14 2017 -0700
-
-    Get rid of #if 0'd out include.
+    So the only thing to avoid is initializing global or static variables
+    with a value that has to be evaluated at run time (the ability to do
+    that is probably present in most environments, as I think C++
+    constructors for variables with static storage duration might have to be
+    evaluated before main() is called, but I guess few C compilers bother to
+    use it).
     
-    Change-Id: I0d996b03303572538d250ed8f27b04a0e93cf261
-    Reviewed-on: https://code.wireshark.org/review/21921
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    (cherry picked from commit 69ed5d5841605c63cbe017a2a0006f4085b8bb23)
-    Reviewed-on: https://code.wireshark.org/review/21922
-
-commit 24d92a0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 3 10:32:44 2017 -0700
-
-    Fix typo.
+    Expand the example in the hopes of avoiding confusion between "static
+    storage duration" (which something declared "static" has, but which
+    anything declared with file scope, whether declared "static" or not,
+    also has) and "static storage duration and internal linkage", which is
+    what the "static" keyword specifies.
     
-    Change-Id: If4ac286fed29635ec085f9671c77abf6ed22766d
-    Reviewed-on: https://code.wireshark.org/review/21919
+    Change-Id: I338eb0892e656c2ab59519e4bf76e1dfbec2fa7d
+    Reviewed-on: https://code.wireshark.org/review/22434
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    (cherry picked from commit eaecf02aed0dc326bee363a0e9b9284d1c3d8d40)
-    Reviewed-on: https://code.wireshark.org/review/21920
+    (cherry picked from commit e0a9192ebceba1e7d010a75592b101e4b80b952a)
+    Reviewed-on: https://code.wireshark.org/review/22435
 
-commit ea70dca
+commit 39b22b7
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 3 10:14:39 2017 -0700
-
-    If has_snaplen isn't set, don't set the snapshot length with pcap_create()/pcap_activate().
-    
-    Just let libpcap pick the snapshot length; that way, for link-layer
-    types that need a really large snapshot length, such as D-Bus (which
-    requires 128MB for the largest messages), it can pick that, but can
-    otherwise pick something that doesn't require as much memory, e.g.
-    256KB.
-    
-    For pcap_open_live() and pcap_open(), which don't have a way of saying
-    "give me what's appropriate", pick 256KB.
-    
-    Change-Id: Idef5694f7dfa85eaf3a61d6ca7a17d263c417431
-    Reviewed-on: https://code.wireshark.org/review/21917
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    (cherry picked from commit 2814e3c9cd4d9393231a746b4ef1bb1e6b7d95c9)
-    Reviewed-on: https://code.wireshark.org/review/21918
-
-commit 91cc730
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Jun 3 05:35:17 2017 +0100
+Date:   Tue Jun 27 14:35:20 2017 -0700
 
-    RADIUS: Fix gda9363e202
-    
-    EVS value was incorrectly typed from the non-extended type space.
+    Fix the "don't initialize with non-constant variables" item.
     
-    Now it should display as unknown.
+    It only applies to variables with static storage duration, i.e. global
+    and static variables.  Expand the example of how to do it, to make it a
+    bit clearer.
     
-    Ping-Bug: 13745
-    Change-Id: I67cfa29d3edcd56e49c1f4eded117a26594f0a14
-    Reviewed-on: https://code.wireshark.org/review/21911
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit c508932a60dcc44904bf91474ac3aab049026ebe)
-    Reviewed-on: https://code.wireshark.org/review/21913
-
-commit 21082d6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jun 2 19:38:11 2017 -0700
-
-    Pass the file type, not the frame type, to cfile_dump_open_failure_message().
-    
-    Change-Id: I3c5e73d4e13106891001dfccd1568148a06329b4
-    Reviewed-on: https://code.wireshark.org/review/21909
+    Change-Id: Ie0c473a35a77351dd10d6c9df2c34a39f077fca4
+    Reviewed-on: https://code.wireshark.org/review/22430
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    (cherry picked from commit ae409ed545efd297d69378a6a612bfe2baa8c924)
-    Reviewed-on: https://code.wireshark.org/review/21910
-
-commit 53ed67c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jun 2 21:49:39 2017 +0200
-
-    netflow: use BASE_UNIT_STRING (units_seconds, units_microseconds)
-    
-    and fix also some typo
-    
-    Change-Id: I7892e715af56ebd1abb3fb36110200e2e992e9b1
-    Reviewed-on: https://code.wireshark.org/review/21901
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit a27a308fcc84f3ea8745181c1c3f0b5def8c40ba)
-    Reviewed-on: https://code.wireshark.org/review/21908
-
-commit 1069a1d
-Author: Lorenzo Vannucci <vannucci@ntop.org>
-Date:   Tue May 30 07:31:51 2017 -0400
-
-    netflow: ntop information elements update, added all missing
-    items exported by nProbe.
-    
-    Change-Id: I476c970d1abb7e1776da01bbdbf74e255387c917
-    Reviewed-on: https://code.wireshark.org/review/21825
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    (cherry picked from commit b932b719ebe75d87e1009336f7795d55c129c838)
-    Reviewed-on: https://code.wireshark.org/review/21907
+    (cherry picked from commit 7321df2a4532d6531eab75f99c5f158ffd90574b)
+    Reviewed-on: https://code.wireshark.org/review/22431
 
-commit 08e8449
+commit d169cdf
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jun 2 15:48:08 2017 -0700
+Date:   Tue Jun 27 11:56:45 2017 -0700
 
-    Fixup the Windows library directory.
+    WiX: More merge module fixups.
     
-    Change-Id: I73649c7a51fb0a66cc4003426d23411b441d482a
-    Reviewed-on: https://code.wireshark.org/review/21906
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit b1c9d3b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jun 2 15:15:51 2017 -0700
-
-    Initialize master-2.4.
+    Look for our merge module using find_path. This should be more reliable
+    and doesn't assume our build and target platforms are the same.
     
-    Change-Id: If82fbf5eb269e4177d39477c08d6ab29b43a73c0
-    Reviewed-on: https://code.wireshark.org/review/21904
+    Change-Id: I95a4454a063af2f978550b8cf1f1624c4aeb5ebc
+    Reviewed-on: https://code.wireshark.org/review/22426
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (cherry picked from commit 5997e8e1980ea9981e28a5abe73d1b8718d03041)
+    Reviewed-on: https://code.wireshark.org/review/22427
 
-commit 1420ef3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Jun 2 22:05:10 2017 +0200
-
-    Add ChaCha20-Poly1305 decryption support for TLS 1.2 and 1.3
-    
-    Implements all seven AEAD_CHACHA20_POLY1305 cipher suites from RFC 7905
-    (for TLS 1.2) and the final missing one for TLS 1.3 (draft -20).
-    
-    New test captures (created using OpenSSL_1_1_0-pre6-2528-g042597b0a)
-    also serve as tests for TLS 1.3 decryption support.
-    
-    Change-Id: Ice6d639c9c7b7bc23a6ff5fb4832d02694abd8c4
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/21902
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    (cherry picked from commit 57b0527821b69dc8aa0786a3b5a425192795aff2)
-    Reviewed-on: https://code.wireshark.org/review/21903
-
-commit a86f660
-Author: Robert Sauter <sauter@locoslab.com>
-Date:   Fri Jun 2 08:04:50 2017 +0200
-
-    IEEE 802.15.4: add missing increments for Header IEs
-    
-    Add missing offset increment for Header IEs with length (missing from
-    https://code.wireshark.org/review/21472).
-    
-    Add missing increment so that the overall header tree spans all elements.
-    
-    Change-Id: I91515a0b6b5fca8bcc95ea9e2cbc791bddf0500d
-    Reviewed-on: https://code.wireshark.org/review/21890
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a9a3bfa
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jun 2 10:18:50 2017 -0400
-
-    Rename packet-netgear.c -> packet-netgear-ensemble.c
-    
-    This may not be the only Netgear protocol, so make a distinction.
-    
-    Change-Id: I68f460f44ac9345863468cfb407cec205a392d54
-    Reviewed-on: https://code.wireshark.org/review/21900
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Charlie Lenahan <clenahan@sonicbison.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c4b87be
-Author: Pau Espin Pedrol <pespin@sysmocom.de>
-Date:   Fri May 12 11:40:04 2017 +0200
-
-    gsm_osmux: Use proper sizes for struct osmux_hdr fields
-    
-    Change-Id: I93de7ffdbd3c43494bc6a5dd1f44f6f45d6b54f8
-    Reviewed-on: https://code.wireshark.org/review/21617
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 197e48b
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Fri Jun 2 11:34:55 2017 +0200
-
-    packet-epl.c: Make dissector oss-fuzz friendly
-    
-    oss-fuzz invokes the dissector without IP layer, so we can't assume
-    the IP address to be available when dissecting POWERLINK/UDP packets.
-    Same goes for the "Exported PDU" functionality.
-    
-    Bug: 13756
-    Change-Id: I038f0445ada3f764dcc72f7bce1d02cfa49791fb
-    Reviewed-on: https://code.wireshark.org/review/21894
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c5ef5c1
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Fri Jun 2 15:43:09 2017 +0200
-
-    uaudp: added "SuperFast Connect" parameter to connect message (removes "Unknown" display)
-    
-    Change-Id: Ia686028e4a4472b18d362c010f802f351cd1b0ac
-    Reviewed-on: https://code.wireshark.org/review/21899
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f434820
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon May 29 21:49:26 2017 +0200
-
-    TCAP: fix SRT analysis
-    
-    When reviewing the code, the following issues were identified:
-    - otid/dtid on 3 bytes were not stored
-    - when receiving the first continue from dest, the TC_END hash entry was
-    created with the source tid / address instead of destination ones
-    - when receiving the first continue from src, the logic could prevent
-    the creation of the hash entry
-    
-    Bug: 13739
-    Change-Id: If4ee70f0fa69f5ff74fdf75f3a741102baa0121a
-    Reviewed-on: https://code.wireshark.org/review/21780
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6f255da
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Jun 2 10:52:56 2017 +0200
-
-    ssl-utils: fix regression in decryption and Follow SSL Stream
-    
-    Store SslPacketInfo under the same key as used by p_get_proto_data and
-    pass this data to the Follow SSL tap.
-    
-    Change-Id: If9b97d0e0e2a82562abe6cb9e61986744680066d
-    Fixes: v2.3.0rc0-3740-ge1f84f985e ("Fix Decode As for protocols that may use tunneling.")
-    Reviewed-on: https://code.wireshark.org/review/21893
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e4c1540
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Jun 2 13:14:05 2017 +0200
-
-    Qt: Add version check for setTextInteractionFlags
-    
-    This property was introduced in Qt 5.1.
-    
-    Change-Id: I3446886d65fbeaf011a69071b605b044e5205b60
-    Reviewed-on: https://code.wireshark.org/review/21895
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3eaa62d
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Fri Jun 2 06:29:02 2017 +0200
-
-    packet-epl.c: Prefix EPL UAT files with epl_
-    
-    Unlike preferences, UATs are stored in their own files, so prefexing file
-    name with the protocol abbreviation makes sense to keep matters organized.
-    
-    Change-Id: Ic7918f509e38da38cdb86ad70917923547f9c112
-    Reviewed-on: https://code.wireshark.org/review/21888
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 974f985
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jun 2 01:29:42 2017 -0700
-
-    Add SUBOBJECT_INITIALIZER and use it.
-    
-    Just as we have OD_ENTRY_INITIALIZER, add SUBOBJECT_INITIALIZER, and use
-    it rather than memset().
-    
-    Whether removing initializer warnings is a Good Thing is subject to
-    debate; remove a comment that implies it's been deemed a Good Thing.
-    
-    Change-Id: Ife658d8bb1d4868789ca3b929aff6e4fccecb430
-    Reviewed-on: https://code.wireshark.org/review/21892
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 10e59db
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Fri Jun 2 07:44:22 2017 +0200
-
-    packet-epl.c: Change CANopen Unicode_String to little endian
-    
-    CANopen DS301 defines "Unicode_String" as "ARRAY [ length ] OF UNSIGNED16"
-    and states "For numerical data types the encoding is little endian style".
-    
-    Change-Id: I146449d7eaafe58b337b505682b14cd672f8ad76
-    Reviewed-on: https://code.wireshark.org/review/21891
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 5a06efc
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Fri Jun 2 06:12:31 2017 +0200
-
-    packet-epl.c: Fixup missing initializer warnings
-    
-    macOS Buildbot doesn't like {0} (probably because GNU C already provides {}
-    exactly for the purpose of initializing all members to zero/NULL/0.0.. etc)
-    
-    Affected local type definitions now have a static intializer macro that uses
-    the correct amount of zeroes and braces (similar to PTHREAD_MUTEX_INITIALIZER)
-    Global type definitions have a memset to zero (Which isn't strictly correct,
-    but as the platforms we support all have all-bits-zero-nulls and IEEE 754
-    floats, it should be good enough. A separate change will attempt to disable
-    -Wmissing-field-initializers -Wmissing-braces globally and hopefully make
-    these workarounds unnecessary.
-    
-    Change-Id: I30b0f679bbb8adb2dd7269c9f3bc19732e48212b
-    Reviewed-on: https://code.wireshark.org/review/21887
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ae1aed9
-Author: Piotr Tulpan <piotr.tulpan@netscan.pl>
-Date:   Mon May 29 21:58:14 2017 +0200
-
-    packet-rsl.c: add Encapsulating paging messages into a packet EP2192796 - proprietor Huawei
-    
-    Adding dissection RSL message that corresponds to patent EP2192796 owned by Huawei.
-    
-    Change-Id: I9fe32370d9b1330f78ac96c1203b6fde3f7784cd
-    Reviewed-on: https://code.wireshark.org/review/21788
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f33eb1f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jun 1 20:42:23 2017 -0400
-
-    packet-ipp.c: Improve enum tag filtering
-    
-    Change-Id: I41249c832b96c8942b78b17983a493faf802f355
-    Reviewed-on: https://code.wireshark.org/review/21886
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e1f84f9
-Author: Irene Ruengeler <ruengeler@wireshark.org>
-Date:   Mon May 8 09:04:16 2017 +0200
-
-    Fix Decode As for protocols that may use tunneling.
-    
-    Dissectors that rely on pinfo structure information may have the
-    data overwritten if the data is tunneled.  Address it by using
-    proto data that is based on pinfo->curr_layer_num.
-    
-    Bug: 13746
-    Change-Id: I1c29f26a3c49f368876f0e96908705bc9c099ce1
-    Reviewed-on: https://code.wireshark.org/review/21559
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 653fc95
-Author: Pau Espin Pedrol <pespin@sysmocom.de>
-Date:   Wed May 10 20:24:56 2017 +0200
-
-    gsm_osmux: Add support to follow Osmux streams and show its statistics
-    
-    Change-Id: I5262b3b1ac5a6f5bc6ac932eedbb889847131d9c
-    Reviewed-on: https://code.wireshark.org/review/21601
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c65960f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 21 14:01:36 2016 +0100
-
-    fb-zero: Add support of Zero Protocol
-    
-    Facebook uses a derivative of QUIC protocol (on top of TCP) for Android device
-    The dissector was reverse engineered based off of QUIC dissector functionality
-    
-    Pcap avaliable https://github.com/ntop/nDPI/issues/300
-    Some information (not spec) can be found here:
-    https://code.facebook.com/posts/608854979307125/building-zero-protocol-for-fast-secure-mobile-connections/
-    
-    Change-Id: I4026bb992aa17a0c679379646b388a694f24a07f
-    Reviewed-on: https://code.wireshark.org/review/18937
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 32f0d80
-Author: Björn Ruytenberg <bjorn@bjornweb.nl>
-Date:   Thu Jun 1 19:14:33 2017 +0200
-
-    thread: Fix division by zero
-    
-    Perform sanity check on channel count. Channel count must be greater than zero
-    to build energy measurements list from Energy List TLV [1]. Zero channel count
-    results in a division by zero in dissect_thread_mc. Do not process Energy List
-    TLV if zero.
-    
-    [1]: OpenThread implementation -
-    https://github.com/openthread/openthread/blob/b89a9dfbc117a9c80e795700b67/include/openthread/commissioner.h#L158
-    Energy List TLV contains energy measurements. If no channels are present, no
-    energy measurements can exist.
-    
-    Bug: 13747
-    Change-Id: I53a19dfbeae9ef0421c8c144ef3be4da28413ad3
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1979
-    Reviewed-on: https://code.wireshark.org/review/21878
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 9a85e30
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Thu Jun 1 11:11:18 2017 +0200
-
-    packet-epl.c: Enhance dissection by ObjectMappings and device profiles
-    
-    Cyclic PDOs are setup either by ObjectMappings in the asynchronous SDOs,
-    or by serialized ObjectMappings in device profile files.
-    
-    We now keep track of ObjectMappings transmitted via SDOs or read from
-    XDC files and use those to correctly partition the PDO's payloads.
-    
-    Additionally types and descriptions for Object Directory entries extracted
-    from the EDS and XDD profiles are used to select the correct Wireshark type
-    and a string representation for those partitoned PDOs. Other places where
-    indices and subindices are also enriched by this information.
-    
-    EDS support leverages GKeyFile and is available unconditionally, XDD/XDC
-    parsing support depends on the availabilty of libxml2. A patch for
-    inclusion of the latter as optional dependency was submitted
-    as Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783
-    
-    Electronic Data Sheet (EDS) is the CANopen standard for device profiles,
-    POWERLINK being based on CANopen, is occasionly used with EDS profiles.
-    
-    XML Device Description (XDD) is the Ethernet POWERLINK standard for
-    device profiles. XDC have the same structure but contain actualValues
-    fields which can contain default ObjectMappings.
-    
-    XML Device Descriptions can be 25k+ lines with much duplication,
-    so wmem_iarray_t is leveraged for saving space as well as faster lookups.
-    
-    A side-effect of now organizing the capture in conversations is that
-    POWERLINK over UDP packets are now assigned proper destination and source
-    node IDs, which are displayed in the column view. The Referenced bug where
-    packets where erronously flagged as duplicates because the address wasn't
-    considered is also fixed as a result.
-    
-    Bug: 13604
-    Bug: 13749
-    Change-Id: Ic33ff0be8f2eae7c24fe5877ad9258d1e550c227
-    Reviewed-on: https://code.wireshark.org/review/21112
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit b2302d7
-Author: Darien Spencer <cusneud@mail.com>
-Date:   Wed May 31 11:14:45 2017 -0700
-
-    FP - Moved RLC info retrieval for E-DCH channels
-    
-    Dissection method was receiving the RLC INFO struct as a paramter instead
-    of using p_get_proto_data like other channels' dissection methods.
-    
-    Change-Id: Iaf44f71552526dcdf29b8a583b1d79012e2b24e3
-    Reviewed-on: https://code.wireshark.org/review/21874
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0a35c95
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jun 1 16:58:29 2017 +0200
-
-    IEEE 802.15.4: add a missing offset increment in dissect_ieee802154_payload_mlme_sub_ie()
-    
-    Bug: 13751
-    Change-Id: I33d9d51ba36ddb2caeee25612b613bc799c76339
-    Reviewed-on: https://code.wireshark.org/review/21875
-    Reviewed-by: Rémy Léone <remy.leone@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f45924f
-Author: Max Dmitrichenko <dmitrmax@gmail.com>
-Date:   Wed Apr 19 17:31:32 2017 -0400
-
-    dfilter: fvt_cache use g_hash_table_new_full() API to prevent some memory leaks
-    
-    Change-Id: I650c1eb1e98c7d2d2c9ec85bb6ec9b75667142a2
-    Reviewed-on: https://code.wireshark.org/review/21230
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 83b0e43
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jun 1 13:29:52 2017 +0200
-
-    [GTPv2] Add "name" to IEs with Generic names in some cases.
-    
-    Bug: 13531
-    Change-Id: I81edc081a508ab1e56b279ec1183066c4334dc10
-    Reviewed-on: https://code.wireshark.org/review/21872
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c72c088
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Jun 1 10:57:05 2017 +0200
-
-    prefs: Avoid empty elements in string lists.
-    
-    When parsing a comma-separated string list from file we should not
-    add an empty element if this list is empty.  Otherwise we would
-    get an empty string in when writing the file back.
-    
-    Change-Id: Iea5a33d20991f8c5daed6811beb8ec97b8b1dbe3
-    Reviewed-on: https://code.wireshark.org/review/21870
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 561be48
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Sat Apr 15 15:59:52 2017 +0200
-
-    Add interval array data structure, with growable intervals
-    
-    A sorted array keyed by intervals
-    You keep inserting items, then sort the array.
-    sorting also compacts items that compare equal into one and adjusts
-    the interval accordingly. find uses binary search to find the item
-    
-    This is particularly useful, if you got many similar items,
-    e.g. ObjectMapping subindices in the XDD. XDDs can be upward of
-    25k lines long with much duplication (253 subindices having the same
-    content).
-    
-    Interval Trees wouldn't work, because they didn't allow expanding
-    existing intervals. Using an array instead of a tree, additionally offers
-    a possible performance advantage, but it's not that critical here,
-    as finding should only happen in the async frames
-    
-    There's room for optimization in the creation process of the array,
-    but it doesn't matter much, as they aren't created frequently.
-    Finding speed is what matters for the use case of parsing EDS
-    and XDD files
-    
-    Change-Id: Iaaddc90059f0e49b456774a111d8d42452b90cf9
-    Reviewed-on: https://code.wireshark.org/review/21111
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 23a4a74
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Jun 1 11:14:23 2017 +0200
-
-    Add a new feature to the release notes.
-    
-    Change-Id: I99dafc515ac70f7ed037c30936aceddd695d3525
-    Reviewed-on: https://code.wireshark.org/review/21871
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 6751928
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Jun 1 09:20:38 2017 +0200
-
-    Qt: Enable unhiding all interfaces.
-    
-    When having hidden interfaces it was not possible to unhide all
-    in the "Manage Interfaces" dialog because prefs.capture_devices_hide
-    was not updated when not having any hidden interfaces.
-    
-    This bug was introduced in g6eee29bf.
-    
-    Change-Id: If94c2e592eea60e6f1ef1ce2107ff9b2b27c3176
-    Reviewed-on: https://code.wireshark.org/review/21869
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 6a37b54
+commit 1d35614
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue May 30 11:57:06 2017 -0700
+Date:   Tue Jun 27 10:26:39 2017 -0700
 
-    Qt+prefs: Add a dark theme check and default colors.
-    
-    Add prefs_set_gui_theme_is_dark and call it in the WiresharkApplication
-    constructor. Add a set of dark syntax color defaults.
+    CMake: Fix the WiX search path.
     
-    We could alternatively add a preference for the syntax foreground color,
-    but that would imply adding a preference for the background color as
-    well.
+    Look for WiX executables in $WIX/bin instead of $WIX.
     
-    Bug: 11131
-    Bug: 13738
-    Change-Id: Iefe135ed04e63372ed434c5b9759647c9f4046e3
-    Reviewed-on: https://code.wireshark.org/review/21827
+    Change-Id: Id55eb8e73403d2beed55d64e9bdc6812308c359f
+    Reviewed-on: https://code.wireshark.org/review/22423
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9719bac
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed May 31 15:45:59 2017 +0200
-
-    cmake: Add -Wshorten-64-to-32 for C++ when using Qt >= 5.9
-    
-    The warnings has been fixed in Qt 5.9.
-    
-    Change-Id: I7cc71612e601517b7d7117c3cf2711ec983593a6
-    Reviewed-on: https://code.wireshark.org/review/21861
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dc7b9cd
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed May 31 21:34:55 2017 +0200
-
-    Qt: Disable -Wframe-larger-than= for ui_main_window.h
-    
-    The generated Ui_MainWindow::setupUi() can grow larger than our configured
-    limit, so turn off -Wframe-larger-than= for ui_main_window.h.
-    
-    Change-Id: I550ff30ebe566b711c63f7a9d0276e5b06244407
-    Reviewed-on: https://code.wireshark.org/review/21866
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 6607be7
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri May 26 15:55:08 2017 +0200
-
-    debian: remove imagemagick and demote xdg-utils deps
-    
-    imagemagick was needed since v1.11.1-rc1-140-g02a8e72b43, but
-    unnecessary since v2.1.0rc0-491-g18a54fcaa4, remove it.
-    xdg-utils is needed for xdg-open (opening websites) at runtime in GTK+,
-    but not for Qt nor during the build, remove it or mark it as optional.
-    
-    Change-Id: I6fc4d5fb61ea8b5cf79526d92ef8c108bc9d11a3
-    Reviewed-on: https://code.wireshark.org/review/21765
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 855a05c
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Tue May 30 22:25:23 2017 +0200
-
-    packet-epl.c: Fix bounds error on malformed packet
-    
-    dissect_epl_payload is called with len retrieved from the packet payload,
-    so we've to ensure there are indeed at least len bytes remaining in the tvbuff.
-    
-    Counting the remaining bytes has to start from the _current_ offset, not from
-    the start of the buffer.
-    
-    Change-Id: I6f4a94e8503cde6c5eaadc43f560c15ef8c1c375
-    Reviewed-on: https://code.wireshark.org/review/21829
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 7f96ffe
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed May 31 20:52:34 2017 +0200
-
-    Qt: Capitalize "Select SACKs" in tcptrace graph.
-    
-    Change-Id: I2d0b433fec482431f6ccfe6f8fe6576193fc7773
-    Reviewed-on: https://code.wireshark.org/review/21863
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 1529966
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed May 31 15:44:34 2017 +0200
-
-    Qt: Add cast to QByteArray.resize()
-    
-    Change-Id: I651cf6e625b8c757820a1e879f3fbde99746ba88
-    Reviewed-on: https://code.wireshark.org/review/21860
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit a092eaa
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 31 07:37:24 2017 +0200
-
-    80211 (prism): fix conflict for hf field
-    
-    Remove hf_ieee80211_prism_did_sig_rate.
-    
-    Change-Id: Id75deae2c074ecbb771e33c4a6f3855cb2ba9d9f
-    Reviewed-on: https://code.wireshark.org/review/21848
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a95b72e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 31 10:02:21 2017 -0700
-
-    Sort the RADIUS dictionaries and account for a rename of one of them.
-    
-    Change-Id: Ieea5349a38366a68cd313e70c8f1d28828982d7b
-    Reviewed-on: https://code.wireshark.org/review/21862
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8da1ac2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 31 07:35:56 2017 +0200
-
-    acn: fix conflict for hf field
-    
-    Turn hf_magic_reply_invalid_type in an expert info.
-    
-    Change-Id: I6eeb5590e3d620ebb5afe46eae36cba6784033a4
-    Reviewed-on: https://code.wireshark.org/review/21847
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c9ceb71
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 2 08:10:06 2016 +0100
-
-    debian: add lintian-overrides for libwireshark0
-    
-    Remove last lintian issue
-    
-    Change-Id: I672b347a8b0fc495b6e010ef987c0ff238eb8d1e
-    Reviewed-on: https://code.wireshark.org/review/18622
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ae65b8f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed May 31 14:00:27 2017 +0200
-
-    UMTS FP: backout part of g899fd42
-    
-    The delay for p_add_proto_data() calls was not required and introduced several
-    bugs (when the function returns before private info is attached).
-    
-    Change-Id: Id3a668e6776308b2ea758940e4260bfcbddc236a
-    Reviewed-on: https://code.wireshark.org/review/21859
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit dcba264
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 31 07:56:09 2017 +0200
-
-    lemon: avoid redundant redeclaration of ‘memory_error’ [-Wredundant-decls]
-    
-    Change-Id: I1fbc11dc433363b659ddba9a77e52ffd4e3968d7
-    Reviewed-on: https://code.wireshark.org/review/21850
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 300458b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 31 07:53:19 2017 +0200
-
-    opcua: fix no previous prototype for ‘parseNodeClassMask/parseResultMask’ [-Wmissing-prototypes]
-    
-    Change-Id: If57183bcea978b766fc53f691a35c4ddf98ca2dd
-    Reviewed-on: https://code.wireshark.org/review/21849
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8dbd4c6
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Wed May 31 12:13:56 2017 +0100
-
-    Fix nsis intaller
-    
-    The radius erx disctionary has been renamed to unisphere.
-    
-    Change-Id: I3d8a4b9d8f6a5340f3a92274816e66bdaa55ffd3
-    Reviewed-on: https://code.wireshark.org/review/21858
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 7aec952
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 31 02:38:38 2017 -0700
-
-    Sort the dictionary.* files.
-    
-    Change-Id: Iad4457cc17f3e6a5b092d8050a0d1cc541efb2a3
-    Reviewed-on: https://code.wireshark.org/review/21856
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0082f59
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 31 02:32:55 2017 -0700
-
-    Rename dictionary.erx to dictionary.unisphere and pick up the FreeRADIUS version.
-    
-    This picks up
-    
-        commit a5ad82aecc194f5f55153c351a62af9bb1c222a0
-        Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
-        Date:   Sat Dec 7 23:24:20 2013 +0000
-    
-            Fully sync ERX/Unisphere with Juniper's dictionaries
-    
-    as well as picking up the copyright notice.
-    
-    Change-Id: Ia6a694ccd94ad05caf25bea4dec9b467a4f99157
-    Reviewed-on: https://code.wireshark.org/review/21855
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8e72764
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 31 01:22:16 2017 -0700
-
-    Update a comment.
-    
-    We now support dotted number values in the oid field.
-    
-    Note that the attribute flags internal, array, concat, and virtual
-    aren't documented in the FreeRADIUS dictionary man page.
-    
-    Change-Id: Iaf27845f75a93f2d006708224757ea48d8023cb1
-    Reviewed-on: https://code.wireshark.org/review/21853
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bb5b0fb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 31 01:18:22 2017 -0700
-
-    Give more information in a comment.
-    
-    Change-Id: I43efd124bc49bc3d1261bd690ce38c5debb94e45
-    Reviewed-on: https://code.wireshark.org/review/21852
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 012f657
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 31 00:51:48 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice, cleans up white space, puts the type and
-    the properties of attributes in separate fields.
-    
-    Change-Id: I1a813a784498ed3217c7fc9bfcd9c1162ceffebb
-    Reviewed-on: https://code.wireshark.org/review/21851
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 870e08a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:34:21 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice and a commented-out attribute.
-    
-    Change-Id: I0325164eb3875557f7ce9a81cf697a99a0f5de93
-    Reviewed-on: https://code.wireshark.org/review/21846
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit beb9b08
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:32:24 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice and a value.
-    
-    Change-Id: I99957b97cf905b9d13024f70b76e875756e71609
-    Reviewed-on: https://code.wireshark.org/review/21845
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 503acf0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:30:02 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up a copyright notice, a comment, and some attributes.
-    
-    Change-Id: I299a4f1225eb6be23410c396a4f5a00affd64523
-    Reviewed-on: https://code.wireshark.org/review/21844
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0735d2b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:26:15 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice and an additional attribute.
-    
-    Change-Id: Ieebed5ceae7a10bf393245d9fcf82310df6c42d9
-    Reviewed-on: https://code.wireshark.org/review/21843
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit af2e94b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:24:31 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice, a comment, and an attribute.
-    
-    Change-Id: I9b0c536646860f0d4e6e7f59967db22d592fc1c4
-    Reviewed-on: https://code.wireshark.org/review/21842
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8c1e4c8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:22:12 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice, a comment, and an additional attribute.
-    
-    Change-Id: Ie65dcb039c725a63d1a9b6976814c182e10c74cb
-    Reviewed-on: https://code.wireshark.org/review/21841
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5d6c980
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:20:05 2017 -0700
-
-    Merge with the FreeRADIUS version.
-    
-    Pick up copyright notice and some additional attributes, along with
-    BEGIN-VENDOR and END-VENDOR.
-    
-    Change-Id: Ifa0112a0bfc56f5977bffd6a32b12d1c1a089529
-    Reviewed-on: https://code.wireshark.org/review/21840
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 065d719
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:10:20 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice and some more attributes.
-    
-    Change-Id: I594d8f72913fce3836db1935a3689d60a5a3f2ba
-    Reviewed-on: https://code.wireshark.org/review/21839
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 669f4c9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:08:55 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice and some additional attributes.
-    
-    Change-Id: I4a942512f62d91d98dcbf4ccba65ff97b6a729c9
-    Reviewed-on: https://code.wireshark.org/review/21838
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6b3c21f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:05:54 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice and adds some attributes and values.
-    
-    Change-Id: If24d00ceb23002aea2c24c16a7b38fd77df9401a
-    Reviewed-on: https://code.wireshark.org/review/21837
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 81d3e49
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 20:03:37 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Picks up the copyright notice and new attributes and values, and renames
-    a few values to remove "-HW".
-    
-    Change-Id: Iccf3938f54fab8b234ee49b509fdcc8a3cfba670
-    Reviewed-on: https://code.wireshark.org/review/21836
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4e2aeae
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 19:40:53 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    It moves an attribute.
-    
-    Change-Id: I9f3c88f174b9520b16d3f2c68abe278ef695d403
-    Reviewed-on: https://code.wireshark.org/review/21835
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e42a9b8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 19:38:06 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Change-Id: I8af7ec1ec6ee2c44cddd4ed91a95039bcce3bd5e
-    Reviewed-on: https://code.wireshark.org/review/21834
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 29f8ef3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 19:36:01 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Give a URL for the Extreme Networks documentation listing these
-    attributes, replacing our earlier citation; the newer version says
-    attribute 213 is Extreme-VM-Name, as is the case in the FreeRADIUS
-    version, not Extreme-CLI-Profile, as was the case in our version.
-    
-    Change-Id: Iddd69c2ef4d3a5d55f16c20f3899eebdea217a2a
-    Reviewed-on: https://code.wireshark.org/review/21833
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 565664c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 19:24:21 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    This file is mainly for supporting older names for certain attributes
-    and values; all the attributes and values here should be defined by
-    other files, so we really shouldn't be including this file.
-    
-    Change-Id: I2e5391f0ed14d42e97434b77794e8ba643850608
-    Reviewed-on: https://code.wireshark.org/review/21832
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6769ff4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 19:16:17 2017 -0700
-
-    Merge with the FreeRADIUS version.
-    
-    Pick up the copyright notice and some additional attributes/values, and
-    mark some attributes as no longer being Wireshark additions.  Change
-    some names to match the FreeRADIUS names.
-    
-    Mark some URLs as dead links, and try to supply replacements; use the
-    Wayback Machine for others.
-    
-    Preserve our fixes and enhancements.
-    
-    Change-Id: I000cf05682506ed0db9b0fff856998479ee0dfa4
-    Reviewed-on: https://code.wireshark.org/review/21831
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 93f42b2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 30 12:43:17 2017 -0700
-
-    Merge with the FreeRADIUS version.
-    
-    Pick up their copyright notice and additions.
-    
-    Replace links used as references.
-    
-    Our version is now their version with some additional comments and
-    different links (replacing broken links with non-broken ones).
-    
-    Change-Id: I785d14f537abd96cd7baa3438191e1371e34ebc0
-    Reviewed-on: https://code.wireshark.org/review/21828
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6c44f20
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri May 26 07:52:17 2017 -0400
-
-    Qt: Add support to verify extcap capture filter
-    
-    Bug: 11668
-    Change-Id: Ib218d87c1905e53ffdab4e3dd6f93ba2c3d07c8b
-    Reviewed-on: https://code.wireshark.org/review/21770
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 44327d8
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue May 30 13:53:16 2017 +0200
-
-    [GTP] Update cause values.
-    
-    Change-Id: Ic9b0ccf045169de676b95c4b85a8d0e1e21e2cb4
-    Reviewed-on: https://code.wireshark.org/review/21826
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1902204
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue May 30 13:31:14 2017 +0200
-
-    [Diameter 3GPP] Add subdissection of AVP 1679 AIR-Flags
-    
-    Change-Id: I783385b85cfb67d3b0d4affc82a6071e4de51062
-    Reviewed-on: https://code.wireshark.org/review/21824
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9b24ffc
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun May 28 20:24:52 2017 -0400
-
-    Add Inovar specific Diameter AVP codes
-    
-    Bug: 13349
-    Change-Id: I2a06ee3bd7ab1f81414ad8e4155c1430a7287644
-    Reviewed-on: https://code.wireshark.org/review/21778
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 899fd42
-Author: Darien Spencer <cusneud@mail.com>
-Date:   Thu May 25 19:05:24 2017 +0300
-
-    FP - Checks to avoid NULL dereferencing
-    
-    Making sure channel specific structs are not null
-    
-    Change-Id: I9f979db4e24bb7bd490cf29a5c68ef32d1b029db
-    Reviewed-on: https://code.wireshark.org/review/21754
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 2f037e1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 21:04:07 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Pick up copyright notice, comment tweaks, additional attributes.
-    
-    Change-Id: I16f1683febff5286d5698aaf513c5dc0eb169b15
-    Reviewed-on: https://code.wireshark.org/review/21823
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9c7b8b4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 20:58:25 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Update copyright notice, fix typo in comment.
-    
-    Change-Id: Ida68691847e4e9aa80a15a25580e2657d0763bb3
-    Reviewed-on: https://code.wireshark.org/review/21822
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit a6652a27783b59d23dca3405b0399690f38f3402)
+    Reviewed-on: https://code.wireshark.org/review/22425
 
-commit b13833d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 20:56:15 2017 -0700
-
-    Update to FreeRADIUS version.
-    
-    Pick up copyright notice, more attributes and values.
-    
-    Change-Id: I83d99cf191c198ced4a1093d5e17a793ae9d38d6
-    Reviewed-on: https://code.wireshark.org/review/21821
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b30dd5a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 20:54:40 2017 -0700
-
-    Update to FreeRADIUS version.
-    
-    Pick up copyright notice, fix typoes.
-    
-    Change-Id: I428b5d8657ca2fba1ae0072bb4d5793025b0855f
-    Reviewed-on: https://code.wireshark.org/review/21820
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 59ba8bd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 20:51:22 2017 -0700
-
-    Update to the FreeRADIUS version.
-    
-    Copyright notice, white space cleanups, additional attributes.
-    
-    Change-Id: I5e52b40ad08dc11722e16fbe927ec8f0f6fed7cd
-    Reviewed-on: https://code.wireshark.org/review/21819
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7c5a3d7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 20:22:57 2017 -0700
-
-    Update to FreeRADIUS version.
-    
-    Pick up copyright, whitespace cleanups, put UKERNA- in front of some
-    attributes with the same name as RFC 7055 attributes, add some
-    additional attributes.
-    
-    Change-Id: Iad05b3c83c37185bdd18be208fd2e1878b950a0e
-    Reviewed-on: https://code.wireshark.org/review/21818
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d8456e1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 20:15:28 2017 -0700
-
-    Update to FreeRADIUS version.
-    
-    Adds copyright notices, cleans up whitespace, picks up typo fixes.
-    
-    Change-Id: I9f0583d6d488c2b494c2e651b850bb4226cd6085
-    Reviewed-on: https://code.wireshark.org/review/21817
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d7f6029
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 20:11:48 2017 -0700
-
-    Note that our dictionary.iea has stuff FreeRADIUS's doesn't.
-    
-    Change-Id: I43844691c8bfcd6f8fcd223fd26ee9e0373f2deb
-    Reviewed-on: https://code.wireshark.org/review/21816
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 404f803
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 20:09:13 2017 -0700
-
-    Merge with FreeRADIUS version.
-    
-    Pick up the copyright notice, whitespace changes, and other comment
-    changes.
-    
-    Add a comment giving the Wireshark bug whence the additional entries
-    came.
-    
-    Change-Id: Ibc188640efe73ca2f53d84bf995b5d7bf34752f9
-    Reviewed-on: https://code.wireshark.org/review/21815
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7f37a87
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 20:02:45 2017 -0700
-
-    Update to current FreeRADIUS version.
-    
-    Change-Id: I86ce4ed13bfd7e87ccdd282e51e8500fbdc9dded
-    Reviewed-on: https://code.wireshark.org/review/21814
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3ba902e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 19:54:30 2017 -0700
-
-    Fix whitespace to match FreeRADIUS version.
-    
-    Change-Id: I406b47f3907745504f49644a890a3588eabf7c0b
-    Reviewed-on: https://code.wireshark.org/review/21813
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e4c1f58
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 19:47:55 2017 -0700
-
-    Fix white space to match FreeRADIUS.
-    
-    Change-Id: Ie814a790c15381036ba6bdb1d066012bb15bfb33
-    Reviewed-on: https://code.wireshark.org/review/21812
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit efcf07c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 19:36:46 2017 -0700
-
-    Merge with FreeRADIUS.
-    
-    They changed some names and added an attribute.
-    
-    They also removed Aruba-AP-Name with no obvious indication of why; we
-    leave it in for now.
-    
-    Give new URLs for attribute lists.
-    
-    Change-Id: I270573b7d29f47572042abe46e4a531003e6a48e
-    Reviewed-on: https://code.wireshark.org/review/21811
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7e60677
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 19:18:03 2017 -0700
-
-    Merge with FreeRADIUS and update.
-    
-    Pick up the copyright notice and $Id value.
-    
-    Don't double-comment-out the items we handle in
-    packet-radius_packetcable.c; they're already commented out in the
-    FreeRADIUS version, and that reduces the number of differences between
-    us and them.  Note in a comment before them that we're handling them in
-    packet-radius_packetcable.c.
-    
-    Add a comment pointing at various CableLabs specs before the attributes,
-    noting where in the specs they're mentioned. (Hint: NOT in a section
-    about RADIUS!  I guess the idea is that some protocol *other* than
-    RADIUS can be used to transfer them.)
-    
-    Change-Id: Ib16fb10df9a434f79a05ce0537c671076aff11a2
-    Reviewed-on: https://code.wireshark.org/review/21810
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1a8991e
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon May 29 22:23:49 2017 +0100
-
-    sharkd: Fix build using system Speex library (autotools)
-    
-    Change-Id: I1798f3dc76704c646d67d11533f8dc32ebab7401
-    Reviewed-on: https://code.wireshark.org/review/21793
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 7c2073a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 18:29:55 2017 -0700
-
-    Fix capitalization of "WiMAX" in END-VENDOR.
-    
-    Change-Id: I35e30b824b9ed8debfbb6a05d72b2396f7132204
-    Reviewed-on: https://code.wireshark.org/review/21809
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c90fa03
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 18:18:01 2017 -0700
-
-    Update item for dictionary.airespace.
-    
-    Change-Id: I5bacf0700a6bac4204a322d60812d5ece7a73be0
-    Reviewed-on: https://code.wireshark.org/review/21808
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fb0bf75
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 18:15:39 2017 -0700
-
-    Merge with the FreeRADIUS version.
-    
-    Pick up the copyright notice and other comments.
-    
-    Update the list of URLs, and include the new attributes as copied from
-    the Cisco support forum article.
-    
-    Change-Id: I5f8c8833fa88e2538f3132c85a4baa4c8691eccb
-    Reviewed-on: https://code.wireshark.org/review/21807
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3315412
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 17:26:08 2017 -0700
-
-    dictionary.h3c is now the same as the FreeRADIUS one.
-    
-    Change-Id: I0fe227ce7c0e8a3010c6d74eb8f511dd4986aba8
-    Reviewed-on: https://code.wireshark.org/review/21806
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f3a23a6
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon May 29 22:52:02 2017 +0200
-
-    WSDG: trivial: fix a link
-    
-    Asciidoc will just create a link from a URL that appears in the text. If
-    we want the link to appear as an address without a description, there's
-    no need to add an empty description. We should, however, have a space
-    behind the link to separate it from the text that follows.
-    
-    Change-Id: Ic01b1dbbea922d785776f1965481ed58f389e30a
-    Reviewed-on: https://code.wireshark.org/review/21789
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c299afe
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun May 28 11:26:05 2017 +0300
-
-    gif: expert info for unknown data block type
-    
-    Before this patch, the dissector would assume that any data block type
-    that is unknown must be the trailer byte. Check explicitly if we have a
-    trailer byte and bring up an expert info for unknown data block types.
-    
-    Change-Id: I4c3087eb403e2e668a22628062edd0240309a2bc
-    Reviewed-on: https://code.wireshark.org/review/21790
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 346d16d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 16:49:56 2017 -0700
-
-    Another update from FreeRADIUS.
-    
-    Picks up copyright notice and
-    
-      commit 803477f565678f56bac8739aab0b11e0fdf0ff13
-      Author: Mathieu Simon <mathieu.simon@simweb.ch>
-      Date:   Mon Jan 20 16:04:17 2014 +0100
-    
-          Extend the H3C dictionary based on public manuals
-    
-          Try to extend the H3C dictionary based on what is scattered on
-          their pages. At least most of it is found quite consistently in
-          the product-specific "Security Configuration Guides".
-    
-          This compilation/crosschecking is based H3C documentation for
-          listed devices:
-          - H3C S12500 and S6800 Switches
-          - H3C WA WLAN Access Points
-          - H3C MSR Routers
-    
-          Remarks:
-          Does not stick with H3C's use of of underline in attribute naming.
-    
-      commit 3046419a3a40d0146cea18083c496703b965d8c4
-      Author: Mathieu Simon <mathieu.simon@simweb.ch>
-      Date:   Mon Jan 20 14:56:00 2014 +0100
-    
-          Revisit H3C Exec-Privilege
-    
-          Try to match H3C terminology as close as to their documentation.
-    
-          - The Attribute name seems to not exactly match documentation,
-            found consistently user i.e. in:
-            - H3C S12500: Configurations Guides
-            - H3C WA Series: Security Configuration Guide
-    
-          - Rename privilege levels to match H3C's documentation
-            (previously likely more 3Com-ish). The levels naming
-            are being used consistently mentioned throughout:
-            - H3C SecPath F1000-E: Operational Manual
-            - H3C S5500-SI: Operation Manual
-    
-      commit 6182027784b9a81af57f9e0e76bc80c94b2ba692
-      Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
-      Date:   Sun Jan 19 22:45:58 2014 +0000
-    
-          Add H3C HW-Exec-Privilege as posted by Mathieu Simon
-    
-    Change-Id: I06d14266a5a60fdeb8ccf9d780db9526df86e5e3
-    Reviewed-on: https://code.wireshark.org/review/21805
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3ac3ca7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 15:57:31 2017 -0700
-
-    dictionary.freeswitch is now the same as the FreeRADIUS one.
-    
-    Change-Id: I885104eeb2a42a7bceb912f3bb437f48a8836c57
-    Reviewed-on: https://code.wireshark.org/review/21804
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f0cb10d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 15:51:11 2017 -0700
-
-    dictionary.nortel is now from the v4.0.x FreeRADIUS branch.
-    
-    Change-Id: I4b6d4e7cce3e2e5a31d60aeeaa392c816f616f8e
-    Reviewed-on: https://code.wireshark.org/review/21803
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 29585b1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 15:49:31 2017 -0700
-
-    Another update from FreeRADIUS.
-    
-    Picks up
-    
-      commit c329540701fecbd4ec0ca995a8cdafb907aca60a
-      Author: Alan T. DeKok <aland@freeradius.org>
-      Date:   Mon Feb 13 20:59:29 2012 +0100
-    
-          Added User-Role attribute
-    
-    and adds copyright information.
-    
-    Change-Id: I293213e39cf5b8fd44956e5a2b0c0153eb4243df
-    Reviewed-on: https://code.wireshark.org/review/21802
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bae9b56
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 15:45:20 2017 -0700
-
-    dictionary.eltex is now from FreeRADIUS.
-    
-    Change-Id: Ic871389d71ac5b9a78d7a2023425df1acbd93447
-    Reviewed-on: https://code.wireshark.org/review/21801
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ca0ea37
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 15:44:08 2017 -0700
-
-    Another update from FreeRADIUS.
-    
-    Includes
-    
-      commit 3128d4f1b562ddbcf3b2db2a54659be79f953262
-      Author: Alan Buxey <alan.buxey@gmail.com>
-      Date:   Sun Jul 21 23:01:57 2013 +0100
-    
-          more spelling issues cleared
-    
-    from FreeRADIUS.
-    
-    Change-Id: I94cc842306b5d0329eb3981acdee63dd877abff8
-    Reviewed-on: https://code.wireshark.org/review/21800
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8cdaaa2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 15:40:04 2017 -0700
-
-    Another update from FreeRADIUS.
-    
-    Copyright, whitespace changs, adds missing END-VENDOR.
-    
-    Change-Id: I1219f83a99e4ebee3af70498848a0b440c6c3bc1
-    Reviewed-on: https://code.wireshark.org/review/21799
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3bc2a60
-Author: Piotr Tulpan <piotr.tulpan@netscan.pl>
-Date:   Tue May 30 00:13:26 2017 +0200
-
-    packet-rsl.c: fixed emlpp priority bit range
-    
-    Based on 3GPP TS 48.058 eMLPP Priority takes bits 1-3 not 1-2.
-    There is also decalred value_string rsl_emlpp_prio_vals (line 2605)
-    that contains 8 values not 4 as expected for 1-2 bits.
-    
-    Change-Id: Iea77f8dbff9af3b25fd298f1a9703c1e34c06d30
-    Reviewed-on: https://code.wireshark.org/review/21797
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 8b5ee12
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 15:30:46 2017 -0700
-
-    More updates from FreeRADIUS.
-    
-    Picks up copyright notices, comment changes, and whitespace cleanups.
-    
-    Change-Id: I42a265bb1f835bfa6cc1f6090d612b7a731f1b1a
-    Reviewed-on: https://code.wireshark.org/review/21798
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f143ece
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 15:14:27 2017 -0700
-
-    Update from FreeRADIUS.
-    
-    See
-    
-        http://www.urbandictionary.com/define.php?term=authentification
-    
-    Change-Id: Ia9756b160fc9a144a6fff1e51b6abb743faa4f69
-    Reviewed-on: https://code.wireshark.org/review/21796
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 36a91d3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 14:55:16 2017 -0700
-
-    Copy over some comment-and-whitespace-only changes from FreeRADIUS.
-    
-    This adds copyright notices and makes other cleanups.
-    
-    Change-Id: I5975b563dffd704a336160d08efde42203c81676
-    Reviewed-on: https://code.wireshark.org/review/21795
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5c3a1fa
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 14:38:52 2017 -0700
-
-    Sync up again.
-    
-    They also fixed up the whitespace.
-    
-    Change-Id: I44eb94bccfd24c027930b7e385255fbec7ca0431
-    Reviewed-on: https://code.wireshark.org/review/21794
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7a122a1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon May 29 19:03:37 2017 +0200
-
-    radius: Sync with FreeRADIUS
-    
-    add Dell EMC dictonary
-    
-    commit 2b2a7dc5654abf740ff7ffb52fc0807a5e0f1781
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Wed May 24 15:55:05 2017 -0400
-    
-        as posted to the list
-    
-    Change-Id: If3e7e7f401c6f1eca5292f0f323c2cd86dfd3fcc
-    Reviewed-on: https://code.wireshark.org/review/21787
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5d27b74
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 14:23:21 2017 -0700
-
-    Put back whitespace cleanups.
-    
-    (I'll send those to the FreeRADIUS people.)
-    
-    Change-Id: I9163c2710e2924e657b19f2d48bd310bb805244c
-    Reviewed-on: https://code.wireshark.org/review/21792
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 32c9b44
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 29 14:21:50 2017 -0700
-
-    Copy over the file from the current FreeRADIUS.
-    
-    That adds the FreeRADIUS copyright notice.
-    
-    Change-Id: Id6e05214a59b0fcf31e2c0f5ccd4a31632c08459
-    Reviewed-on: https://code.wireshark.org/review/21791
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b521c77
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon May 29 18:57:40 2017 +0200
-
-    RADIUS: sync with FreeRADIUS
-    
-    commit 766b61dc2b6a75ce66819891ae4d3dcf2d6954ed
-    Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Date:   Mon May 29 16:56:02 2017 +0000
-    
-        dictionary.patton: fix indent
-    
-        using ./format.pl
-    
-    commit 1c0c6d24953203417c18dbc7d02688d990c6d3d4
-    Author: Brice Schaffner <brice.schaffner@gmail.com>
-    Date:   Thu May 11 10:05:24 2017 +0000
-    
-        Added missing Patton Vendor Attributes
-    
-        Added some new Patton Vendor Attributes to the list.
-        These attributes are now supported on the newest Patton device running on Trinity software version 3.11.2.
-    
-    Change-Id: I4e1de392886494418e2e44d7f7a935c96a6f8425
-    Reviewed-on: https://code.wireshark.org/review/21786
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4e05adc
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon May 29 11:30:16 2017 -0400
-
-    GTK: Bugfix not allowing extcap capture filters to be verified.
-    
-    Matches Id45052f21ebb290bf92c201370584156a65f2e19
-    
-    Change-Id: I2b097d176ec3ce0637af95d66d2f58b834c79ea2
-    Reviewed-on: https://code.wireshark.org/review/21783
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b988d8b
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Fri Jan 6 21:49:50 2017 -0500
-
-    Fix up dissector tables' UI names.
-    
-    This was inspired by using the Decode-As UI to decode Field "SSL TCP Dissector"
-    Value (port) XXX as YYY.  "SSL Port" makes more sense as the UI name.
-    
-    Change-Id: Id6398a5dc79e32bddc4f1bfcf0a468ae1364808f
-    Reviewed-on: https://code.wireshark.org/review/19573
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0a3df90
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun May 28 08:55:15 2017 -0400
-
-    Extend display filter len() to support all string and byte field types.
-    
-    len() can now handle FT_STRING, FT_STRINGZ, FT_STRINGZPAD,
-    FT_UINT_STRING, FT_BYTES, and FT_UINT_BYTES
-    through the use of fvalue_length()
-    
-    Change-Id: I53baf2657f7804f64e63e4645d0b84b782ae9b08
-    Reviewed-on: https://code.wireshark.org/review/21775
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 10d7e39
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon May 29 08:51:30 2017 +0200
-
-    Qt: Fix capture filter verification for non-extcap interfaces.
-    
-    Change-Id: Id45052f21ebb290bf92c201370584156a65f2e19
-    Reviewed-on: https://code.wireshark.org/review/21777
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d3af161
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun May 28 20:12:16 2017 -0700
-
-    Update some comments.
-    
-    We're no longer commenting out dictionary.rfc6929 or dictionary.rfc6930,
-    as we now support those extensions.
-    
-    Make other comments more closely resemble the tip of the master branch
-    in FreeRADIUS.
-    
-    Change-Id: I19144bc6c6ff478d6637bf9679df2c737db82186
-    Reviewed-on: https://code.wireshark.org/review/21779
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 39edfaa
-Author: Robert Grange <robionekenobi@bluewin.ch>
-Date:   Wed May 24 17:04:05 2017 +0200
-
-    packet-mq: Handle MQV902
-    
-    Add various new defines for WMQ902
-    
-    Change-Id: I2000f35a01e484d2e4665d1fe4a91a74f6c33236
-    Reviewed-on: https://code.wireshark.org/review/21747
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 866178e
-Author: Pau Espin Pedrol <pespin@sysmocom.de>
-Date:   Tue May 9 14:04:18 2017 +0200
-
-    GTK+Qt: Show Osmux Packet Counter on Telephony menu
-    
-    Change-Id: I565b0d2d43dd98781f77a302a20bd841e3e4650e
-    Reviewed-on: https://code.wireshark.org/review/21598
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 24d991d
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Sun May 28 01:11:46 2017 -0500
-
-    Fixup support of BASE_UNIT_STRING for 64 bit based integer fields
-    
-    proto.c’s proto_custom_set() was missing a test for
-    BASE_UNIT_STRING under the 64 bit based integer case.  Any
-    custom columns sourced from a field stored in a 64 bit integer
-    and having the BASE_UNIT_STRING attribute would only display the
-    units but not the actual number.
-    
-    With this patch 64 bit based integer fields having the
-    BASE_UNIT_STRING attribute will now properly display both
-    their value and units when added to the packet list as a
-    custom column.
-    
-    Change-Id: Icb9532771eb2f4098891dedd82886fd6223ce7a6
-    Reviewed-on: https://code.wireshark.org/review/21771
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 827cb68
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri May 26 09:03:25 2017 -0400
-
-    proto_tree_add_bytes_format[_value] can handle NULL trees
-    
-    v2.3.0rc0-3618-gd962e7ae71 tried to simplify logic, but missed
-    use of TRY_TO_FAKE_THIS_REPR.  Create a "friendlier" version
-    TRY_TO_FAKE_THIS_REPR_NESTED which allows for the "base"
-    proto_tree_add_xxx to be called in proto_tree_add_xxx_format[_value]
-    functions.
-    
-    Bug: 13736
-    Change-Id: I98883ad4581d2327edb8da5efd8ef8a89b55e3d0
-    Reviewed-on: https://code.wireshark.org/review/21764
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3ae7755
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu May 25 19:11:46 2017 +0100
-
-    RADIUS: Add Vendor ID, Vendor Type and Vendor Length fields
-    
-    Change-Id: I241bfb5d77374d8dd1428fb550d9e913a2d3570a
-    Reviewed-on: https://code.wireshark.org/review/21756
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit cf93801
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 28 16:10:04 2017 +0200
-
-    proto.c : fix indent
-    
-    Change-Id: Ib2f9b7bee59d6fa60972df7adf7caaaf9921d975
-    Reviewed-on: https://code.wireshark.org/review/21776
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 31fa054
-Author: Benoît Canet <benoit@scylladb.com>
-Date:   Sun May 7 14:01:18 2017 +0200
-
-    cql: Dump row results
-    
-    Bug: 13709
-    Change-Id: If96e947e14d5bd0ccdc52bf0b618f34c64dd6780
-    Signed-off-by: Benoît Canet <benoit@scylladb.com>
-    Reviewed-on: https://code.wireshark.org/review/21637
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 1ab6604
+commit cd63520
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun May 28 08:14:20 2017 +0000
+Date:   Sat Jun 17 11:15:18 2017 -0700
 
-    [Automatic update for 2017-05-28]
+    WiX: Fixup merge module configuration.
     
-    Update manuf, services enterprise-numbers, translations, and other items.
+    Set the merge module path based on our platform and version of Visual
+    Studio.
     
-    Change-Id: Iac064b8029219fcd67a92db28a3209659113a978
-    Reviewed-on: https://code.wireshark.org/review/21772
+    Change-Id: Ic866447f36d5264d61fc988f3f9d8b4d2e5c0827
+    Reviewed-on: https://code.wireshark.org/review/22192
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 9aea938
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Thu May 18 21:41:30 2017 +0200
-
-    List all plugin files for static build
-    
-    The automake file has a list of plugin files used to support static
-    builds. This list should be consistent with the files in the tree.
-    This change aligns the list with the current plugin files.
-    
-    Change-Id: I463a4dbf21651b1a8917049b5a705a93c0744591
-    Reviewed-on: https://code.wireshark.org/review/21698
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9097d1b
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri May 26 21:44:08 2017 +0200
-
-    LAPDm: Support the LAPDm B4 Frame Format
-    
-    The B4 Frame Format is used on the downlink SACCH and has no length
-    field.
-    
-    While the comment on top of packet-lapdm.c claimed ever since its
-    introduction in 2009 that B4 was a supported format, in fact it was not
-    supported yet.  This patch makes handling the length field conditional
-    to a frame format that has a length field, and introduces lapdm_data_t
-    that can be passed using call_dissector_with_data().
-    
-    The GSMTAP dissector is updated to use this mechanism to specify the
-    frame format based on the channel type.
-    
-    Change-Id: I52cb1cedbc8c7baf65e70d3e050e8932573647aa
-    Reviewed-on: https://code.wireshark.org/review/21767
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2023f41
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Fri May 26 23:58:07 2017 +0200
-
-    Qt: About dialog fails when configured without plugins
-    
-    The about dialog compilation fails when plugins and LUA are disabled.
-    Add the missing preprocessor statements.
-    Also make the plugin tab really empty when there's nothing to report.
-    
-    Change-Id: Idba0dc86e7110e56b2d949f517c966a121d28e47
-    Reviewed-on: https://code.wireshark.org/review/21768
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c9b0e9c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu May 25 00:28:45 2017 +0200
-
-    Report syntax errors in UAT prefs parsing
-    
-    Add the cause for a syntax error while parsing UATs. Example output:
-    
-        $ tshark -ouat:ssl_keys:,
-        tshark: Invalid -o flag "uat:ssl_keys:,": ssl_keys:1: No IP address given.
-        $ tshark -ouat:unknown:,
-        tshark: Invalid -o flag "uat:unknown:,": Unknown preference
-    
-    Change-Id: I549406c4e31a81d29f487ef47bdb3c22da084947
-    Reviewed-on: https://code.wireshark.org/review/21748
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9401659
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed May 24 15:37:03 2017 -0700
-
-    WSUG: Add a TCP Analysis section.
-    
-    Try to document as accurately as possible the circumstances under which
-    each TCP analysis flag is added.
-    
-    Update some TCP debugging code.
-    
-    Change-Id: I793756f73b8ade328e150acf32bc203792e29449
-    Reviewed-on: https://code.wireshark.org/review/21749
     Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 1420e0a
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Thu May 25 23:00:32 2017 +0100
-
-    Modbus: Add dissection of each bit for holding coils and discrete inputs
-    
-    Bug: 13734
-    Change-Id: Ifd89bc1055edd7c123395ce0511594fc88d151a2
-    Reviewed-on: https://code.wireshark.org/review/21759
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1b02cb9
-Author: Brandon Enochs <enochs.brandon@gmail.com>
-Date:   Mon May 22 19:53:25 2017 -0400
-
-    Added IEEE CID support to the make-manuf script.  These prefixes are commonly used in IEEE 802.11 MAC address randomization.
-    
-    Change-Id: I94ed29d31c81df0e4f514d7c354073182c116f75
-    Reviewed-on: https://code.wireshark.org/review/21737
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d14b8f6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu May 25 15:27:18 2017 -0400
-
-    GTK: Don't allow extcap capture filters to be verified.
-    
-    There isn't an API to do it and if WinPcap isn't present it can
-    cause a crash.
-    
-    Change-Id: I5338f854acb26f0822ac027e6c853a550da3f7b1
-    Reviewed-on: https://code.wireshark.org/review/21758
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit c89f4c628c315e8f472653856a0776469c65f34e)
+    Reviewed-on: https://code.wireshark.org/review/22424
 
-commit 9bd2b63
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu May 25 14:36:44 2017 -0400
-
-    Don't try to compile capture filter if pcap_compile isn't available.
-    
-    This is most likely due to WinPcap not being installed.
-    
-    Bug: 13672
-    Change-Id: Ic7069f98c7f8068cdc5045204c2e23ab56b3f7eb
-    Reviewed-on: https://code.wireshark.org/review/21757
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f33363c
-Author: DarienSpencer65 <cusneud@mail.com>
-Date:   Thu May 25 19:24:51 2017 +0300
-
-    FP - Fixed bug in heur PCH dissector
-    
-    Calculated length in bits ( * 8 ) then checked as bytes
-    
-    Change-Id: Ic9ef94bcdce40fc6463bf472d1e3a4a3cf05b1ba
-    Reviewed-on: https://code.wireshark.org/review/21755
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit dd2b1d5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue May 16 09:07:17 2017 -0400
-
-    checkAPIs.pl: Add check to make sure tvb_get_ function isn't used in proto_tree_add_xxx
-    
-    Check for situations for things like proto_tree_add_uint, where the "uint" passed
-    is a call to tvb_get_ntohl().  For that, proto_tree_add_item should be used.
-    
-    Change-Id: Ibe14678bd66b05f612b125ca289f671c499a2990
-    Reviewed-on: https://code.wireshark.org/review/21685
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 728d5ef
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed May 24 09:03:17 2017 -0400
-
-    packet-lpp.c: Create temporary variables for some proto_tree_add_uint calculations.
-    
-    Pacify checkAPIs.pl
-    
-    Change-Id: I03be9eaa4f47df48d8809d205997ee4db47707b7
-    Reviewed-on: https://code.wireshark.org/review/21743
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dd73765
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed May 24 09:14:18 2017 -0400
-
-    packet-lte-rrc.c: Create temporary variables for some proto_tree_add_uint calculations.
-    
-    Pacify checkAPIs.pl
-    
-    Change-Id: I1801bd92aeb34e3e3240b15cef024718062852d7
-    Reviewed-on: https://code.wireshark.org/review/21744
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7ca84f3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu May 25 11:14:51 2017 +0200
-
-    umts_fp: Fix Dereference of null pointer found by Clang analyzer
-    
-    Change-Id: I9b35429d7599c95e0231cec835ac3cd1fca6b06b
-    Reviewed-on: https://code.wireshark.org/review/21752
-    Reviewed-by: sswsdev <sswsdev@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5a56cf6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu May 25 11:06:53 2017 +0200
-
-    umts_fp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Ia3f467e7cbec0a253da42b4d549de75330c91366
-    Reviewed-on: https://code.wireshark.org/review/21751
-    Reviewed-by: sswsdev <sswsdev@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit da9363e
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat May 20 00:27:01 2017 +0100
-
-    RADIUS: Add support for extended attributes (RFC 6929)
-    
-    Bug: 13176
-    Change-Id: I22cdce01d8e7d5b69c2013684a98a9a48acc0d13
-    Reviewed-on: https://code.wireshark.org/review/21727
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fd9f698
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu May 25 11:16:12 2017 +0200
-
-    icq: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Ic009ea5bce2f349ede407e0bed3a8640262433d2
-    Reviewed-on: https://code.wireshark.org/review/21753
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d962e7a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed May 24 23:20:54 2017 -0400
-
-    Simplify proto_tree_add_bytes_format[_value]
-    
-    Call proto_tree_add_bytes first so it can do all of the basic
-    field checks that were being duplicated.
-    
-    Change-Id: Idc9a3cbf9498aa612a39cc80e3381eba52ce9fa4
-    Reviewed-on: https://code.wireshark.org/review/21750
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 45dbd23
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed May 24 10:30:01 2017 -0400
-
-    packet-icq.c: Use more FT_UINT_STRING
-    
-    Makes it simpler than proto_tree_add_string + tvb_get_string_enc combo.
-    
-    Change-Id: Id25d1cc1ed727a6211d9ce113d54dd29c9bbdfcb
-    Reviewed-on: https://code.wireshark.org/review/21745
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e108df0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed May 24 10:45:19 2017 -0400
-
-    packet-gsm_a_rr.c: proto_tree_add_uint -> proto_tree_add_bits_item
-    
-    Change-Id: Iacf9328ddaa51f9459fd19752bcde70d9312e425
-    Reviewed-on: https://code.wireshark.org/review/21746
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 249ce2f
-Author: DarienSpencer65 <cusneud@mail.com>
-Date:   Wed May 24 15:12:05 2017 +0300
-
-    NBAP: Create E-DCH channel info
-    
-    Adding missing creation and insertion of the E-DCH channel
-    info the the FP conversation info struct
-    
-    Change-Id: Ic7dfb5b9579133ff84b2fc4fff73a3560055dcca
-    Reviewed-on: https://code.wireshark.org/review/21742
-    Reviewed-by: S. Shapira <sswsdev@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 12d4ca9
-Author: Aurelien Aptel <aaptel@suse.com>
-Date:   Tue May 23 18:58:36 2017 +0200
-
-    SMB2: set session server port in partial capture
-    
-    When dissecting a capture that does not have a session setup exchange,
-    assume tree connect response packets are coming from the server and set
-    the port accordingly.
-    
-    This is needed for decryption because the decryption key is different
-    depending on which side the message was created on. We need to set the
-    server port to know if a packet was made on the server.
-    
-    Change-Id: I80229ed6d69821bc0c76808e57bdb2fc53fcceb3
-    Reviewed-on: https://code.wireshark.org/review/21741
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 667782b
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue May 23 15:09:49 2017 +0200
-
-    [RANAP] Pretify info column.
-    
-    Change-Id: I7f1832cd818d76843e00b689883e28ed46633585
-    Reviewed-on: https://code.wireshark.org/review/21739
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8fd14b7
-Author: Anders Broman <a.broman58@gmail.com>
-Date:   Tue May 23 10:56:03 2017 +0000
-
-    Revert "Fix issue with dissecting multiple DT1 packets in the frame"
-    
-    Bug: 13651
-    This reverts commit daefa86695ecb6f859615ccd1bee6269e2c568a5.
-    
-    Change-Id: I50eee7ae99bc471d95365a8da0271188d826ac46
-    Reviewed-on: https://code.wireshark.org/review/21738
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8bc9f9a
-Author: sswsdev <sswsdev@gmail.com>
-Date:   Mon May 22 17:57:58 2017 +0300
-
-    UMTS FP: Fixed heuristic FACH dissector
-    
-    Dissector was not adding the correct TB size & TB count to the conversation
-    info for the longer RACH variant (52 bytes long)
-    
-    Change-Id: Iace894929684af3e0eb9804cbc57cdc169f136a9
-    Reviewed-on: https://code.wireshark.org/review/21736
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dd91436
-Author: Kenneth Soerensen <knnthsrnsn@gmail.com>
-Date:   Mon May 15 14:08:46 2017 +0200
-
-    ZigBee: Add attribute and command names from Events cluster
-    
-    Bug: 13360
-    Change-Id: Ie6c5cb4d592490716204ff56dea11e92e071f740
-    Reviewed-on: https://code.wireshark.org/review/21662
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fc1c8e1
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon May 22 15:09:13 2017 +0200
-
-    [RANAP] Update to 3GPP TS 25.413 V14.0.0 (2017-03)
-    
-    Change-Id: I5d448a4daf438b05a30473e999574803e5d6ade9
-    Reviewed-on: https://code.wireshark.org/review/21730
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d472543
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun May 21 08:12:15 2017 -0400
-
-    packet-dccp.c: Don't use tvb_get_ptr for getting a uint number.
-    
-    Use the tvb_get_ntohXXX instead.
-    
-    Change-Id: I8d5c6ac2f2c8b1ac9237297f06709513fc2c9113
-    Reviewed-on: https://code.wireshark.org/review/21733
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8cdbde0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun May 21 07:39:32 2017 -0400
-
-    packet-h261.c: Use proto_tree_add_item
-    
-    Change-Id: Ifbb69d0bd2a71c4dd022c6dbae2ed84c2bf5f912
-    Reviewed-on: https://code.wireshark.org/review/21732
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6112591
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri May 19 19:00:19 2017 -0400
-
-    packet-rfc2190.c: Use proto_tree_add_item instead of proto_tree_add_xxx.
-    
-    Use hf_ fields with bitmasks instead of manually computing bits.
-    
-    Change-Id: I342ac9288155647fc6600223f892513bab351a7c
-    Reviewed-on: https://code.wireshark.org/review/21731
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 31335e6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon May 22 09:25:58 2017 -0400
-
-    packet-megaco.c: Rename my_proto_tree_add_string -> megaco_tree_add_string.
-    
-    It can trip up some of the check*.pl scripts and makes it clearer it's
-    very megaco specific.
-    
-    Change-Id: Idb8ee104f59e07d5cfabd7aaedf23f915fad51b3
-    Reviewed-on: https://code.wireshark.org/review/21734
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 96d4837
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon May 22 09:27:33 2017 -0400
-
-    Create temporary variables for some proto_tree_add_<datatype> calculations.
-    
-    checkAPIs.pl doesn't like tvb_get_* parameters because it thinks
-    proto_tree_add_item should be used.  This is just to pacify the check.
-    
-    Change-Id: I2df1233fe8c7976c257197079c06d24e472303b5
-    Reviewed-on: https://code.wireshark.org/review/21735
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b3c6895
-Author: Eric Wetzel <thewetzel@gmail.com>
-Date:   Wed May 17 22:17:30 2017 -0400
-
-    dnp3: fix parser when a packed variation is used with prefix value qualifier
-    
-    Bug: 13733
-    Change-Id: I4d490793b54816e731d72bf1317d3779a05ae011
-    Reviewed-on: https://code.wireshark.org/review/21722
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 3337114
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun May 21 08:15:09 2017 +0000
-
-    [Automatic update for 2017-05-21]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I4a0774a6aa3ecb101b7ca0a87571544dc936012d
-    Reviewed-on: https://code.wireshark.org/review/21723
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 5f74d8b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat May 20 16:51:32 2017 +0200
-
-    QUIC: fix some indent issue
-    
-    Change-Id: If259cb4c37b10aca9f5b8e16f409acc8412f0622
-    Reviewed-on: https://code.wireshark.org/review/21719
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 92b8921
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat May 20 19:00:24 2017 +0200
-
-    Revert "Change exports from Q.932 to use VALS_WITH_TABLE in the same way as QSIG"
-    
-    This reverts commit d3b72329359103f298e4f633b8c83fe2ce3c7517.
-    
-    Revert "Fix debian symbols check after Q.932 symbols removal"
-    
-    This reverts commit 3bc43e377076d1097321e2f7ffc89f52ee33afa0.
-    
-    Change-Id: Ib0623ab289613f48c73d38d038131a69cbf2190b
-    Reviewed-on: https://code.wireshark.org/review/21720
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit ab6abed
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat May 20 10:54:40 2017 -0700
-
-    If we don't have an ARUUID, don't use it as if we do.
-    
-    Don't use random on-the-stack data as a UUID.
-    
-    Change-Id: I77961e1404ad73a484a7fc865bc54219dc239b4d
-    Reviewed-on: https://code.wireshark.org/review/21721
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6abff31
-Author: sswsdev <sswsdev@gmail.com>
-Date:   Fri May 19 12:28:36 2017 +0300
-
-    UMTS FP: Refactored FP Conversation Info struct
-    
-    Moved some fields which are only relevant to HS-DSCH / E-DCH  channel into appropriate 'channel specific' structs.
-    Also renamed "dchs_in_flow_list" to  "dch_ids_in_flow_list"
-    
-    Change-Id: I7bdeb74c7b1eda0872c0243f0e5f229df2691866
-    Reviewed-on: https://code.wireshark.org/review/21707
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d061a7d
+commit 89431bc
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 19 18:29:31 2017 -0700
-
-    Show structures as FT_NONE, not FT_STRING.
-    
-    Change-Id: I51577b6a92ff2401671065b1e6313db9a438c675
-    Reviewed-on: https://code.wireshark.org/review/21718
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 18bc1cf
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu May 18 17:07:24 2017 +0200
-
-    Openflow(v6): enhance display of Port and Port Description
-    
-    Change-Id: I6252989f5f57d68049da825da194e0443b91ae09
-    Reviewed-on: https://code.wireshark.org/review/21702
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6bc71e4
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri May 19 15:05:06 2017 +0200
-
-    Qt: Add check for packet bytes
-    
-    Disable menu items handling packet bytes if not having any.
-    
-    Bug: 13723
-    Change-Id: I9cdb1185910f865c61a8ee74e3cf3177159bf315
-    Reviewed-on: https://code.wireshark.org/review/21710
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 4424a8e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri May 19 14:44:14 2017 +0200
-
-    Qt: Check for no tvb in Show Packet Bytes
-    
-    Bug: 13723
-    Change-Id: I145fe93fc05a9cfdc6c0fc949274a1e88dcf2f1e
-    Reviewed-on: https://code.wireshark.org/review/21709
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit b2923e9
-Author: Björn Ruytenberg <bjorn@bjornweb.nl>
-Date:   Fri May 19 19:03:29 2017 +0200
-
-    msnip: Verify pinfo->dst is a valid IPv4 address
-    
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1678
-    Bug: 13725
-    Change-Id: Ib61733200658b4cca0bb0f45e5445b0ed3c12ab0
-    Reviewed-on: https://code.wireshark.org/review/21712
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b83e74c
-Author: Dhiru Kholia <dhiru.kholia@gmail.com>
-Date:   Thu May 18 12:45:03 2017 +0530
-
-    IS-IS: Add support for CRYPTO_AUTH authentication type
-    
-    CRYPTO_AUTH (generic cryptographic authentication) is documented in
-    RFC 5310, https://tools.ietf.org/html/rfc5310.
-    
-    Sample IS-IS .pcap files using CRYPTO_AUTH (HMAC-SHA1/HMAC-SHA256) can
-    be found at https://c0decafe.de/svn/codename_loki/test/.
-    
-    Bug: 13727
-    Change-Id: If25edc5985e13de56ab6bade570f06e0e9db276c
-    Reviewed-on: https://code.wireshark.org/review/21697
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 3346fc9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu May 18 16:43:27 2017 +0200
-
-    TLS: Add Reserved Extension type from GREASE
-    
-    See https://tools.ietf.org/html/draft-ietf-tls-grease
-    
-    Change-Id: I305a35c50f6aa94f94f20974babb7c871393f9e7
-    Reviewed-on: https://code.wireshark.org/review/21706
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit aa607c3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 5 20:48:22 2017 +0100
-
-    TLS: add Reserved Supported Group from GREASE
-    
-    See https://tools.ietf.org/html/draft-ietf-tls-grease
-    
-    Change-Id: Iaf5ec11eba3b28cff5d292326166eae26fabda99
-    Reviewed-on: https://code.wireshark.org/review/21705
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 0c3e426
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 5 16:08:25 2017 +0100
-
-    TLS: Update list of Supported Groups Registry
-    
-    https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8
-    
-    Change-Id: I5beca54eb4dc644647b0f40ec005d8e3bf23222f
-    Reviewed-on: https://code.wireshark.org/review/21704
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c449fde
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 5 14:40:47 2017 +0100
-
-    TLS: Update draft tls-chacha20poly1305 to RFC 7905
-    
-    and also remove some blankline
-    
-    Change-Id: I5e66a64c95697f8e92d346b7b4c8956eadf967d3
-    Reviewed-on: https://code.wireshark.org/review/19955
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 0db842d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 30 21:50:26 2017 +0100
-
-    TLS: Add Reserved cipher from GREASE
-    
-    See https://tools.ietf.org/html/draft-ietf-tls-grease
-    
-    Change-Id: I890e33a6b5afb51d768b0264023b51682642f867
-    Reviewed-on: https://code.wireshark.org/review/19871
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 3bc43e3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri May 19 12:07:38 2017 +0200
-
-    Fix debian symbols check after Q.932 symbols removal
-    
-    Change-Id: Ib68c11220b67f31f69c8fc1524f8492caa577f57
-    Fixes: v2.3.0rc0-3576-gd3b7232935 ("Change exports from Q.932 to use VALS_WITH_TABLE in the same way as QSIG")
-    Reviewed-on: https://code.wireshark.org/review/21708
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ac8fd7e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri May 19 09:40:53 2017 +0200
-
-    Openflow(v6): Display reserved field for Port Description flag
-    
-    Change-Id: I2d09e47fe54df7b0e5f89395b93c25d769566f42
-    Reviewed-on: https://code.wireshark.org/review/21703
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e71219c
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Fri May 19 00:45:30 2017 +0200
-
-    SDP: Handle incomplete media attributes
-    
-    Media attributes have a format of name:value, where, if the value
-    is missing the colon is missing too. Sometimes the colon is there,
-    while the value is missing. Even though this is in error, continue
-    dissecting the other attributes.
-    
-    Bug: 13698
-    Change-Id: I369b6db657b33a368f4b12134412100774105615
-    Reviewed-on: https://code.wireshark.org/review/21699
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2d46fc3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri May 19 07:30:02 2017 +0000
-
-    afp: fix indent (use tab)
-    
-    Change-Id: I774942860a5d82cfa9003e0363561374caa095ae
-    Reviewed-on: https://code.wireshark.org/review/21701
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e794889
-Author: Marius Paliga <mareko.paliga@gmail.com>
-Date:   Thu May 18 14:13:33 2017 +0200
-
-    Rename AVP Emergency-Indication to Emergency-Services
-    
-    Renamed in 29.273 Rel 14
-    
-    Change-Id: I171510869ed2c8a77a983e7c37bbdcb7494ad076
-    Reviewed-on: https://code.wireshark.org/review/21696
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f0086f8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 16 22:15:46 2017 +0200
-
-    odb-ii: Fix Dereference of null pointer found by Clang analyzer
-    
-    Change-Id: Ic19a59efffba1f19d3469445e8733fce8ab4cf98
-    Reviewed-on: https://code.wireshark.org/review/21689
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ebb0d87
-Author: Kenneth Soerensen <knnthsrnsn@gmail.com>
-Date:   Mon May 15 17:13:43 2017 +0200
-
-    ZigBee: Fix proto_tree_add_item wrong last argument
-    
-    Change-Id: Ie68acb7eb584be2ac30f9a257949d8d26661e95a
-    Reviewed-on: https://code.wireshark.org/review/21667
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f16bc10
-Author: sswsdev <sswsdev@gmail.com>
-Date:   Tue May 16 16:35:41 2017 +0300
-
-    UMTS FP: Track Paging Indications in PCH
-    
-    The dissector now carries the 'Paging Indication Bitmap' between subsequent PCH frames.
-    The reason for this is any frame containing the bitmap 'wakes up' users to read the subsequence frame. This feature allows us to see which paging groups were called for each frame.
-    Also refactored some Paging Indication related fields in the umts convoersation object and tree items.
-    
-    Change-Id: I5e55e916ec31b60bc93238b397e07a1260906736
-    Reviewed-on: https://code.wireshark.org/review/21686
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c0d81f0
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon May 15 14:52:26 2017 +0100
-
-    SMTP: allow multiple TCP ports/ranges to be registered
-    
-    Change-Id: Ie470f6b2ffbdc156a1756466826ef6f42e54b8be
-    Reviewed-on: https://code.wireshark.org/review/21666
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c486707
-Author: Björn Ruytenberg <bjorn@bjornweb.nl>
-Date:   Tue May 16 20:14:45 2017 +0200
-
-    mrdisc: Verify pinfo->dst is a valid IPv4 address
-    
-    Change-Id: I828a60091ef59a0381feddfcb6dd7a0d20be67f9
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1550
-    Bug: 13707
-    Reviewed-on: https://code.wireshark.org/review/21687
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d3b7232
-Author: Tomas Kukosa <tomas.kukosa@ixperta.com>
-Date:   Wed May 17 10:30:54 2017 +0200
-
-    Change exports from Q.932 to use VALS_WITH_TABLE in the same way as QSIG
-    (because value tables with WS_DLL_PUBLIC can not be used to initialize hf array)
-    
-    Change-Id: I45f3a2783e8b0258de79c8198a0382a4281a02eb
-    Reviewed-on: https://code.wireshark.org/review/21690
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8edb94c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue May 16 21:49:58 2017 -0400
-
-    UA/UDP: Create TLV for Connect and make fields filterable
-    
-    Change-Id: I9c709fa2e69b7ac3a2c136c12d6810d4e716b15f
-    Reviewed-on: https://code.wireshark.org/review/21693
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8376a8b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue May 16 22:55:34 2017 -0400
-
-    Create temporary variables for some proto_tree_add_<datatype> calculations.
-    
-    checkAPIs.pl doesn't like tvb_get_* parameters because it thinks
-    proto_tree_add_item should be used.  This is just to pacify the check.
-    
-    Change-Id: If40728bcdf5558c351999057321ffba5d802c7c7
-    Reviewed-on: https://code.wireshark.org/review/21694
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 99b76a5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue May 16 14:48:34 2017 -0400
-
-    Use proto_tree_add_item instead of proto_tree_add_xxx.
-    
-    It's a little more efficient to use proto_tree_add_item, than
-    proto_tree_add_xxx, passing it the returned tvb_get_xxx value.
-    
-    Change-Id: I22ddd7ab36e1ee5aae78fc693d7dbac4b4f802f2
-    Reviewed-on: https://code.wireshark.org/review/21691
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3b77900
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue May 16 19:29:01 2017 -0400
-
-    bootp: Always have SIP Server IP be an IP address
-    
-    Change-Id: Idf6b31748ee5aa04e8660a0eb283072da855dda2
-    Reviewed-on: https://code.wireshark.org/review/21692
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b1225fe
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Tue May 16 07:52:13 2017 +0200
-
-    sharkd: add more information about currently loaded file.
-    
-    Change-Id: I59c34a0c92963822f02b16479e1ebb3bca6e64f6
-    Reviewed-on: https://code.wireshark.org/review/21678
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 3fbb583
-Author: Tomas Kukosa <tomas.kukosa@ixperta.com>
-Date:   Tue May 16 12:24:43 2017 +0200
-
-    More exports from Q.932 and QSIG
-    
-    Change-Id: Ife78a95712b47166735fd48b1b55193e37eef833
-    Reviewed-on: https://code.wireshark.org/review/21682
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Tomáš Kukosa <tomas.kukosa@ixperta.com>
-
-commit 511b9dd
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue May 16 13:10:48 2017 +0200
-
-    [Kafka] The inclusion of LZ4 broke building on Ubuntu 14.04, since it has lz4-r114.
-    
-    But the lz4 frame API was introduced in [r123](https://github.com/lz4/lz4/blob/r123/lz4frame.h).
-    Put the code behind a lz4 version check.
-    
-    Change-Id: If8a7e5f7f2e7c9beac89eec334368a5b95a1bc3f
-    Reviewed-on: https://code.wireshark.org/review/21684
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 467031c
-Author: sswsdev <sswsdev@gmail.com>
-Date:   Mon May 15 19:59:53 2017 +0300
-
-    UMTS FP: Heuristic dissection enhancements
-    
-    Added sources regarding some magic numbers in the heuristic dissection methods
-    Added logic to spot 52 bytes long RACH frames to the RACH heuristic dissector
-    Added a check for common TB length in PCH heuristic dissector.
-    
-    Change-Id: Icdb06cfb230189b3270da0f4c8b24aa400157ea9
-    Reviewed-on: https://code.wireshark.org/review/21668
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e6b395b
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue May 16 12:51:42 2017 +0200
-
-    [GTPv2] Update cause values as per 3GPP TS 29.274 V14.3.0 (2017-03).
-    
-    Change-Id: I43a3d02322c86ff8d388f463aaa66e9866969283
-    Reviewed-on: https://code.wireshark.org/review/21683
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 90db2bb
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue May 16 00:09:43 2017 +0200
-
-    Add --enable-ubsan/ENABLE_UBSAN for UndefinedBehaviorSanitizer
-    
-    UndefinedBehaviorSanitizer (UBSan) can catch a lot of issues
-    (out-of-bounds memory access, integer overflows, undefined shifts,
-    etc.) and is recommended during development using GCC or Clang. Add an
-    option for it (similar to ASAN support).
-    
-    Change-Id: Ib0db50cee9eb5af0f5c4f06e07f3899a3a34702d
-    Reviewed-on: https://code.wireshark.org/review/21673
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 924d1ec
-Author: Chris Wills <xenkrs@outlook.com>
-Date:   Mon May 15 22:36:52 2017 -0700
-
-    Fixed array index using nss to match the definition
-    
-    Bug: 13713
-    Change-Id: I7e96a6209fe5cd0ba11323f35e4408eb4ff7141a
-    Signed-off-by: Chris Wills <xenkrs@outlook.com>
-    Reviewed-on: https://code.wireshark.org/review/21677
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1ef6013
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue May 16 10:06:56 2017 +0200
+Date:   Mon Jun 26 21:03:01 2017 -0700
 
-    [Diameter dictionary] Add some AVPs from TS 32.299 V14.3.0 (2017-03)
-    
-    Change-Id: I887e11697784c487391b2ea7ec3e0d2e69025c82
-    Reviewed-on: https://code.wireshark.org/review/21679
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2593a16
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon May 15 21:33:04 2017 +0200
-
-    Openflow (v4): use BASE_SPECIAL_VALS
-    
-    to avoid duplicated hf
+    On UN*X, make sure we can find inflate() in libz.
     
-    (like for v5 4b90e93f37cb092472db314ca0df3ce9503e1827)
+    For example, on at least some versions of Fedora, if you have a 64-bit
+    machine, have both the 32-bit and 64-bit versions of the run-time zlib
+    package installed, and have only the *32-bit* version of the zlib
+    development package installed, it'll find the header, and think it can
+    use zlib, and will use it in subsequent tests, but it'll try and link
+    64-bit test programs with the 32-bit library, causing those tests to
+    falsely fail.  Hilarity ensues.
     
-    Change-Id: I7658a98c36cc42dc67f85b84fb16f36f5e505032
-    Reviewed-on: https://code.wireshark.org/review/21672
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 400bff0
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Mon May 15 15:07:34 2017 +0200
-
-    sharkd: export uat records.
-    
-    Move gtk's fld_tostr() to epan API as uat_fld_tostr.
-    
-    Change-Id: I01e3b66ca9ea3cd1e2e06e2122190ee42b9ad44b
-    Reviewed-on: https://code.wireshark.org/review/21664
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bb6e31d
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Mon May 15 14:16:48 2017 +0200
-
-    ua3g: fixed START_TONE message decoding
-    
-    Change-Id: Ib0cdf793d728b9bdc39754878e878e41e09309de
-    Reviewed-on: https://code.wireshark.org/review/21663
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c1389b9
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Sun May 14 22:40:07 2017 +0200
-
-    ua3g: fixed QOS_TICKET_RSP message decoding
-    
-    Change-Id: Ib0b5e0acb214769b981cb7be75cbafb8ed37403b
-    Reviewed-on: https://code.wireshark.org/review/21623
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ic2536e8a652ef96e2a3923c1faa61f6c8c06bf58
+    Reviewed-on: https://code.wireshark.org/review/22417
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b560416
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue May 16 01:07:06 2017 +0200
-
-    kafka: fix -Wmissing-field-initializers by removing unneeded code
-    
-    LZ4F_decompress accepts a NULL parameter to apply default parameters, do
-    not bother setting a parameter (this also avoids
-    -Wmissing-field-initializers warnings from clang).
-    
-    Change-Id: Id2cd8d58cd9339dd5af395092a8104b559b6e194
-    Reviewed-on: https://code.wireshark.org/review/21675
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit e61d2f624348329f8d73af55e6ff3e0e7ee012da)
+    Reviewed-on: https://code.wireshark.org/review/22418
 
-commit 4988cca
+commit fc9a7df
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 15 16:11:22 2017 -0700
+Date:   Mon Jun 26 18:48:01 2017 -0700
 
-    Add a null pointer check.
-    
-    While we're at it, fix a typo in a comment.
+    Don't check for inflatePrime() on Windows.
     
-    Bug: 13711
-    Change-Id: Ie1e4aa9243ccb10621bf181b232e177c2a7f867c
-    Reviewed-on: https://code.wireshark.org/review/21676
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b960f5f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 15 16:01:59 2017 -0700
-
-    Explicitly initialize the current only member of dec_opts.
+    On Windows, we build libz as part of the Wireshark build process, so we
+    don't necessarily *have* a libz library to search or inflatePrime() at
+    this point; the search fails on the buildbots, for example.
     
-    At least some compilers will warn about not initializing the reserved
-    values.
+    So, on Windows, we just assume we have a new enough version of libz, so
+    that it has inflatePrime().
     
-    Change-Id: Id907468be757a1cd3137140d285803f3e9f1724a
-    Reviewed-on: https://code.wireshark.org/review/21674
+    Bug: 13850
+    Change-Id: Ied0909f4a591ff3312d83a2a2ed41e3cd12218e8
+    Reviewed-on: https://code.wireshark.org/review/22413
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 9a1d16b55324056e4d5031370b007097b76dc519)
+    Reviewed-on: https://code.wireshark.org/review/22414
 
-commit 3f161e4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon May 15 21:09:28 2017 +0200
-
-    Openflow (v6): use BASE_SPECIAL_VALS
-    
-    for avoid duplicated hf
-    
-    (like for v5 4b90e93f37cb092472db314ca0df3ce9503e1827)
-    
-    Change-Id: I2f535e2ed06444959d4c1f1c089fec9693a8b96d
-    Reviewed-on: https://code.wireshark.org/review/21670
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 92e1e8e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon May 15 19:49:46 2017 +0200
-
-    Openflow(v4): fix field typo
-    
-    Like for OpenFlow(v5) see a88594b093f29220cb2f8825b5dcc06bcaf91e38
-    
-    Change-Id: Ifcfd398729a1d102a45de3bf86ec98bab285603f
-    Reviewed-on: https://code.wireshark.org/review/21669
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4b90e93
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 21:31:59 2017 +0200
-
-    Openflow(v5): use BASE_SPECIAL_VALS
-    
-    for avoid duplicated hf
-    
-    Change-Id: I93ba76e2594e61f8dec9a78540b46025326b1ee6
-    Reviewed-on: https://code.wireshark.org/review/21660
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3929124
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon May 15 15:36:10 2017 +0200
-
-    Update symbols table
-    
-    Change-Id: I34ced87d58ba947d4481775a3402da3647f68549
-    Reviewed-on: https://code.wireshark.org/review/21665
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3408166
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon May 15 11:01:09 2017 +0200
-
-    smb: don't use tvb_get_* on proto_tree_add_uint
-    
-    Part 2
-    
-    Change-Id: I8f59186bdfc64d4c8dac74245cbffdad1c8d4579
-    Reviewed-on: https://code.wireshark.org/review/21661
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b933b8a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 19:44:49 2017 +0200
-
-    EPL: remove unused hf (hf_epl_sdo_od_field)
-    
-    Change-Id: I85b26a235874fa67c4f44251166353fadccd1eb5
-    Reviewed-on: https://code.wireshark.org/review/21659
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 993a0af
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 19:39:06 2017 +0200
-
-    epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Idb2ba4181a9affd8c9a71e52a1dd24fda56bd52c
-    Reviewed-on: https://code.wireshark.org/review/21658
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 60c8ada
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat May 13 23:52:50 2017 +0200
-
-    sharkd: output JSON for new_stat_ API.
-    
-    Change-Id: I5b4b020029f3c1587f96ca1fcf5fbfa2ee78ac31
-    Reviewed-on: https://code.wireshark.org/review/21628
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit c30bb2c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 19:33:12 2017 +0200
-
-    SMB: Fix dissection of SMB_COM_TRANSACTION2_SECONDARY (0x33)
-    
-    Issue reported by Alex
-    Bug: 13690
-    Change-Id: I6c0c01569be8474e1cbab0c8ca009c00394e1ffe
-    Reviewed-on: https://code.wireshark.org/review/21650
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6b289a8
+commit a3ff8f8
 Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat May 13 19:21:45 2017 +0200
+Date:   Mon Jun 26 00:34:41 2017 +0200
 
-    ssl,dtls: fix message hash for extended_master_secret
+    cmake: fix SET_FEATURE_INFO deprecation warning
     
-    The handshake_messages for extended master secret start at Client Hello
-    and end at ClientKeyExchange. Previously all handshake messages in a
-    record would be hashed, possibly covering those after CKE. Now it will
-    hash each handshake message separately.
+    Fix deprecation warnings that occur with cmake 3.8, replacing it by
+    some other function that is supported since at least cmake 2.8.8.
     
-    For DTLS, the CH and HVR messages must also be ignored. Additionally,
-    DTLS needs special treatment to merge multiple fragments.
+    This also updates URLs and splits the description in a package
+    description and the purpose for the package (shown on the next line).
     
-    Bug: 13704
-    Change-Id: I0c8f19b4c352c0195848ded319b6991d76542720
-    Reviewed-on: https://code.wireshark.org/review/21625
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f
+    Reviewed-on: https://code.wireshark.org/review/22393
     Petri-Dish: Peter Wu <peter@lekensteyn.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit af13668
-Author: Rémy Léone <remy.leone@gmail.com>
-Date:   Thu Apr 27 10:56:40 2017 +0200
-
-    ieee802154: Refactor payload IE dissection
-    
-    - Create explicit display filter
-    - Adding reference to the IEEE 802.15.4 standard
-    - extract dissect_802154_enhanced_beacon_filter
-    - Explicit case of header termination
-    - Fix typo
-    - Add some cast
-    
-    Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b
-    Reviewed-on: https://code.wireshark.org/review/21361
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2c2b40c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 17:25:04 2017 +0200
-
-    OpenFlow(v6): add Openflow bad action error message value
-    
-    Ping-Bug: 13702
-    Change-Id: I3fa5e9f4d0736d62c922ab3994a0a57afda043a3
-    Reviewed-on: https://code.wireshark.org/review/21648
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3b6646a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 17:23:16 2017 +0200
-
-    OpenFlow(v6): rename Meter Config to Meter Desc
-    
-    Ping-Bug: 13702
-    Change-Id: I86ed023bcd4f0f9df79dc5c9bd4cfe566c04c804
-    Reviewed-on: https://code.wireshark.org/review/21647
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 06f4b7b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 17:09:14 2017 +0200
-
-    Openflow(v6): Add OFPGC_INSERT_BUCKET/OFPGC_DELETE_BUCKET
-    
-    and add new field on groupmod with Bucket
-    
-    Ping-Bug: 13702
-    Change-Id: If5893d49d6cd7a8ab6b46f1fcfce4fbff4153d1f
-    Reviewed-on: https://code.wireshark.org/review/21646
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2d90dba
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 16:48:32 2017 +0200
-
-    OpenFlow(v6): Add new OFPXMT type
-    
-    Ping-Bug: 13702
-    Change-Id: If320fe6557a66cafaf95afeead4912f7476a70ad
-    Reviewed-on: https://code.wireshark.org/review/21645
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1dc761d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 16:40:02 2017 +0200
-
-    OpenFlow(v6): Enhance OFPIT
-    
-    OFPIT_METER is now deprecated and there is a new OFPIT_STAT_TRIGGER
-    
-    Ping-Bug: 13702
-    Change-Id: I76b8ab8a86ee59e443fbeac81c45b982bac1b3a2
-    Reviewed-on: https://code.wireshark.org/review/21644
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0bbf415
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 16:37:36 2017 +0200
-
-    Openflow(v6): Add new OFPAT Meter
-    
-    no try on real pcap...
-    
-    Ping-Bug: 13702
-    
-    Change-Id: I828ae5599704c9bc514b8968d1a15c9a446555d6
-    Reviewed-on: https://code.wireshark.org/review/21643
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e6401c7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 16:26:58 2017 +0200
-
-    Openflow(v6): Add new OFPAT Copy Field
-    
-    no try on real pcap...
-    
-    Ping-Bug: 13702
-    
-    Change-Id: Ia6b048cc8b37bb1697e7378bbcd098a19bff99e3
-    Reviewed-on: https://code.wireshark.org/review/21642
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8082e7c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 16:06:12 2017 +0200
-
-    Openflow: Add support of openflow 1.5 (v6)
-    
-    Copy from dissector 1.4 (v5)
-    
-    Bug: 13702
-    Change-Id: I2ae5b620e6ff1626c69f8fac6184244399e297de
-    Reviewed-on: https://code.wireshark.org/review/21641
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d5635bc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 17:27:55 2017 +0000
-
-    reload-framing: fix typo (serie -> series)
-    
-    Change-Id: I604b4e2e99753734d550b40d5fe013c89f2960fc
-    Reviewed-on: https://code.wireshark.org/review/21652
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ad95bde
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 17:23:03 2017 +0000
-
-    MQ: fix typo (Comit -> Commit)
-    
-    Change-Id: I36f772f7b7cf0d8e9d3f287bc4bf9718180485d8
-    Reviewed-on: https://code.wireshark.org/review/21651
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e15de62
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun May 14 13:07:34 2017 -0700
-
-    It's now RFC 6940.
-    
-    Change-Id: I2818d5c0c7e33e53cac2d3f3adb1bfd44f43d756
-    Reviewed-on: https://code.wireshark.org/review/21655
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7fc2be0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun May 14 13:06:03 2017 -0700
-
-    Provide some URLs for the document in question.
-    
-    Change-Id: Ief48dbc07add739ed7274947640cc9e68552242e
-    Reviewed-on: https://code.wireshark.org/review/21654
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 504998d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 17:35:07 2017 +0200
-
-    smb: don't use tvb_get_* on proto_tree_add_uint
-    
-    Change-Id: I38db11b444a1d4b5be7980c262e9f84ae48c7427
-    Reviewed-on: https://code.wireshark.org/review/21649
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 33fbc25
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 17:35:55 2017 +0000
-
-    ansi_map : fix typo (dont't -> don't)
-    
-    Change-Id: Iffeec2c2f24dad263d328186767a758558a56351
-    Reviewed-on: https://code.wireshark.org/review/21653
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit aa3bbe5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun May 14 15:51:23 2017 +0200
-
-    GSM RLC/MAC: fix another global-buffer-overflow error reported by ASAN
-    
-    Same root cause as gf751918
-    
-    Bug: 13708
-    Change-Id: I9d1089c3a632ca82370d14beb06ebcd554901415
-    Reviewed-on: https://code.wireshark.org/review/21639
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a88594b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 15:14:51 2017 +0000
-
-    Openflow(v5): fix field typo
-    
-    Change-Id: I101f760a64e4beec73483eeda93068798b140d69
-    Reviewed-on: https://code.wireshark.org/review/21640
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b94dafb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun May 14 15:12:55 2017 +0200
-
-    nge: fix conflict for hf field
-    
-    'nge.unknown' exists multiple times with NOT compatible types: FT_UINT32 and FT_BYTES
-    
-    Change-Id: I757e6b4107e4d8103950603d4441248b931bbb15
-    Reviewed-on: https://code.wireshark.org/review/21638
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e7b6bf3
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sun May 7 22:00:06 2017 +0200
-
-    Initial OBD-II PIDs dissector.
-    
-    Change-Id: I0974f13a032a908bcc27f583c3e059f57959881f
-    Reviewed-on: https://code.wireshark.org/review/21552
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit d8df841
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun May 14 08:14:03 2017 +0000
-
-    [Automatic update for 2017-05-14]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Ia7833dc62cb4f4687da664b66eba6c5f31437f9a
-    Reviewed-on: https://code.wireshark.org/review/21630
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 21735ea
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat May 13 20:05:52 2017 -0400
-
-    Add unit_name_string_get_double to handle float/double fields
-    
-    Bug: 13705
-    Change-Id: I6bd006f216440d071e5c1eeb6b1f996b4a364c62
-    Reviewed-on: https://code.wireshark.org/review/21629
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bd3e24f
-Author: Björn Ruytenberg <bjorn@bjornweb.nl>
-Date:   Sat May 13 19:31:07 2017 +0200
-
-    IEEE80211-radio: Fix divide by zero
-    
-    Perform sanity check on parsed data rate. Data rate of zero results in a
-    division by zero in calculate_llac_duration. Do not use data rate if zero.
-    
-    Bug: 13706
-    Change-Id: I7883e1052a0965f7927d3a478c0aa992693f7fe1
-    Reviewed-on: https://code.wireshark.org/review/21626
+    (cherry picked from commit 8d214209e80c2cc86ad9624b31cc6365e10ed454)
+    Reviewed-on: https://code.wireshark.org/review/22409
     Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 544ebca
-Author: Pau Espin Pedrol <pespin@sysmocom.de>
-Date:   Tue May 9 17:50:48 2017 +0200
-
-    gsm_osmux: Support multiple OSmux frames per packet
-    
-    Also split and show all AMR payloads
-    
-    Change-Id: I5bde4e87dc51fd4a996a14117813ea89d7005d38
-    Reviewed-on: https://code.wireshark.org/review/21600
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0b060e6
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun May 7 14:05:53 2017 +0200
-
-    gif: simplify the dissection code
-    
-    Increment offset as we go through the file.
-    
-    Add a function to dissect a sequence of data blocks. Call this function
-    for extension blocks and images.
-    
-    Change-Id: If156cb9cd4fe4ba6fdd3780c93087f2dd2ae8bf5
-    Reviewed-on: https://code.wireshark.org/review/21547
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8112b8d
+commit 48f6616
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue May 9 21:21:04 2017 +0100
+Date:   Mon Jun 26 16:05:00 2017 +0200
 
-    Kafka: add LZ4 decompression
+    PDCP LTE: fix dissection of Polling bit for User plane Data PDU with 18 bits SN
     
-    Change-Id: Idf2f63782c8751778ad88f46a7f65fe7d5d49f3b
-    Reviewed-on: https://code.wireshark.org/review/21577
+    Change-Id: Id1167d2c6fa84fd5145d5f0313e39f53591a9add
+    Reviewed-on: https://code.wireshark.org/review/22406
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 71a9ade669c51209132f61a0ded27e60c386af99)
+    Reviewed-on: https://code.wireshark.org/review/22408
 
-commit 2c9b07a
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed May 10 19:44:02 2017 +0100
+commit bc8e63b
+Author: Silvio Gissi <silvio.gissi@gmail.com>
+Date:   Sat Jun 24 17:13:54 2017 -0700
 
-    AIM: allow multiple TCP ports to be configured
+    Fix Packet Lengths statistics count
     
-    Change-Id: I4a74120ad1424f2b5aab0a4ef734ff52e5ac1a14
-    Reviewed-on: https://code.wireshark.org/review/21586
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 008e6ef
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri May 12 21:07:24 2017 +0200
-
-    Thread CoAP: fix 2 potential infinite loops
-    
-    Bug: 13693
-    Change-Id: Ie47ca69a9941dbc273bb8f18e300773092a2fc96
-    Reviewed-on: https://code.wireshark.org/review/21620
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b6c2592
-Author: Nick <jimschaettle@gmail.com>
-Date:   Thu Apr 6 13:52:05 2017 -0400
-
-    packet-acn.c: Various cleanup
-    
-    1. Fix some typos (in hf_ field names and value_string values)
-    2. Fix an off-by-on error in blob calculation
-    3. Bugfix a few field lengths
-    4. Bugfix offset handling when adding ACN address
+    Packet statistics were not showing the packets above 5120 due to
+    the last entry being reformatted and not parsed correctly.
+    Since the last entry is "reformatted" for better user string,
+    also "reformat" the last entry as it goes through "range processing".
     
-    Change-Id: Id9e3d205b848ce3767b27ef1fcf02f7faae0be15
-    Reviewed-on: https://code.wireshark.org/review/20953
+    Bug: 13844
+    Change-Id: Id49b41c08111dcad1590e034159b81ead8636c4e
+    Reviewed-on: https://code.wireshark.org/review/22382
     Reviewed-by: Michael Mann <mmann78@netscape.net>
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit aefd4e1844abbc8b10732be03991047617ebd650)
+    Reviewed-on: https://code.wireshark.org/review/22403
 
-commit d566531
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri May 12 20:39:40 2017 +0200
-
-    BT L2CAP: avoid a division by 0
-    
-    Bug: 13701
-    Change-Id: Ie433ecd932dcfc40fa6d3fdc3fa00139c64584a2
-    Reviewed-on: https://code.wireshark.org/review/21618
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9006955
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Fri May 12 00:03:29 2017 +0300
-
-    UMTS Iub: Resolve U-RNTI for C-RNTI
-    
-    This commit includes logic used to store pairs of C-RNTIs and U-RNTIs based on allocations in RRC and logic to retrive those when encountering C-RNTIs in the MAC header for DCCH over FACH/RACH.
-    
-    Change-Id: I629ab061b7a73416e5730a980480b81a1aaade11
-    Reviewed-on: https://code.wireshark.org/review/21607
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a8228fa
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 12 11:43:09 2017 -0700
-
-    Fix Windows build without pcap.
-    
-    Change-Id: Ib79da01124a7f1b44f168ce19691d3ceaa7d5a68
-    Reviewed-on: https://code.wireshark.org/review/21619
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 572a2e9
+commit fce9fc6
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed May 10 07:25:15 2017 -0400
+Date:   Sun Jun 25 17:16:26 2017 -0400
 
-    DOCSIS: Simplify all MAC Management into a single file.
+    Sample deprecated filter -> Sample warning filter
     
-    Removes a bunch of duplication set up because commands were all in
-    different files.
+    "Warning" is a more appropriate name because filter may not
+    be as deterministic as user desires
     
-    Change-Id: I950bc70da0edcdef7aaf21a43328cf69267f79af
-    Reviewed-on: https://code.wireshark.org/review/21613
+    Bug: 13834
+    Change-Id: Ie34e37db8866dc409f25df227a4d34e7c11d0058
+    Reviewed-on: https://code.wireshark.org/review/22392
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 395775acce1ef9624fdf2030179683f37a27cd59)
+    Reviewed-on: https://code.wireshark.org/review/22394
 
-commit 95ec532
-Author: Camille Guérin <guerincamille56@gmail.com>
-Date:   Mon May 1 23:36:21 2017 +0200
+commit 344e2b7
+Author: Silvio Gissi <silvio.gissi@gmail.com>
+Date:   Sat Jun 24 17:52:21 2017 -0700
 
-    OPC UA: Added details for BrowseDescription NodeClassMask and ResultMask
+    Fix Y.1711 endianness
     
-    Display the details for the NodeClassMask and ResultMask values in a
-    BrowseRequest's BrowseDescription.
-    As described in OPC UA 1.03 Specification, the value 0 for the
-    NodeClassMask and the value 63 (0x003F) for ResultMask should results in
-    returning all the fields in the BrowseResponse.
-    Display 'All' when those fields have those values
-    Display a detailled bit tree mask when values are different
+    ITU Y.1711 at https://www.itu.int/rec/T-REC-Y.1711-200402-I/en states
+    that OAM payloads are big endian (section 5.3) as reported on bug.
     
-    Code Change:
-    Added parseNodeClass and parseResultMask
-    Use them in parseBrowseDescription instead of parseUInt32
-    Removed not needed anymore hf_opcua_NodeClassMask, hf_opcua_ResultMask
-    and their related entries in registerFieldTypes
-    
-    Change-Id: Ic3ed8630825b5456f91156f06b2203ebfa422155
-    Reviewed-on: https://code.wireshark.org/review/21446
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4b9e481
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Apr 4 21:23:34 2017 +0200
-
-    .mailmap: update (of April)
-    
-    Change-Id: I74bf31ad4772966a292dde7a73a97d172c5121aa
-    Reviewed-on: https://code.wireshark.org/review/20909
+    Bug: 8292
+    Change-Id: Id30e340eee5f5a5c96020cdd1770fa48adb5d169
+    Reviewed-on: https://code.wireshark.org/review/22383
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0eaeb99
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon May 8 17:47:46 2017 +0200
-
-    gif: make data block an FT_UINT_BYTES entry
-    
-    The length byte is now highlighted along with the actual data.
-    
-    Change-Id: I93ce25ad2cd7c790cc23668d354e32c4f5e195c6
-    Reviewed-on: https://code.wireshark.org/review/21610
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f022976
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri May 12 08:12:01 2017 +0200
-
-    smb: fix some indent typo (use tabs)
-    
-    Change-Id: I54b301cb224a2ff15d5a7a453ecf6f29b798f366
-    Reviewed-on: https://code.wireshark.org/review/21615
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f9f539c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 12 01:46:33 2017 -0700
-
-    Include caputils/capture-wpcap.h whether HAVE_LIBPCAP is defined or not.
-    
-    It declares what's defined here, so always include it.
-    
-    Change-Id: I1d7d5ed071e6f2d53af9ff147ede18b05b98ecd1
-    Reviewed-on: https://code.wireshark.org/review/21616
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 65227b3
-Author: Simon Barber <simon.barber@meraki.net>
-Date:   Sat Apr 29 21:41:30 2017 -0400
-
-    Adds aggregate detection, calculation of frame start and end time, and IFS
-    
-    Change-Id: I3a9cddd9c6e47a5c5c48e2e02a32a71413bcf799
-    Reviewed-on: https://code.wireshark.org/review/13590
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f3098fb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 11 20:18:00 2017 -0700
-
-    Don't include headers that depend on pcap if you don't have it.
-    
-    Change-Id: I17234ef60411f922678b900a6ac4fb264b9ce431
-    Reviewed-on: https://code.wireshark.org/review/21614
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4e28cf0
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu May 11 22:29:22 2017 +0200
-
-    Fix header field info checks for FT_UINT_BYTES.
-    
-    It should be allowed to have an FT_UINT_BYTES hf entry with
-    BASE_NONE|BASE_ALLOW_ZERO. At the moment, this triggers an assert:
-    
-    Err  Field 'Data block' (image-gif.data_block) is an FT_UINT_BYTES
-    but is being displayed as (Bit count: 2048) instead of BASE_NONE
-    
-    For FT_UINT_BYTES entries, we should make the same checks as for
-    FT_BYTES. Don't fall through to the default case.
-    
-    Change-Id: I986a9b779d130919d17595f08b3b63306b3956f2
-    Reviewed-on: https://code.wireshark.org/review/21606
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6effc33
-Author: Pau Espin Pedrol <pespin@sysmocom.de>
-Date:   Tue May 9 14:19:10 2017 +0200
-
-    gsm_osmux: Add RTP Marker field
-    
-    GSM Osmux recently got support to bring RTP Marker (M) bit. It should be
-    mostly backwards compatible as the first bit was reserved and not used
-    before for the FieldType.
-    
-    Support was added in libosmo-netif commit e98afe5808176efb60298a2f764e8e11efaf580b
-    This bit is documented in the protocol documentation recently available: http://ftp.osmocom.org/docs/latest/osmux-reference.pdf
-    
-    Change-Id: Ia0508971519b3df9499d963404bb8a0e3c4b9c33
-    Reviewed-on: https://code.wireshark.org/review/21599
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 46ef2da
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu May 11 21:15:28 2017 +0200
-
-    Windows: update LZ4 to 1.7.5 and USBPcap to 1.2.0.1
-    
-    Change-Id: I02eb4c255a0794b650f566abdadcac16e97196af
-    Reviewed-on: https://code.wireshark.org/review/21609
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d2e7e0b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu May 11 22:54:47 2017 -0400
-
-    Allow proto_register_protocol_in_name_only values to be used as valid hf_ field prefixes.
-    
-    Change-Id: Ic9998d1f8c6719c7cba78966691295ff9ffbc12a
-    Reviewed-on: https://code.wireshark.org/review/21612
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 635ae3d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 11 19:23:59 2017 -0700
-
-    Don't include pcap headers if you don't have pcap.
-    
-    Don't try to compile code that uses pcap if you don't have it.
-    
-    Change-Id: Ifa98b4ff47783f5347cb6e1129bbf4e5cac35aab
-    Reviewed-on: https://code.wireshark.org/review/21611
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7321183
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 11 12:57:28 2017 -0700
-
-    Put the HAVE_REMOTE hack into wsutil/wspcap.h, and include that file.
-    
-    Have a header file that defines HAVE_REMOTE if HAVE_PCAP_REMOTE is
-    defined, and then includes pcap.h.  Replace all other includes of
-    pcap.h, and the definition of HAVE_REMOTE, with includes of that file.
-    Check for anything other than wspcap.h including pcap.h in checkAPIs.pl.
-    
-    Change-Id: I3cbee8208944ad6f006f568b3fe3134e10b2a883
-    Reviewed-on: https://code.wireshark.org/review/21605
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6f1e6d2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 11 18:19:02 2017 +0000
-
-    Revert "Revert "Get rid of HAVE_REMOTE.""
-    
-    This reverts commit 8cd1fd0c993df904596390ebdf350259e7c9c5fc.
-    
-    Making HAVE_REMOTE a config.h #define is a really horrible idea.  It's *NOT* a configuration option.
-    
-    Instead, HAVE_REMOTE should be defined by other mechanisms, as was done in 79eab8ca070f978415126f85b0777ab4ab02f0a2.
-    
-    Change-Id: I4632b63bd73a25a27c5f4686d2baf3e0beddecb3
-    Reviewed-on: https://code.wireshark.org/review/21604
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8cd1fd0
-Author: Jörg Mayer <jmayer@loplof.de>
-Date:   Thu May 11 18:02:06 2017 +0000
-
-    Revert "Get rid of HAVE_REMOTE."
-    
-    This reverts commit d13b8ea13cf708a7770e7f51912ce16d0b43e459.
-    
-    This will only work with git HEAD of libpcap, but not with any release versions of libpcap or winpcap (the *pcap includes require the define, not Wireshark).
-    
-    Change-Id: I08e5ec66e3642dc02f793c83ffc4363bb348202c
-    Reviewed-on: https://code.wireshark.org/review/21603
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 129bdb5
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri May 5 11:46:07 2017 +0200
-
-    dns: improve loop detection in label decompression
-    
-    Previously the number of allowed pointers within a message is equal to
-    the data in a tvb (16575 in one example). This is still expensive, so
-    implement an alternative detection mechanism that looks for a direct
-    self-loop and limits the total pointers to about 256.
-    
-    Bug: 13633
-    Change-Id: I803873e24ab170c7ef0b881d3bdc9dfd4014de97
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1206
-    Reviewed-on: https://code.wireshark.org/review/21507
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 79eab8c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 11 03:56:44 2017 -0700
-
-    Force HAVE_REMOTE to be defined when including pcap.h with remote support.
-    
-    WinPcap made the mistake of having stuff in its public header fines
-    depend on a configuration #define, HAVE_REMOTE; this means that we need
-    to forcibly define it when building with remote capture support.
-    
-    The tip of the libpcap master branch does not have that botch; hopefully
-    future versions of libpcap-for-Windows will be based on that libpcap and
-    thus lack that botch as well.
-    
-    Defining HAVE_REMOTE in config.h is not the right fix, as it makes it
-    look like a *Wireshark* configuration option that code in Wireshark
-    should test, rather than a *WinPcap* configuration option that the
-    pcap.h that ships with the WinPcap SDK should have been changed, as part
-    of the build process, to correctly define or not, so that users of
-    WinPcap don't have to define it themselves.
-    
-    Change-Id: I62d1eca6d3c900d0dcc9fbc011db77f595a86313
-    Reviewed-on: https://code.wireshark.org/review/21593
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 871a8a2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 11 03:50:02 2017 -0700
-
-    Another shadowing fix for abort().
-    
-    Change-Id: I991bd24ab8b64bdfeae275941d79b716da3309f9
-    Reviewed-on: https://code.wireshark.org/review/21592
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 804d0cd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 11 03:07:28 2017 -0700
-
-    Squelch warning from some compilers.
-    
-    Change-Id: Iacd5832e3b63fa24907423d2b7df40e81fafb0de
-    Reviewed-on: https://code.wireshark.org/review/21591
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1ecf3b6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 11 02:47:58 2017 -0700
-
-    Note whether we found remote pcap support in libpcap.
-    
-    Change-Id: Ida20f7164d3132a72fdd6547905cd0af4e451917
-    Reviewed-on: https://code.wireshark.org/review/21590
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1be20bc
-Author: Christoph Schlosser <christoph@schlosser.xyz>
-Date:   Wed Apr 12 11:15:39 2017 +0200
-
-    EPL: Dissect read/write multiple parameter SDOs
-    
-     The dissector only dissected Write Multiple Parameter by Index requests
-     correctly.
-     Now it is possible to dissect the response to the request and
-     Read Multiple Parameter by Index request and responses.
-    
-    Bug: 13677
-    
-    Change-Id: I13aae241690cd3ac9dfbe8129ef56d0fc9016301
-    Reviewed-on: https://code.wireshark.org/review/21034
-    Reviewed-by: Christoph Schlosser <christoph@schlosser.xyz>
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f751918
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed May 10 18:10:42 2017 +0200
-
-    GSM RLC/MAC: fix global-buffer-overflow error reported by ASAN
-    
-    After a M_NEXT_EXIST(), you should always have another variable (like
-    M_UINT, M_TYPE, ...) and not immediately end the structure with
-    CSN_DESCR_END.
-    Note that this is a workaround as the current description does not allow
-    a proper parsing anyway (as the structure is reentrant). But at least it
-    solves the buffer overflow.
-    
-    Bug: 13692
-    Change-Id: I8e607aadcced2d8cc636dc10f9690c5c679ad581
-    Reviewed-on: https://code.wireshark.org/review/21585
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d13b8ea
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 10 14:15:55 2017 -0700
-
-    Get rid of HAVE_REMOTE.
-    
-    We never test for it - we test for HAVE_PCAP_REMOTE - so there's no need
-    to set it in config.h.
-    
-    While we're at it, note that "PCAP" in "HAVE_PCAP_REMOTE" can refer to
-    libpcap as well as WinPcap, given that, at least in the tip of the
-    master branch, you can configure remote support in libpcap, although
-    it's not enabled by default (it needs to be vetted for security, as it
-    increases the attack surface of a machine running the server *and* of an
-    application using libpcap with remote support).
-    
-    Change-Id: I3c96cf16bbda19ec7c085f74cffc6f125198d45b
-    Reviewed-on: https://code.wireshark.org/review/21589
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 537eddb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 10 13:46:58 2017 -0700
-
-    Define YYMALLOCARGTYPE appropriately.
-    
-    Define it, so the generated parser knows what argument type the function
-    passed to MateParserAlloc() takes.  Use it when declaring
-    MateParserAlloc().
-    
-    Change-Id: Ice18fd6b5fdbdb31f527e5d6eb06e78594d4565b
-    Reviewed-on: https://code.wireshark.org/review/21588
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 559952b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 10 13:39:17 2017 -0700
-
-    Clean up MateParser routine declarations.
-    
-    Remove the declarations from mate_parser.l, and have mate_parser.h
-    include mate.h at the beginning of the file, instead.
-    
-    Move the #if'ed version of the declaration of MateParserAlloc() to
-    mate.h.
-    
-    Change-Id: I03ffdd5f093b179ffc0cb0e43eac093f7e4af65c
-    Reviewed-on: https://code.wireshark.org/review/21587
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1205737
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 9 18:42:05 2017 -0700
-
-    This is specified in section 8 of the DIX v2.0 Ethernet spec.
-    
-    Note that, and give a URL for the spec.
-    
-    Change-Id: I60953ddf2e7934ac273ba808ae4aa662f562917e
-    Reviewed-on: https://code.wireshark.org/review/21583
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fc1f62a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 9 19:28:18 2017 +0000
-
-    RADIUS: sync with FreeRADIUS
-    
-    commit d4e9cc75313f05678d0f2ac41962f46c99751e1f
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Sun May 7 12:56:57 2017 -0400
-    
-        added one more attribute
-    
-    Change-Id: I5821076c2d4f02d82c393a768edd0c77da582a2d
-    Reviewed-on: https://code.wireshark.org/review/21576
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a78ff10
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 9 18:56:33 2017 +0200
-
-    nge: add modelines info
-    
-    Change-Id: Ib75f637c36be575a85e75fee6282d1a16455bfd6
-    Reviewed-on: https://code.wireshark.org/review/21572
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Charlie Lenahan <clenahan@sonicbison.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5d45e77
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 9 18:56:01 2017 +0200
-
-    nge: fix no previous prototype for ‘proto_register_nge/handoff_nge’ [-Wmissing-prototypes]
-    
-    Change-Id: I2e7cecad96390f709c6a135b6059c01712971dfe
-    Reviewed-on: https://code.wireshark.org/review/21571
-    Reviewed-by: Charlie Lenahan <clenahan@sonicbison.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5e944ee
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 9 20:05:10 2017 +0200
-
-    mate (grammar): fix no previous prototype for function 'MateParser/Alloc/Free' [-Wmissing-prototypes]
-    
-    Change-Id: I87ff11b7c04cb3b6963d4c8c16df2c3d60a0aec8
-    Reviewed-on: https://code.wireshark.org/review/21574
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8bab958
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 9 15:07:26 2017 -0700
-
-    You can't have a field be both integer and string.
-    
-    For an inter-frame gap that couldn't be determined, just add it with
-    proto_tree_add_uint_format_value() and "Cannot be determined" as the way
-    the value is displayed.
-    
-    (But why add it *at all* if it couldn't be determined?)
-    
-    Change-Id: I491f9a6fe430141a15568e9a7dec3253a1c78cf5
-    Reviewed-on: https://code.wireshark.org/review/21582
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9d6083e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 9 14:46:24 2017 -0700
-
-    Give fields better names than ".bitN".
-    
-    ".bitN" names 1) don't indicate what the bit actually *means* and 2) run
-    the risk of collisions if the bit in question has a different meaning in
-    different bitsets.
-    
-    Combine the "receive case" and "transmit case" bitsets in some cases
-    where the only difference between the two sets is that some bits are
-    present only in one set, but if a bit is present in both sets, it has
-    the same meaning.
-    
-    Change-Id: Ie1cb9d076e431b30b64ef05acab39efe38193d33
-    Reviewed-on: https://code.wireshark.org/review/21581
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3d9cadd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 9 14:39:47 2017 -0700
-
-    De-capitalize "error" - it's not capitalized in other field names.
-    
-    Change-Id: I6f5aaaba47ab8d36124aa10c63ceec7cf1f70867
-    Reviewed-on: https://code.wireshark.org/review/21580
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b8040a4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 9 14:28:57 2017 -0700
-
-    Fix various field names and types.
-    
-    Make some names used for multiple fields more stylistically consistent.
-    
-    If a bitfield has more than one bit, it's not Boolean - the extra bits
-    mean it has more values than "true" or "false".
-    
-    If a bitfield has only one bit, and indicates that something is
-    true/false, or enabled/disabled, or present/absent, or on/off, or
-    something else obviously Boolean, it's Boolean.
-    
-    Change-Id: I89d5e214eb5c4e7f72eb59a78757f0f49fec3dbf
-    Reviewed-on: https://code.wireshark.org/review/21579
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c25b4f2
-Author: Björn Ruytenberg <bjorn@bjornweb.nl>
-Date:   Tue May 9 20:04:27 2017 +0200
-
-    debian-setup: Always install Libgcrypt
-    
-    Libgcrypt is mandatory to build. Do not mark as optional.
-    
-    Change-Id: Iafbe1cd93f4185e2a9492bb0a21c30a26d8883ce
-    Reviewed-on: https://code.wireshark.org/review/21575
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 0920905
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 9 10:51:01 2017 -0700
-
-    Set nss and rate_mcs_index in more arms of the Series II PLCP switch.
-    
-    For HT mixed, set it the same way it's set for HT greenfield.
-    
-    For pre-HT, set it to 0.
-    
-    Also, for the "unknown" case, set rate_mcs_index to 0.
-    This should obviate the need to initialize either of those variables,
-    don't initialize them, so that failing to set them in an arm of the
-    switch statement shows up as an error if the compiler's dataflow
-    analysis actually bothers to check this.
-    
-    Change-Id: I92703770dd5000a579b53609fb93a2085fd9fca3
-    Reviewed-on: https://code.wireshark.org/review/21573
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2d44f7f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 9 14:08:40 2017 +0200
-
-    ua3g: fix conflicting entry in its value_string
-    
-    Field 'Audio Env.' (ua3g.ip.set_param_req.parameter.audio_env) has a conflicting entry in its value_string: 2 is at indices 2 (Open Space) and 3 (Meeting Room))
-    
-    Field 'Audio Env.' (ua3g.ip.set_param_req.parameter.audio_env) has a conflicting entry in its value_string: 2 is at indices 2 (Open Space) and 4 (Noisy))
-    
-    Field 'Audio Env.' (ua3g.ip.set_param_req.parameter.audio_env) has a conflicting entry in its value_string: 2 is at indices 3 (Meeting Room) and 4 (Noisy))
-    
-    Change-Id: I495f183dd52e59ec64e6eea0df15a5b243d8b87c
-    Reviewed-on: https://code.wireshark.org/review/21568
-    Reviewed-by: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    (cherry picked from commit 80d3483f3463b8e5ed73f019dbf431656410f658)
+    Reviewed-on: https://code.wireshark.org/review/22388
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0972db2
-Author: Adrian Simionov <daniel.simionov@gmail.com>
-Date:   Tue May 9 23:16:16 2017 +1000
-
-    docsis: DCC-REQ TLV 2.7 support
-    
-    Change-Id: I40724306d5facd0f4a5a9ca2354330577857d27f
-    Reviewed-on: https://code.wireshark.org/review/21563
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5cd7ea6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue May 9 10:11:27 2017 -0400
-
-    Don't have epan_dissect_init() return anything.
-    
-    It manipulates the epan_dissect_t structure passed into it and then
-    returns that.
-    Callers can (and have been) just using the passed in epan_dissect_t
-    structure anyway.
-    
-    Change-Id: Ia19d360a7347ff473654eeb553756f59a38f95bd
-    Reviewed-on: https://code.wireshark.org/review/21570
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8c57605
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Tue May 9 13:19:55 2017 +0100
-
-    More fields, more pre-allocated memory for fields.
-    
-    Change-Id: I36469fad59d28a1fbf15d3fd99544a3a6b0ef015
-    Reviewed-on: https://code.wireshark.org/review/21569
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 33f3866
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 9 11:36:29 2017 +0200
-
-    tshark: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I4425be3bbee0e781dff59a07d7de65f5eba81bdd
-    Reviewed-on: https://code.wireshark.org/review/21564
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ea3b356
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 9 14:42:18 2017 +0200
-
-    nm: Uninitialized argument value Warning found by Clang Analyzer
-    
-    false positive
-    
-    Change-Id: I8aa2537328a04a64b06142a04ee76705d0df5443
-    Reviewed-on: https://code.wireshark.org/review/21566
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 666366e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 9 11:41:32 2017 +0200
-
-    vwr (wiretap): fix Assigned value is garbage or undefined Warning found by Clang Analyzer
-    
-    Change-Id: I45766c7e89a009176ae56fe9e9f5a8dd63b2995b
-    Reviewed-on: https://code.wireshark.org/review/21567
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a7b0674
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 9 11:37:02 2017 +0200
-
-    nm: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I7592737477e105870ef43118f40c0ab552c81626
-    Reviewed-on: https://code.wireshark.org/review/21565
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fb44c8c
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue May 9 10:46:57 2017 +0200
-
-    [GSM RLCMAC] Add comments.
-    
-    Change-Id: I2d98d8f318fdbe160974a69f50c456683669e57e
-    Reviewed-on: https://code.wireshark.org/review/21562
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fa5f913
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon May 8 20:32:56 2017 -0400
-
-    Bring DOCSIS Mac Management "dissectors" into modernity.
-    
-    1. Use proto_tree_add_item_ret_uint to remove separate "gets"
-    2. Remove if (tree)s that prevented expert_info
-    3. Apply consistent whitespace
-    4. Apply consistent TLV behavior, making T and L always filterable
-    5. Remove T name (of TLV) from field name itself (where applicable)
-    6. Use BASE_UNIT_STRING and BASE_NO_DISPLAY_VALUE
-    
-    Tested with capture generated from https://github.com/AdrianSimionov/docsis-generator
-    
-    Change-Id: I9987397ccb3248b2a26d850af468740f94b28a63
-    Reviewed-on: https://code.wireshark.org/review/21561
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 954548f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 12:21:49 2017 +0200
-
-    qsig: fix conflicting entry in its value_string
-    
-    Field 'Error' (qsig.error) has a conflicting entry in its value_string: 43 is at indices 12 (proceduralError) and 42 (notActivated))
-    
-    Change-Id: I17fcebc677495033dedad57dd0c3d87631152290
-    Reviewed-on: https://code.wireshark.org/review/21456
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c88e60f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 3 17:21:02 2017 +0200
-
-    ceph: fix conflicting entry in its value_string
-    
-    Field 'Type' (ceph.type) has a conflicting entry in its value_string: 64 is at indices 39 (C_CEPH_MSG_PRIO_LOW) and 40 (C_MSG_MON_SCRUB))
-    
-    Change-Id: I69e6bd56d928c20b6262999e057c92f0d325e96d
-    Reviewed-on: https://code.wireshark.org/review/21509
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 07fc801
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon May 8 17:21:58 2017 +0200
-
-    [GSM RLCMAC] Update : PACKET RESOURCE REQUEST to Release 14.0.0
-    
-    Change-Id: I41e6ebf862f0bd9523778053d40f18ae7385a5bd
-    Reviewed-on: https://code.wireshark.org/review/21560
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ab50419
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun May 7 21:50:00 2017 +0200
-
-    Qt: try harder to find a working monospace font
-    
-    QFont::toString returned the default font (which might be unavailable),
-    leading to use of non-monospace fonts in the bytes view. Detect the
-    effective font instead and apply it to avoid this issue.
-    
-    Add additional logic to invoke font detection when the configured font
-    is bad (for example, because of the bug or because a font has been
-    removed in meantime).
-    
-    Bug: 13638
-    Change-Id: I8a625cf365c90119caebe8c4deada0df7426e53a
-    Reviewed-on: https://code.wireshark.org/review/21551
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-    Petri-Dish: Jörg Mayer <jmayer@loplof.de>
-    Tested-by: Jörg Mayer <jmayer@loplof.de>
-    Reviewed-by: Ahmad Fatoum <ahmad@a3f.at>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ee37135
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun May 7 19:39:19 2017 -0700
-
-    Note that the HT MCS index macros can't return all possible MCS values.
-    
-    I don't know whether this is a bug in the software or a lack of support
-    in the hardware.
-    
-    This at least notes the issue in CID 1405905.
-    
-    Change-Id: I481454bc38842a0f877cb8b52b73e1156fd362b5
-    Reviewed-on: https://code.wireshark.org/review/21558
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 548e976
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun May 7 14:18:46 2017 -0700
-
-    Fix handling of 20 MHz VHT with MCS = 9.
-    
-    That's valid only for 3 or 6 spatial streams; return 0 as the bitrate
-    for all other values.  Also, handle the 6 spatial streams case.
-    
-    Give the conversion tables explicit sizes, to make it clear what
-    subscripts are valid.
-    
-    Return 0 for an MCS > 9, for consistency with the other error return,
-    and to mark it as clearly wrong.
-    
-    Fixes CID 1405908.
-    
-    Change-Id: Icbf655c63c0e88fd6cec7c66bae85fd887a3bd9c
-    Reviewed-on: https://code.wireshark.org/review/21557
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f4585f9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun May 7 14:13:48 2017 -0700
-
-    Regenerate header.
-    
-    Change-Id: Ie77c182b0ee61f84f505b0f40a171d5afef59811
-    Reviewed-on: https://code.wireshark.org/review/21556
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2229665
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun May 7 22:59:08 2017 +0200
-
-    gif: fix the version detection
-    
-    tvb_strneql() returns 0 if the two strings are equal.
-    Thanks to Ahmad Fatoum for reporting this bug.
-    
-    Change-Id: Id6cde56623e18fe0a28f37b108dc1848cc58e1c3
-    Reviewed-on: https://code.wireshark.org/review/21554
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 163d660
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Thu May 4 18:09:42 2017 +0300
-
-    UMTS Iub: Refactored U-RNTI resolving logic for dedicated channels
-    
-    Instead of mapping Scrambling codes to U-RNTIs, now mapping CRNC communication context IDs to U-RNTIs.
-    
-    Change-Id: Id81b7764d2941b742f21094dac391f8658061a80
-    Reviewed-on: https://code.wireshark.org/review/21495
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0419add
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sun May 7 22:20:10 2017 +0200
-
-    ixveriwave: Fix maybe-uninitialized warning
-    
-    Fix maybe-uninitialized warning:
-    packet-ixveriwave.c:2508:16: error: 'rate_mcs_index' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-                 if (rate_mcs_index < 4)
-    
-    Change-Id: I878f8d68104cf4f01990eebea85cfbb2a170a5bd
-    Reviewed-on: https://code.wireshark.org/review/21553
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 6a040b5
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat May 6 19:37:07 2017 +0200
-
-    gif: start cleaning up the dissection code
-    
-    Remove the global if(tree). We should not throw exceptions under if
-    (tree). Buf we may get exceptions while parsing the gif file.
-    
-    Process the version string once as we go through the file. (Ok, we
-    already had to look at it to figure out that we have a gif file.)
-    
-    Use tvb_reported_length_remaining() in the main loop.
-    
-    Change-Id: Ie00594eebffc715676ffd5df8cbf7d43034aa68d
-    Reviewed-on: https://code.wireshark.org/review/21545
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit c1b7aa4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun May 7 12:51:37 2017 -0700
-
-    Clean up various things.
-    
-    Sort the hf_ definitions, and the entries for them, as much as possible
-    by the order in which they're put into the protocol tree.
-    
-    Indicate which if statement branches are for pre-OCTO hardware and which
-    are for OCTO hardware.
-    
-    Pre-HT PHYs don't have an MCS index; the "MCS index" is, rather, an
-    index into a table of bit rates, so call it a "rate index".
-    
-    Fill in some more 802.11 radio pseudoheader fields.
-    
-    Use proto_item_append_text to indicate the direction in the entry for
-    the L1 information.
-    
-    Don't show irrelevant fields, such as the preamble length for HT and
-    VHT.
-    
-    Change-Id: Ibd2baff09fd4ec6e4a84dc0ae2e4615631a2d15e
-    Reviewed-on: https://code.wireshark.org/review/21550
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d0e317d
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat May 6 19:34:24 2017 +0200
-
-    gif: refactor the detection of a gif file
-    
-    Generally, we should not throw an exception before we know that this is
-    our file/packet. Use tvb_strneql() to get the version string. This
-    function does not throw an exception if there are fewer bytes left than
-    we requested.
-    
-    (I know that we check for reported len < 20. However, for captured
-    length > 6 and reported length < 20, the current code does not work.)
-    
-    Change-Id: I5214c5c9dc9da616a94ae96269ec1c9e6f412e8e
-    Reviewed-on: https://code.wireshark.org/review/21544
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 8657646
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun May 7 13:53:22 2017 +0200
-
-    gif: remove pointless coments, unused debug macro
-    
-    Change-Id: Id4ac23a7e5164e40ddc0ee22ddb62f7121b74ad9
-    Reviewed-on: https://code.wireshark.org/review/21543
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 47b1a98
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat May 6 20:25:50 2017 +0200
-
-    gif: (trivial) fix a typo
-    
-    The trailer byte is 0x3b, not 0xb3.
-    
-    Change-Id: I9b2d21f369957fc0c4eb5ff376c4aa7fbdc28c9e
-    Reviewed-on: https://code.wireshark.org/review/21542
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 2aa3adf
+commit a07d904
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun May 7 08:18:57 2017 -0700
+Date:   Sun Jun 25 08:14:30 2017 +0000
 
-    [Automatic update for 2017-05-07]
+    [Automatic update for 2017-06-25]
     
     Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: Iae34b6ae74e4b6f891756732107aa1fdfa9ffa51
-    Reviewed-on: https://code.wireshark.org/review/21541
+    Change-Id: Ie5891519ffda85c84dcda3b745e3abf64a3dfd21
+    Reviewed-on: https://code.wireshark.org/review/22385
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 6a0b5b3
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun May 7 16:16:16 2017 +0100
+commit 8b7c70f
+Author: Sake Blok <sake@euronet.nl>
+Date:   Fri Jun 23 12:38:05 2017 -0400
 
-    Fix kafka build error by casting
+    tcp: add tcp.payload field
     
-    Change-Id: I34a5f60c49d09a8cec4a2c9ab49ea48ef67527cd
-    Reviewed-on: https://code.wireshark.org/review/21540
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit d89b83a
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sat May 6 12:35:13 2017 +0100
-
-    Kafka: show decompressed messages more clearly
+    Make the tcp segment data available on all tcp packets, regardless of
+    reassembly of higher layer protocols.
     
-    Change-Id: I8edf251d9ab26f93bf54d8032706ac7b9e4f6dd1
-    Reviewed-on: https://code.wireshark.org/review/21538
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Change-Id: I1a5024e427e07b85bfc3a4aad5d0a401beb1049d
+    Reviewed-on: https://code.wireshark.org/review/22374
+    Reviewed-by: Sake Blok <sake@euronet.nl>
+    Petri-Dish: Sake Blok <sake@euronet.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 6e925a9
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat May 6 17:57:01 2017 +0200
-
-    netgear: tree is used, remove the _U_
-    
-    Change-Id: I17d058cf7949e7513241dec0248896bd9883dd11
-    Reviewed-on: https://code.wireshark.org/review/21539
     Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    (cherry picked from commit 69bac0d15c94891398e65fda05fb5d7320eb2989)
+    Reviewed-on: https://code.wireshark.org/review/22375
 
-commit 753d6f6
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat May 6 11:35:23 2017 +0200
-
-    can: remove duplicated can_identifier struct.
-    
-    Change-Id: Ib6f0bcd1bec9a1fc5cbcd797a1f418270ae74a0e
-    Reviewed-on: https://code.wireshark.org/review/21537
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6364e44
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Thu May 4 23:50:31 2017 +0200
-
-    ua3g: updated GET_PARAM_RESPONSE message decoding (freeseating and ethernet config)
-    
-    Change-Id: Ie67c2e61c031de5b48310d1fc8940808481b725b
-    Reviewed-on: https://code.wireshark.org/review/21504
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b310383
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 3 18:44:17 2017 +0200
-
-    ixveriwave: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Ia4ff13fb9ab57ad6749ffdcb4a2b2243c98747b6
-    Reviewed-on: https://code.wireshark.org/review/21515
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f175c22
-Author: Robert Jonbgloed <robertj@voxlucida.com.au>
-Date:   Thu May 4 16:29:48 2017 +0100
-
-    Fixed the column info when displaying VP8 sub protocol to RTP.
-    
-    The RTP header information was no longer displayed, and this is very useful
-    information. It certainly looked like the VP8 information was supposed to
-    be extra to the existing info (the dash in the text), and should have been
-    tacked on the end.
-    
-    Change-Id: I1cbefac109a7de7fbc78ac2c274071e20261dd4f
-    Reviewed-on: https://code.wireshark.org/review/21496
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1247aae
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 5 19:33:01 2017 -0700
-
-    Set some variables in the "RF only" code path.
-    
-    That should remove the need to initialize them, make it clearer what
-    values are being used in the "RF only" case, and catch any cases where
-    they don't get set in the "not just RF" case in the future.
-    
-    Change-Id: I10c3ecef608ed2f481111fb7bc32bb8494b68d27
-    Reviewed-on: https://code.wireshark.org/review/21536
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2474848
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri May 5 16:49:36 2017 -0400
-
-    packet-pcep.c: Fix infinite loop
-    
-    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1363
-    Bug: 13687
-    Change-Id: I11d9736db945857fdcf2c23826a3acf5f6fd08a7
-    Reviewed-on: https://code.wireshark.org/review/21528
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e2bd531
-Author: Andrew Feren <acferen@yahoo.com>
-Date:   Fri May 5 11:33:31 2017 -0400
-
-    Add decodes for Gigamon IPFIX information elements
-    
-    -- Elements to be decoded described in IE-doctor format (RFC 7013 section 10)
-    httprequrl(26866/1)<string>
-    httprspstatus(26866/2)<unsigned16>{identifier}
-    sslcertificateissuercommonname(26866/101)<string>
-    sslcertificatesubjectcommonname(26866/102)<string>
-    sslcertificateissuer(26866/103)<string>
-    sslcertificatesubject(26866/104)<string>
-    sslcertificatevalidnotbefore(26866/105)<string>
-    sslcertificatevalidnotafter(26866/106)<string>
-    sslcetificateserialnumber(26866/107)<octetArray>
-    sslcertificatesignaturealgorithm(26866/108)<octetArray>
-    sslcertificatesubjectpubalgorithm(26866/109)<octetArray>
-    sslcertificatesubjectpubkeysize(26866/110)<unsigned16>
-    sslcertificatesubjectaltname(26866/111)<string>
-    sslservernameindication(26866/112)<string>
-    sslserverversion(26866/113)<unsigned16>
-    sslservercipher(26866/114)<unsigned16>
-    sslservercompressionmethod(26866/115)<unsigned8>
-    sslserversessionid(26866/116)<octetArray>
-    dnsidentifier(26866/201)<unsigned16>{identifier}
-    dnsopcode(26866/202)<unsigned8>{identifier}
-    dnsresponsecode(26866/203)<unsigned8>{identifier}
-    dnsqueryname(26866/204)<string>
-    dnsresponsename(26866/205)<string>
-    dnsresponsettl(26866/206)<unsigned32>
-    dnsresponseipv4address(26866/207)<ipv4Address>
-    dnsresponseipv6address(26866/208)<ipv6Address>
-    dnsbits(26866/209)<string>
-    dnsqdcount(26866/210)<unsigned16>
-    dnsancount(26866/211)<unsigned16>
-    dnsnscount(26866/212)<unsigned16>
-    dnsarcount(26866/213)<unsigned16>
-    dnsquerytype(26866/214)<unsigned16>
-    dnsqueryclass(26866/215)<unsigned16>
-    dnsresponsetype(26866/216)<unsigned16>
-    dnsresponseclass(26866/217)<unsigned16>
-    dnsresponserdlength(26866/218)<unsigned16>
-    dnsresponserdata(26866/219)<string>
-    dnsauthorityname(26866/220)<string>
-    dnsauthoritytype(26866/221)<unsigned16>
-    dnsauthorityclass(26866/222)<unsigned16>
-    dnsauthorityttl(26866/223)<unsigned32>
-    dnsauthorityrdlength(26866/224)<unsigned16>
-    dnsauthorityrdata(26866/225)<string>
-    dnsadditionalname(26866/226)<string>
-    dnsadditionaltype(26866/227)<unsigned16>
-    dnsadditionalclass(26866/228)<unsigned16>
-    dnsadditionalttl(26866/229)<unsigned32>
-    dnsadditionalrdlength(26866/230)<unsigned16>
-    dnsadditionalrdata(26866/231)<string>
-    
-    Bug: 13688
-    Change-Id: I4a2472d9bb86d195851edd3a1f5e688ba31dde89
-    Reviewed-on: https://code.wireshark.org/review/21519
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d815913
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 5 19:25:26 2017 -0700
-
-    Comments to indicate which bits of the header we're looking at.
-    
-    Change-Id: I7b1c924af9d23894ff79767bbb1290b60d36e298
-    Reviewed-on: https://code.wireshark.org/review/21533
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 538abdf
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri May 5 17:23:59 2017 -0400
-
-    packet-dcm.c: Fix infinite loop
-    
-    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1329
-    Bug: 13685
-    Change-Id: Ic70cf8185beeb4cfa9417c287cf963e1c56bf86c
-    Reviewed-on: https://code.wireshark.org/review/21529
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0e53c85
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri May 5 16:37:35 2017 -0400
-
-    packet-ipv6.c: dissect_routing6_rpl must have IPv6 addresses.
-    
-    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1303
-    Bug: 13675
-    Change-Id: Icadf8a57a25bbf9abaa9685f9e9c7a803204b7e5
-    Reviewed-on: https://code.wireshark.org/review/21527
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5d67b33
-Author: Charlie Lenahan <clenahan@sonicbison.com>
-Date:   Fri May 5 16:56:41 2017 -0400
-
-    Add Netgear Ensemble protocol
-    
-    Bug: 13689
-    Change-Id: I9573d0106a1639cfc2d416a4146f558047cfd67e
-    Reviewed-on: https://code.wireshark.org/review/21524
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dddde02
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri May 5 16:22:01 2017 -0400
-
-    packet-mle.c: Fix infinite loop
-    
-    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1359
-    Bug: 13686
-    Change-Id: Ibc08b6e79200264d821e755ef1e4b5da74b8cf97
-    Reviewed-on: https://code.wireshark.org/review/21526
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 82c667b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Apr 27 20:25:26 2017 -0400
-
-    vwr.c: Initialize some local variables
-    
-    Prevents some compiler warnings
-    
-    Change-Id: I9d62d0f3e6b7794c5ed43f37d52f86d81344a33c
-    Reviewed-on: https://code.wireshark.org/review/21531
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3ef57b9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 5 15:12:36 2017 -0700
-
-    Small cleanups.
-    
-    Add some parentheses to make an expression clearer to people who haven't
-    memorized the table of C operator precedences.
-    
-    Don't fiddle the nss variable in place; explicitly combine it with the
-    IS_TX value when we put it in the header, to make it clearer what's in
-    that header byte.
-    
-    Change-Id: I870b892fb9dab2bc210956f923e0183f4e147989
-    Reviewed-on: https://code.wireshark.org/review/21530
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0d36885
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 3 17:48:40 2017 +0200
-
-    tnef: fix conflicting entry in its value_string
-    
-    Field 'Type' (tnef.property.tag.type) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING))
-    
-    Change-Id: I306ba69b954f22781bbafe4400993d73c9be5811
-    Reviewed-on: https://code.wireshark.org/review/21511
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5956556
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 3 17:24:41 2017 +0200
-
-    mapi: fix conflicting entry in its value_string
-    
-    Field 'Value' (mapi.SPropValue.value) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING))
-    
-    Field 'Value' (nspi.SPropValue.value) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING))
-    
-    Change-Id: Icc1060804ced2887a34ffe81cf473fbe8154ce18
-    Reviewed-on: https://code.wireshark.org/review/21510
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c1880e3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 3 18:20:41 2017 +0200
-
-    dcerpc pn io (profinet) fix conflicting entry in its value_string
-    
-    Field 'Index' (pn_io.index) has a conflicting entry in its value_string: 45057 is at indices 82 (Sync-Log / RTA SyncID 1 (GSY)) and 114 (reserved for profiles))
-    
-    Change-Id: Ic3e6f6db0631a9337861cd697b4d7bf17fba0c36
-    Reviewed-on: https://code.wireshark.org/review/21513
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 905e0c0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 3 18:50:48 2017 +0200
-
-    lempar: set ParseInit/ParseFinalize static
-    
-    grammar.c:471:6: warning: no previous prototype for ‘DfilterInit’ [-Wmissing-prototypes]
-    grammar.c:646:6: warning: no previous prototype for ‘DfilterFinalize’ [-Wmissing-prototypes]
-    dtd_grammar.c:502:6: warning: no previous prototype for ‘DtdParseInit’ [-Wmissing-prototypes]
-    dtd_grammar.c:637:6: warning: no previous prototype for ‘DtdParseFinalize’ [-Wmissing-prototypes]
-    
-    Change-Id: I9c43fb4d5ad50992e8e55163333793b20319aa74
-    Reviewed-on: https://code.wireshark.org/review/21516
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c6d7759
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 5 14:13:30 2017 -0700
-
-    Assume the Series II does the same with NSS for VHT that the Series III does.
-    
-    The packet-ixveriwave.c dissector appears to do so.
-    
-    Change-Id: Ie02c4611ef18e83abcd3b625bbc40014080ffca1
-    Reviewed-on: https://code.wireshark.org/review/21525
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a147841
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 5 13:06:16 2017 -0700
-
-    NSS != (MCS / 8) + 1 for MCS >= 32.
-    
-    Do the MCS -> NSS mapping for HT by a table lookup.
-    
-    For VHT with Series II, do it the old way for now, under the assumption
-    that the MCS index and NSS are bit fields, but note that the MCS index
-    and NSS bit fields would overlap.
-    
-    Change-Id: Ibc89590faf15900171b2a1b4ac1e50793ed70c32
-    Reviewed-on: https://code.wireshark.org/review/21523
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1a5c6da
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 5 11:40:22 2017 -0700
-
-    Series I only handles pre-HT, so rename and remove variables.
-    
-    Change-Id: Id9f086983544647267854446932a3ffe2ec2cc55
-    Reviewed-on: https://code.wireshark.org/review/21522
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8493630
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri May 5 11:31:58 2017 -0700
-
-    Have separate routines for calculating pre-HT/HT/VHT data rates.
-    
-    That maeks the code a little clearer.
-    
-    It also makes it clearer that the "MCS index" is, for pre-HT, a rate
-    index, so rename some variables and macros.
-    
-    Change-Id: I64b7bca073df0f837e5d968682345187000207fc
-    Reviewed-on: https://code.wireshark.org/review/21521
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7a9c026
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 3 18:52:08 2017 +0200
-
-    gsm_sms: fix no previous prototype for ‘proto_reg_handoff_gsm_sms’ [-Wmissing-prototypes]
-    
-    Change-Id: If580b059d6aae1d69ac32578674491205a7ae21d
-    Reviewed-on: https://code.wireshark.org/review/21517
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit daf3ae7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 3 18:12:15 2017 +0200
-
-    pn dcp (profinet): fix conflicting entry in its value_string
-    
-    Field 'BlockQualifier: ResettoFactory' (pn_dcp.block_qualifier_reset) has a conflicting entry in its value_string: 9 is at indices 7 (Resets all stored data) and 12 (Reserved))
-    
-    Change-Id: I9d43fc44899d47eaafb50a76511dda69560a75da
-    Reviewed-on: https://code.wireshark.org/review/21512
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 959a0ed
+commit 32aa469
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 3 18:53:42 2017 +0200
-
-    netlink (nl80211) fix no previous prototype for ‘proto_register_netlink_nl80211/handoff_netlink_nl80211’ [-Wmissing-prototypes]
-    
-    Change-Id: Ife84b7865f7646b3ae8ad0dd3bbf10a679868fce
-    Reviewed-on: https://code.wireshark.org/review/21518
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 58a0026
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri May 5 15:40:02 2017 +0200
-
-    extcap: Update example help text
-    
-    Change-Id: I1240af78664d6066650be67b95f0423a5353c711
-    Reviewed-on: https://code.wireshark.org/review/21508
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit e3d284f
-Author: Dr. Lars Voelker <lars.voelker@bmw.de>
-Date:   Sun Apr 30 23:31:26 2017 -0400
-
-    Adding support for the NM protocol.
-    
-    UDP-NM is an automotive communication protocol as standardized by
-    AUTOSAR and is specified in AUTOSAR_SWS_UDPNetworkManagement.pdf,
-    which can be accessed on:
-    autosar.org -> Classic Platform -> Software Arch -> Comm Stack.
-    
-    It can run over UDP or CAN, which is why "UDP" is not in any user
-    exposed strings.
-    
-    Change-Id: I68adfd941c193588a6c8ef0fe1cb7271f921623e
-    Reviewed-on: https://code.wireshark.org/review/21437
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4302a0a
-Author: Adrian Simionov <daniel.simionov@gmail.com>
-Date:   Sun Apr 30 22:10:12 2017 +1000
-
-    [docsis->dccrsp] Resolve confirmation code
-    
-    Change-Id: I1f863eea427529537df004e9782311d5c69ed4bd
-    Reviewed-on: https://code.wireshark.org/review/21505
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ae8b18d
-Author: Rado Radoulov <rad0x6f@gmail.com>
-Date:   Thu Apr 27 13:06:24 2017 -0400
-
-    New Lua function TreeItem:referenced(ProtoField | Dissector).
-    
-    This function returns TRUE/FALSE depending whether the specified ProtoField/Dissector
-    needs to be dissected. By using this function in conjunction with the TreeItem.visible
-    attribute, Lua dissectors can be significantly sped up by making less C interop calls
-    which are relatively slow in terms of dissection especially when using sub-protocols
-    where the dissection of an entire protocol can be skipped.
-    
-    Added tests for TreeItem:referenced to protofield.lua
-    
-    Change-Id: I44feacb91a2a5b0e3c28c0ccd8d6b04cccd67261
-    Reviewed-on: https://code.wireshark.org/review/21387
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ce8863c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu May 4 20:03:35 2017 +0200
-
-    nsh: fix stack overflow due to missing length checks
-    
-    After v2.3.0rc0-3167-ge6f944d632, the NSH dissector could call itself
-    recursively and since the minimum header length was not validated, it
-    could result in a stack overflow due to infinite recursion.
-    
-    Add checks based on the text from
-    https://tools.ietf.org/html/draft-ietf-sfc-nsh-12#section-3.2
-    
-    This patch also fixes a regression since v2.3.0rc0-3171-g2273cf0e7b
-    where the wrong tvb was passed to subdissectors. Tested with the two
-    captures from bug 11490.
-    
-    Bug: 13612
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1156
-    Change-Id: I8cacfa267557e8373ff8134f4b020d927e37842f
-    Reviewed-on: https://code.wireshark.org/review/21499
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a9be088
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 4 18:18:20 2017 -0700
-
-    Fix previous change.
-    
-    Change-Id: I6093d9f5d498c003d14e4f3cec4220eb191d550e
-    Reviewed-on: https://code.wireshark.org/review/21506
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit dd88461
-Author: Hessam Jalali <hessam.jalali@gmail.com>
-Date:   Mon Apr 24 17:31:00 2017 +0430
-
-    Auto reset epan session
-    
-    
-    Automatically resets intarnal epan session after reaching to
-    specified number of packets, for example
-    -M 1000
-    will reset the session every 1000 packets.
-    
-    this is more like a proposal since the usage is very specific
-    it is useful for 24/7 live capture with dissection and sending
-    data directly to another application.
-    
-    example:
-    
-    tshark -Y "gtp" -M 100000 -T fields -e gtp.message -e gtp.teid
-    
-    Change-Id: I8ee8b0380017c684120a93cb3fb43f41615a9c04
-    Reviewed-on: https://code.wireshark.org/review/21312
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8e52cfb
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Thu May 4 14:21:27 2017 +0200
-
-    Qt: Inhibit Disable Protocol when applicable
-    
-    The packet details context menu allows you, through the Protocol
-    Preferences sub menu to manipulate (disable) the protocol dissection
-    through the Disable <protocol>... option. This opens up the appropriate
-    dialog and select the applicable protocol.
-    This fails for protocols which have their can_toggle flag reset (e.g.
-    the frame protocol). The dialog opens, but the protocol can't be found,
-    hence the top item is selected.
-    
-    Instead disable the menu option for protocols which can't have their
-    enabled state toggled.
-    
-    Change-Id: Ifa83f656a8ab747f379d3ca0114520e5efed4b67
-    Reviewed-on: https://code.wireshark.org/review/21494
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8bed61f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 4 14:02:08 2017 -0700
-
-    Use proto_tree_add_item_ret_uint() for the RFID.
-    
-    Do some whitespace cleanup while we're at it.
-    
-    Change-Id: I1c55ce916b6d8344736f5732130613f63cf4d60f
-    Reviewed-on: https://code.wireshark.org/review/21502
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 508bec7
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu May 4 18:45:55 2017 +0200
-
-    bootp: fix potential buffer overflow (read)
-    
-    The Vendor class Identifier is a string (used with strncmp). Be sure to
-    obtain a null-terminated string.
-    
-    Bug: 13628
-    Change-Id: Ic6457da171fbfa1bd18366d965d22e942fb080d6
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1183
-    Bug: 13609
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1153
-    Reviewed-on: https://code.wireshark.org/review/21498
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 2f35a81
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu May 4 17:57:23 2017 +0200
-
-    dfilter: fix memleak when using value_string values
-    
-    When using a filter such as "ncp.alloc_reply_lvl2 == FALSE", a memory
-    leak would occur as follows:
-    
-     1. dfilter_fvalue_from_unparsed is called and
-     2. ends up calling _uint64_from_unparsed
-     3. which fails with error message "\"FALSE\" is not a valid number.".
-     4. Next, mk_fvalue_from_val_string is called which maps "FALSE" to 0
-     5. and the filter is successfully compiled.
-     6. dfwork_free deliberately does not free the error message (since
-        there should be none at this point) and we have a memleak (from 3).
-    
-    Fix this memleak by clearing the error message when a successful
-    value_string mapping is found.
-    
-    Change-Id: I78d59a4336342b09dc5448ea994b2e1d199d7f3f
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1302
-    Reviewed-on: https://code.wireshark.org/review/21497
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 98d8703
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Thu May 4 00:22:28 2017 +0200
-
-    ua3g: added SET_SIP_PARAMETERS and FREESEATING messages decoding
-    
-    Change-Id: I6e00edfa09dea6f9f8c24b72769257ce428bfc61
-    Reviewed-on: https://code.wireshark.org/review/21481
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cd79802
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 4 00:20:37 2017 -0700
-
-    Another comment explaining why a packet size check isn't necessary.
-    
-    Change-Id: Id7494823f9af69c6185b41983ca78ead2dae24dd
-    Reviewed-on: https://code.wireshark.org/review/21492
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4ca15be
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu May 4 00:12:07 2017 -0700
-
-    Do packet length checks iff they're necessary.
-    
-    They're not necessary for most hardware; remove the unnecessary checks,
-    and add comments indicating why they're not necessary (or fix the
-    "maximum value of actual_octets is" part of the comment).
-    
-    They *are* necessary for Series III hardware; put in the check.
-    
-    Change-Id: Idd64a74099d5cf7398a2ddb850442e53c9206724
-    Reviewed-on: https://code.wireshark.org/review/21491
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit dead1b3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 21:51:12 2017 -0700
-
-    Add a comment.
-    
-    Change-Id: Ia60a0cdac3d70862aa5941487af142bd26ab2b80
-    Reviewed-on: https://code.wireshark.org/review/21489
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8638eb9
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed May 3 22:56:55 2017 +0100
-
-    Add g_get_monotonic_time() to glib-compat and use
-    
-    Change-Id: If41dab19692516270e8b4bcf1a8a954bb8dc3ccc
-    Reviewed-on: https://code.wireshark.org/review/21480
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0d5c98c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 20:28:29 2017 -0700
-
-    Clean up whitespace and a #define.
-    
-    Add some additional blank lines, remove some extra, blank lines, fix
-    indentation.
-    
-    Make vVW510024_E_IS_VLAN 32-bits, to match the other flags.
-    
-    Change-Id: Id1cd63ff2b75764907a44e9f8525b1537666fde1
-    Reviewed-on: https://code.wireshark.org/review/21488
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0d69b9a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 19:55:39 2017 -0700
-
-    Update comments.
-    
-    There's only a 17-byte PLCP header with the Series III hardware.
-    
-    Change-Id: Ice8dfbbc5daa0578ee4eb6588fc8a8b597806d0d
-    Reviewed-on: https://code.wireshark.org/review/21487
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7703d45
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 19:50:11 2017 -0700
-
-    Use a #define for the PLCP type.
-    
-    That makes it clearer that the Series I hardware doesn't do HT or VHT.
-    
-    Change-Id: Ibeccfcba997555bef06098828f01951dc32a6d2c
-    Reviewed-on: https://code.wireshark.org/review/21486
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 04e5d8d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 19:12:03 2017 -0700
-
-    Remove an unnecessary comment, fix another comment.
-    
-    Change-Id: Id20517c99663c624b6bfd58d7475284db450e003
-    Reviewed-on: https://code.wireshark.org/review/21485
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1ac685f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 18:53:00 2017 -0700
-
-    Remove trailing white space.
-    
-    Change-Id: I8cdbde058c7ebb9aaaac4739e9a5c206e0d2c919
-    Reviewed-on: https://code.wireshark.org/review/21484
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7c6bdc3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 18:45:11 2017 -0700
-
-    More description of stats headers.
-    
-    Change-Id: I21ee8b39b96dd58ea1dfeb502e8734b33aa298c1
-    Reviewed-on: https://code.wireshark.org/review/21483
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6b7d990
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 18:32:31 2017 -0700
-
-    Fix some comments, shuffle some code, change a constant in an assignment.
-    
-    Fix "VHTPPDU" to be "VHT PPDU".
-    
-    Move the code that processes the RSSI values before the code that
-    processes the next two bytes of the header, so it's done in order; that
-    makes it a bit easier to see the layout of that header (although 2 bytes
-    of it are processed below).
-    
-    Fix the comment describing what the first 16 bytes of the record data
-    after the stats are.  Don't use vVW510021_W_STATS_HEADER_LEN - that's
-    for the Series II hardware.
-    
-    Fix some indentation.
-    
-    Change-Id: If47c4a44fd5e72971a28daf6af88d5e19c53abbe
-    Reviewed-on: https://code.wireshark.org/review/21482
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 81292f3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 14:23:54 2017 -0700
-
-    Put back the null terminator in the list of handles.
-    
-    The code to scan the list has always required a null terminator, but
-    change 96f517647a8f8b22c66eacf6e3d8bea9d8b8c68f got rid of the null
-    terminator.
-    
-    Change-Id: I13c1553114e08e8617adaf8874ffb5e7c7c4b2d3
-    Reviewed-on: https://code.wireshark.org/review/21477
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e0ab0b7
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed May 3 17:44:33 2017 +0100
-
-    Extcap: use glib-compat for g_list_free_full()
-    
-    Change-Id: I13e6a465b0e169f2f4ce134df3c873c416737b33
-    Reviewed-on: https://code.wireshark.org/review/21476
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dbae27f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed May 3 09:38:29 2017 -0400
-
-    [DOCSIS] Use expert info instead of THROWing bounds errors for bad lengths
-    
-    Also adjust whitespace for a few places where if (tree) would mess up
-    expert_info use.
-    
-    Change-Id: I79b8f7105515fb9ce220a46f3e875be466ee1044
-    Reviewed-on: https://code.wireshark.org/review/21474
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8f6b8e2
-Author: Michael Tuexen <tuexen@wireshark.org>
-Date:   Wed May 3 10:47:54 2017 +0200
-
-    Add support for TCP over UDP.
-    
-    Add support to configure a port number for encapsulating TCP
-    packets in UDP.
-    
-    Change-Id: I9aea1eda4537b05e76e76ed0417acb34705bad9e
-    Reviewed-on: https://code.wireshark.org/review/21473
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
-
-commit e9d3cb9
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Tue May 2 22:57:56 2017 +0200
-
-    ua3g: updated SET_PARAM_REQ message decoding
-    
-    Change-Id: Ic20286111b39539b5c423cc2442be0533d0b631e
-    Reviewed-on: https://code.wireshark.org/review/21468
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 91a21b3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Apr 5 13:29:25 2017 +0200
-
-    [mbtcp] Separate conversation and per-packet data, build ppd on first
-    pass.
-    
-    Change-Id: I741824b239476a3eafa481344a3f699f986a03c8
-    Reviewed-on: https://code.wireshark.org/review/20927
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0807e50
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue May 2 18:19:46 2017 +0200
+Date:   Wed Jun 21 23:25:24 2017 +0200
 
-    TLS13: update HKDF-Expand-Label for draft -20
+    OSPF: fix Opaque LSA Type 11 is considered as unknown
     
-    This is needed for decryption to work in draft -20. Since lots of
-    implementations are still at draft -18, maintain decryption support for
-    older draft versions. Tested with tls13.pcapng (attachment 15156).
+    it is define in RFC5250 (and RFC 2370)
     
-    Change-Id: Ieb7d85136221573007b529b40e4eadc60eac174f
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/21467
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 80176e0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue May 2 17:54:49 2017 +0200
-
-    TLS13: update Certificate dissection for draft -20
+    Ping-Bug: 13823
     
-    RawPublicKey (RFC 7250) has been incorporated in the Certificate
-    message, update the definition and restructure the code accordingly.
-    
-    No functional change for X.509 certs, but RPK types will now be
-    correctly handled for TLS 1.3 (including the context and extensions).
-    Ran the test suite and tested for regressions using
-    rpk-certficate-message.pcapng from bug 11480.
-    
-    Change-Id: If551a30344851313430201cb6d6198b2091efc2d
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/21466
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 62adcd6
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Wed May 3 00:19:03 2017 +0200
-
-    USB: prevent array bounds overflow from invalid Darwin transfer type
-    
-    During 'Darwin' transfer type conversion the network data is taken
-    as-is, without checking validity. This results in indexing errors.
-    Add validation before using as array index.
-    
-    Bug: 13676
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1307
-    Change-Id: I24ca49bb21ba36a8d6a3c078ac2c05ded7b8d382
-    Reviewed-on: https://code.wireshark.org/review/21470
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 37d0e1b
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Tue May 2 23:36:05 2017 +0200
-
-    ua3g: updated START_RECORD_RTP message decoding
-    
-    Change-Id: I98d2aa5098d3019f829e75e46a0842a9d87786aa
-    Reviewed-on: https://code.wireshark.org/review/21469
+    Change-Id: I84f166d48b39e76ab811a6c2d1c7b1d516e7f0f3
+    Reviewed-on: https://code.wireshark.org/review/22328
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 13b6587
-Author: Binh Trinh <beango@gmail.com>
-Date:   Sun Apr 30 23:17:14 2017 -0400
-
-    pdcp-lte: add preference to ignore Set Security Algorithm
-    
-    Useful when captures are already deciphered
-    
-    Change-Id: Ie0f57efa6dccd21d7bd0f25851cbdc8887d7fbbf
-    Reviewed-on: https://code.wireshark.org/review/21443
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit 0727123773d36a9dd6000d82a2967f7ddaa61aca)
+    Reviewed-on: https://code.wireshark.org/review/22370
 
-commit c6b56bb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed May 3 00:23:33 2017 -0700
-
-    Fix handling of Header IEs.
-    
-    Add the tree for the type/length/element ID for *all* IEs, whether we
-    know the IE type or not.
-    
-    The total length of the IE is 2 + the value of the length field; always
-    advance by that much.  This prevents infinite loops.
-    
-    Fix the name of a field.
-    
-    Bug: 13678
-    Change-Id: Iadc537653999a4a796c6689b180cf1b75e175035
-    Reviewed-on: https://code.wireshark.org/review/21472
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit dbd5902
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue May 2 19:52:05 2017 -0700
-
-    Add terminating NULL to lists for proto_tree_add_bitmask().
-    
-    Those lists require null terminators; fix the script to add them, and
-    re-run the script (with the current tip of the master branch for
-    xcbproto and mesa).
-    
-    Change-Id: I76c156521e79753f5c19cae16e9caa031abd2496
-    Reviewed-on: https://code.wireshark.org/review/21471
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4a41c24
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 12:56:52 2017 +0200
-
-    scsi: fix conflicting entry in its value_string
-    
-    Field 'SPC-2 Opcode' (scsi.spc.opcode) has a conflicting entry in its value_string: 132 is at indices 26 (Receive Copy) and 27 (Receive Copy Results))
-    
-    Change-Id: I5916bab1bb493226003e86b5a6b693fd4a727499
-    Reviewed-on: https://code.wireshark.org/review/21458
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 427c800
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 14:58:26 2017 +0200
-
-    lemon: fix no previous prototype for ‘memory_error’ [-Wmissing-prototypes]
-    
-    Change-Id: I5830581c843af41f48bc9645c2be7cf35fa00391
-    Reviewed-on: https://code.wireshark.org/review/21463
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 67cfac7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 14:55:24 2017 +0200
-
-    extcap (parser): fix no previous prototype for ‘extcap_free_toolbar_value/control’
-    
-    Change-Id: I9ebf5a48534915e5f316358af3637c4fce69593c
-    Reviewed-on: https://code.wireshark.org/review/21462
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 61436c0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 15:45:01 2017 +0200
-
-    TLS (1.3): Add new extension 'post_handshake_auth' add on draft 20
-    
-    The "extension_data" field is zero length.
-    
-    Ping-Bug: 12779
-    Change-Id: I7a512d7940f55a5edf2c4f71bf1684c3d4e4733a
-    Reviewed-on: https://code.wireshark.org/review/21465
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7826ae4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 15:35:12 2017 +0200
-
-    TLS: Add support of TLS 1.3 (draft 20)
-    
-    Ping-Bug: 12779
-    Change-Id: I6c54f7c4d793a99e448cbfe6b2971cae418f2d39
-    Reviewed-on: https://code.wireshark.org/review/21464
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit fc931b8
+commit c038937
 Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Apr 26 21:46:14 2017 +0100
-
-    Snort: Ask for needed fields.
-    
-    Doesn't seem to make a difference at the moment, but ask
-    for it regardless.
-    
-    Change-Id: I94ff4f1321b2b2f2cde23f3281a6b79fd7048009
-    Reviewed-on: https://code.wireshark.org/review/21436
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 66d6ff9
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Tue May 2 10:37:22 2017 +0200
-
-    ua3g: updated RESET message decoding (appl_mode, sip_name and reset_mac parameters)
-    
-    Change-Id: I4604b4de036f5e2d43a6e4f52e64576d63f2c8ed
-    Reviewed-on: https://code.wireshark.org/review/21449
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0336243
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Tue May 2 10:49:12 2017 +0200
-
-    ua3g: updated REDIRECT message decoding (redundant maincpu parameter)
-    
-    Change-Id: I4c703d380010ed784946a0093307423c227d37eb
-    Reviewed-on: https://code.wireshark.org/review/21450
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jun 22 13:36:33 2017 +0100
 
-commit a81ddf2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 09:09:32 2017 +0200
-
-    nmas (ncp): fix conflicting entry in its value_string
-    
-    Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965609 is at indices 56 ((-1687) EVALUATION VERSION WARNING) and 58 ((-1689) THREAD CREATE))
-    
-    Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965610 is at indices 55 ((-1686) DLL FAILED LOADING) and 59 ((-1690) SECURE CHANNEL REQUIRED))
-    
-    Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965611 is at indices 54 ((-1685) UNICODE FAILED INIT) and 60 ((-1691) NO DEFAULT USER SEQUENCE))
-    
-    Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965612 is at indices 53 ((-1684) CODEPAGE FAILED INIT) and 61 ((-1692) NO TREENAME))
-    
-    Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965613 is at indices 52 ((-1683) DOUBLEBYTE FAILED INIT) and 62 ((-1693) MECHANISM NOT FOUND))
-    
-    Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965609 is at indices 56 ((-1687) EVALUATION VERSION WARNING) and 58 ((-1689) THREAD CREATE))
-    
-    Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965610 is at indices 55 ((-1686) DLL FAILED LOADING) and 59 ((-1690) SECURE CHANNEL REQUIRED))
-    
-    Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965611 is at indices 54 ((-1685) UNICODE FAILED INIT) and 60 ((-1691) NO DEFAULT USER SEQUENCE))
-    
-    Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965612 is at indices 53 ((-1684) CODEPAGE FAILED INIT) and 61 ((-1692) NO TREENAME))
-    
-    Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965613 is at indices 52 ((-1683) DOUBLEBYTE FAILED INIT) and 62 ((-1693) MECHANISM NOT FOUND))
-    
-    Change-Id: I2bdaa16b04c9d34cfbc5e83ca2b612326216224a
-    Reviewed-on: https://code.wireshark.org/review/21451
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 527c31f
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue May 2 14:36:00 2017 +0200
-
-    Qt: Fix build without extcap
-    
-    Change-Id: Ibfcdb719408c0172ae78bf3b2761ff551ff6313c
-    Reviewed-on: https://code.wireshark.org/review/21461
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 798773b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 10:52:57 2017 +0200
-
-    mq: fix conflicting entry in its value_string
-    
-    Field 'Selector........' (mq.inq.sel) has a conflicting entry in its value_string: 2002 is at indices 221 (MQCA_BASE_Q_NAME) and 222 (MQCA_BASE_OBJECT_NAME))
-    
-    Change-Id: Ie81b58bf9c32ea38ff5d0808accdd8e9dac3b81a
-    Reviewed-on: https://code.wireshark.org/review/21453
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9fc3b47
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 12:17:53 2017 +0200
-
-    pn532 (rfid): fix conflicting entry in its value_string
-    
-    Field 'SAM Mode' (pn532.sam.mode) has a conflicting entry in its value_string: 3 is at indices 2 (Wired Card Mode) and 3 (Dual Card Mode))
-    
-    Change-Id: I5ee07aff43e2f5ba7a2757057a0da80e2f747541
-    Reviewed-on: https://code.wireshark.org/review/21455
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 886c571
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 09:12:26 2017 +0200
-
-    nettl: fix conflicting entry in its value_string
-    
-    Field 'Trace Kind' (nettl.kind) has a conflicting entry in its value_string: 536870912 is at indices 2 (Incoming PDU - PDUIN) and 3 (PDUIN))
-    
-    Field 'Trace Kind' (nettl.kind) has a conflicting entry in its value_string: 268435456 is at indices 4 (Outgoing PDU - PDUOUT) and 5 (PDUOUT))
-    
-    Change-Id: I14d47225a4ae83b6667313e5c0ca13e4d4d64831
-    Reviewed-on: https://code.wireshark.org/review/21452
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b64889d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 12:16:16 2017 +0200
-
-    kerberos: fix conflicting entry in its value_string
-    
-    Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 1 is at indices 1 (kRB5-PADATA-TGS-REQ) and 2 (kRB5-PADATA-AP-REQ))
-    
-    Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 15 is at indices 15 (kRB5-PADATA-PK-AS-REP-19) and 16 (kRB5-PADATA-PK-AS-REQ-WIN))
-    
-    Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 20 is at indices 21 (kRB5-PADATA-USE-SPECIFIED-KVNO) and 22 (kRB5-PADATA-SVR-REFERRAL-INFO))
-    
-    Change-Id: I504291b8eb181c9e40d54421f583755cfc4f17db
-    Reviewed-on: https://code.wireshark.org/review/21454
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 093f130
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue May 2 12:24:56 2017 +0200
-
-    qllc: fix conflicting entry in its value_string
-    
-    Field 'Error' (qsig.error) has a conflicting entry in its value_string: 43 is at indices 12 (proceduralError) and 42 (notActivated))
-    
-    Change-Id: Ic1468f32922644933a79db504a4ecfb6e2289bd2
-    Reviewed-on: https://code.wireshark.org/review/21457
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 741d4f5
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Apr 28 21:26:53 2017 +0200
-
-    Qt: Interface Toolbar improvements
-    
-    - Select one of the capturing interfaces when start capture
-    - Only send user changed control values when start capture
-    - Don't show hidden interfaces
-    - Allow a toolbar with no interfaces
-    - Renamed button role "reset" to "restore"
-    - Improved control number validation
-    - Updated documentation
-    
-    Change-Id: Icc8d04043c95c1f3ef8d7cdc3b251be4471cba0a
-    Reviewed-on: https://code.wireshark.org/review/21445
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit afb4de3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Apr 29 10:30:23 2017 -0400
-
-    packet-bzr.c: Prevent infinite loop
-    
-    Bug: 13599
-    Change-Id: If85588099d7c6635865614f8778a903a5e971789
-    Reviewed-on: https://code.wireshark.org/review/21410
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6907601
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon May 1 20:27:01 2017 -0700
-
-    Improve the handling of the PLCP header.
-    
-    Dissect the PLCP headers in a bit more detail, and use bit fields.  Use
-    common code.
-    
-    Change-Id: I8711cba71894bebf94f17fdba98b28cc7a620f81
-    Reviewed-on: https://code.wireshark.org/review/21448
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c9f3add
-Author: Adrian Simionov <daniel.simionov@gmail.com>
-Date:   Sun Apr 30 20:36:14 2017 +1000
-
-    [docsis->dccrsp] Update TLV numbers and names to MULPIv3.1-I10
-    
-    Change-Id: I72bec5bcbe7e2139ae36bf704e7ebda9207331fd
-    Reviewed-on: https://code.wireshark.org/review/21424
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2e2ba64
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon May 1 18:35:04 2017 +0200
-
-    file: (trivial) initialize "passed" when it's declared
-    
-    Change-Id: I2ace2a6847ca01435651a48934acf9c1c6d2f23d
-    Reviewed-on: https://code.wireshark.org/review/21444
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit cd12580
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 19:55:06 2017 -0700
-
-    For S3, yes, the PLCP type can be vVW510021_W_PLCP_LEGACY.
-    
-    (The dissector checks for it.)
-    
-    Change-Id: Ic1456b263f3cbda2a630259a2b71b1f1015b5e3e
-    Reviewed-on: https://code.wireshark.org/review/21442
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 477c4ed
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 19:53:51 2017 -0700
-
-    Fill in more fields of the 802.11 radio metadata structure.
-    
-    Also, use #defines for the PLCP type, and add some comments about the
-    PLCP format, and fill in the "short GI" flag from the PLCP header.
-    
-    Change-Id: Ia3c44cc12feb87c181783e9dc37fe0877d1e2a81
-    Reviewed-on: https://code.wireshark.org/review/21441
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8814707
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 17:28:38 2017 -0700
-
-    Replace some proto_tree_add_uint() calls with proto_tree_add_item().
-    
-    If we're fetching a value only to use it in proto_tree_add_uint(), we
-    might as well just use proto_tree_add_item().
-    
-    Change-Id: I504c54f972b2844f57f25c9ffc89c142c8dc495f
-    Reviewed-on: https://code.wireshark.org/review/21440
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 20d6b67
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 17:10:02 2017 -0700
-
-    Make the record-length checks take the RF information into account.
-    
-    Include the RF information length if there's RF information.
-    
-    While we're at it:
-    
-    Rename the variable holding the offset of the stats information from "j"
-    to "stats_offset", to make it clearer what it is.
-    
-    Clean up whitespace.
-    
-    Get rid of comments that no longer apply.
-    
-    Improve the comment explaining the MPDU_OFF value for Series III.
-    
-    Change-Id: I49e2926a80aa8bb11f87d97fdc628bcc9f1220e0
-    Reviewed-on: https://code.wireshark.org/review/21439
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 30d674b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 12:44:55 2017 -0700
-
-    Do all the command-type analysis of decode_msg() in the switch statement.
-    
-    Add #defines for the remaining command types, based on some other
-    
-    Get rid of the HEADER_IS_xxx #defines; they're the same for all
-    hardware, and the switch statement doesn't distinguish between different
-    hardware.
-    
-    Set *IS_TX in the switch statement cases.  While we're at it, set v_size
-    and *v_type in the default case; add a VT_UNKNOWN value for that case.
-    
-    Change-Id: Ib17d1e435c99fcb746144b4735c160a5f22b7544
-    Reviewed-on: https://code.wireshark.org/review/21438
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9606d67
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 11:08:20 2017 -0700
-
-    Use some #defines.
-    
-    Change-Id: I9cafd3b745eb0fec39c0a9b5f529249584107971
-    Reviewed-on: https://code.wireshark.org/review/21435
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2700055
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 10:43:52 2017 -0700
-
-    Fix a comment to reflect reality.
-    
-    There aren't any "4 Management bytes for OCTO version FPGA" in that
-    header.
-    
-    Change-Id: I57f673dad5bc10b888fae22c2fb1a45af57ff493
-    Reviewed-on: https://code.wireshark.org/review/21434
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit df77121
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 10:13:50 2017 -0700
-
-    Remove now-unused variables and code and unnecesary headers.
-    
-    We're not doing any CRC stuff here - that's the job of the 802.11
-    dissector, which does it Just Fine - so remove what remains of the stuff
-    for it.
-    
-    Change-Id: If6a0113dec7773b3b4daa7fa014f02c6a97eca0d
-    Reviewed-on: https://code.wireshark.org/review/21433
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f9997ee
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 30 14:53:01 2017 +0200
-
-    GSM SMS: use TCAP OTID as last resort for reassembly when GSM MAP does not give info
-    
-    Bug: 13592
-    Change-Id: Ie13e7466da906e72418c6f9d5ea6f816ff14e129
-    Reviewed-on: https://code.wireshark.org/review/21425
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0e2ce1d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 09:55:22 2017 -0700
-
-    Pass inforation from dissect_ixveriwave() to wlantap_dissect().
-    
-    Always set log_mode - if the command type is 3, set log_mode to 0, as
-    it's not supplied by the libwiretap code.
-    
-    Pass log_mode and is_octo from dissect_ixveriwave() to
-    wlantap_dissect().  Test is_octo in wlantap_dissect(), just as we do in
-    dissect_ixveriwave().
-    
-    Change-Id: I536ca59f01e644d55e541df6d2e119db590ae48a
-    Reviewed-on: https://code.wireshark.org/review/21432
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 63e64e3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 30 09:31:14 2017 -0700
-
-    Remove a now-unused table.
-    
-    Change-Id: Ibb04201bd2acd5fa6cbcd7837504b10d1d5174c4
-    Reviewed-on: https://code.wireshark.org/review/21430
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5de615c
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Apr 30 08:16:34 2017 -0700
-
-    [Automatic update for 2017-04-30]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I491517d8801f9b5d3d3084102ed35b418460e4b6
-    Reviewed-on: https://code.wireshark.org/review/21427
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 638fb0a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 30 09:30:09 2017 -0400
-
-    packet-ixveriwave.c: Initialize mgmt_byte
-    
-    Suppress Ubuntu warning
-    
-    Change-Id: Ia95e19d59b768b6842ca58051ffbd97dce84174c
-    Reviewed-on: https://code.wireshark.org/review/21426
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bb83fe4
-Author: Simon Barber <simon.barber@meraki.net>
-Date:   Wed Jan 6 17:23:00 2016 -0800
-
-    packet-ieee80211-radio.c: Minor refactor and whitespace cleanup
-    
-    Change-Id: Idad8f7eeed968eeed9f553fef98d58453f328afb
-    Reviewed-on: https://code.wireshark.org/review/21421
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Michael Mann <mmann78@netscape.net>
-
-commit 7f2c6e1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 20:51:38 2017 -0700
-
-    Some cleanup.
-    
-    Whitespace, remove now-irrelevant comments, add more comments, expand
-    some comments, make an if chain more straightforward.
-    
-    Change-Id: I9772022247e2f0fdbfc676db9f0031bad7f8884d
-    Reviewed-on: https://code.wireshark.org/review/21423
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9d49ab7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 20:35:23 2017 -0700
-
-    Boolean bitfields don't need a mask, just a bit.
-    
-    You don't have to and the bitfield container with a mask and compare it
-    against the bit, you can just test the bit, which is a pretty standard C
-    idiom.
-    
-    Change-Id: I87b3d84f802114199fb93357358412c623199ca2
-    Reviewed-on: https://code.wireshark.org/review/21422
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit db2746a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 20:13:03 2017 -0700
-
-    Get rid of some unused cruft, and rename an hf_ variable.
-    
-    Change-Id: Ib74efc765d354b32b40ff298125d4e08f0eb3c2e
-    Reviewed-on: https://code.wireshark.org/review/21420
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d2b772e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 19:56:04 2017 -0700
-
-    The encryption type field is part of a 16-bit bitfield.
-    
-    Set its type accordingly.
-    
-    Change-Id: I3f80828d9e248235db6f4b30f02ada6b6786d25a
-    Reviewed-on: https://code.wireshark.org/review/21419
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 287739b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 19:51:43 2017 -0700
-
-    There's no "FCS is present" flag passed up from libwiretap.
-    
-    For Ethernet, the FCS is absent; for 802.11, the Series I and II
-    hardware doesn't provide an FCS, but the Series III hardware appears to.
-    
-    Get rid of the flag bit, and a bunch of other dead code (probably
-    inherited by copy-and-paste).
-    
-    Change-Id: I44301c8211c25a5665eb528ac657925931d3f0b4
-    Reviewed-on: https://code.wireshark.org/review/21418
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5c1cf9d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 19:42:18 2017 -0700
-
-    Series III packets appear to have an FCS at the end.
-    
-    Change-Id: I9c4ba78cba4cb32a1473c6b8573880f2b56f1fde
-    Reviewed-on: https://code.wireshark.org/review/21417
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bc7452d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 18:41:12 2017 -0700
-
-    Get rid of unused flag bits and #defines.
-    
-    The "sent/received during CFP", "sent/received with fragmentation" and
-    "frame has padding between 802.11 header and payload" flag bits are
-    never set by wiretap/vwr.c, so don't test them.  They're copied over
-    from radiotap, but this is *not* radiotap.
-    
-    Also, get rid of a bunch of unused #defines, and one instance of a
-    duplicate #define.  Again, they're copied over from radiotap, but this
-    is *not* radiotap.
-    
-    Change-Id: I1d62e6400fb21c40512005d88cbc06d8576e8183
-    Reviewed-on: https://code.wireshark.org/review/21416
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 113676b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 18:07:46 2017 -0700
-
-    Get rid of duplicate #defines, and shuffle some comments and #defines.
-    
-    This makes stuff a bit clearer.
-    
-    Also, add some comments, remove some redundant comments, fix some
-    comments, and use some #defines instead of hardcoded constants and
-    expressions.
-    
-    And get rid of an unnecessary setting of *err to WTAP_ERR_SHORT_READ -
-    either it's a short read, in which case it was already set to
-    WTAP_ERR_SHORT_READ, or it's *not* a short read, in which case *err was
-    set to the appropriate error code, and we should leave it alone.
-    
-    Change-Id: I657f505915854ac4a6b85e87b4021961b1a1c507
-    Reviewed-on: https://code.wireshark.org/review/21415
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a48997a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 17:37:48 2017 -0700
-
-    Remove Series III code from vwr_read_s2_W_rec().
-    
-    It's only called if vwr->FPGA_VERSION is S2_W_FPGA, so any code that's
-    run only if it's *not* S2_W_FPGA is dead code.  Remove it, for clarity.
-    
-    While we're at it, add some new comments, fix some comments, and get rid
-    of an unused argument to vwr_read_s2_W_rec().
-    
-    Change-Id: I3e4bd5d7a79f36d8354a0bbf875ee87eeaf60d43
-    Reviewed-on: https://code.wireshark.org/review/21414
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c0a1ce2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 17:24:45 2017 -0700
-
-    Fix broken test for new Series III metadata header.
-    
-    Add some comments while we're at it.
-    
-    Change-Id: I87f97ab640d9a02c01923867d3d3b91e755d0e40
-    Reviewed-on: https://code.wireshark.org/review/21413
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7bd8ec1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 10:03:35 2017 -0700
-
-    Fields added with proto_tree_add_bitfield() must have an integral type.
-    
-    Change-Id: I314e192d1d2b6dbe1e098438ba4f407c9b5b6b14
-    Reviewed-on: https://code.wireshark.org/review/21411
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b8d473a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Apr 29 14:24:59 2017 +0200
-
-    iso14443: dissect the type B bit rate info
-    
-    Change-Id: I71b4d3c8f22c32f1aaf89f147bc6a20ce54aec4d
-    Reviewed-on: https://code.wireshark.org/review/21409
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit acdc0a0
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Apr 29 13:47:42 2017 +0200
-
-    extcap_free_interface_info: data param is used
-    
-    The data parameter is used, remove the _U_ qualifier.
-    
-    Change-Id: I3a3935bae958103da1a7a1abe0636e4781424aa7
-    Reviewed-on: https://code.wireshark.org/review/21408
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 2a3f1a4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 04:28:53 2017 -0700
-
-    Eliminate some double-frees.
-    
-    The cfile_ error-reporting routines free err_info; the caller doesn't
-    have to and, in fact, mustn't do so themselves.
-    
-    While we're at it, make sure wtap_seek_read() always zeroes out *err and
-    nulls out *err_info, so the latter either points to a freshly-allocated
-    string or is null.
-    
-    Change-Id: Idfe05a3ba2fbf2647ba14e483187617ee53e3c69
-    Reviewed-on: https://code.wireshark.org/review/21407
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e3f4928
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 29 03:31:58 2017 -0700
-
-    Fix some field type errors.
-    
-    Don't add FT_BOOLEAN and FT_NONE fields with proto_tree_add_uint().
-    
-    Change-Id: I3c89aa161775fc639e6a7306282b55649a3c473a
-    Reviewed-on: https://code.wireshark.org/review/21406
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cc9b38a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 25 23:26:59 2017 -0400
-
-    Improve ixveriwave dissector
-    
-    Bug: 13652
-    Bug: 12535
-    Change-Id: Ie4c140acbe983a585776bc1430cf407cdcd6e07a
-    Reviewed-on: https://code.wireshark.org/review/21356
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fb1a632
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Apr 28 18:39:07 2017 +0200
-
-    GSM MAP: use TCAP OTID to retrieve SM-RP-OA and SM-RP-DA fields when required
-    
-    Bug: 13592
-    Change-Id: Ib8a0ff6d897699c44e5c4b8834123169066cf904
-    Reviewed-on: https://code.wireshark.org/review/21397
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5bda985
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 28 20:00:14 2017 -0700
-
-    Don't add /usr/X11/lib/pkgconfig if we're not using GTK+.
-    
-    Qt for macOS doesn't use X11, so you don't need X11.
+    Snort content matching fixes
     
-    Change-Id: Ibc09a2d802f21b5be38baf735d2f6d582d6bf41f
-    Reviewed-on: https://code.wireshark.org/review/21401
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 57b1718
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 28 19:55:44 2017 -0700
-
-    Get rid of a message that should no longer apply.
-    
-    The version of pkg-config downloaded and built by macosx-setup.sh
-    defaults to looking in, among other places, /usr/local/lib/pkgconfig, so
-    you don't need to add that to PKG_CONFIG_PATH on macOS; Wireshark for
-    macOS no longer uses X11, so you don't need to add
-    /usr/X11/lib/pkgconfig to PKG_CONFIG_PATH on macOS.
-    
-    Change-Id: I84fd6848b72010aafd7859c4e9c0a4362113c890
-    Reviewed-on: https://code.wireshark.org/review/21398
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b3a339b
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Apr 27 17:23:03 2017 +0200
-
-    openSAFETY: Set filter list for nodes
-    
-    To enhance the possibility for dissections, add a list
-    of nodes, you explicitly want to see and print an info
-    text in the node list for all nodes filtered
-    
-    Change-Id: I08e8a7ddcfd7b78fee24431ffdae75124a8ecddd
-    Reviewed-on: https://code.wireshark.org/review/21383
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 1c9588d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Apr 28 08:00:18 2017 +0200
-
-    dis: fix conflicting entry in its value_string
-    
-    Field 'Country' (dis.country) has a conflicting entry in its value_string: 107 is at indices 106 (Cote D'Ivoire (aka Ivory Coast)) and 107 (Ivory Coast (aka Cote D'Ivoire)))
-    
-    Field 'Country' (dis.aggregate.country) has a conflicting entry in its value_string: 107 is at indices 106 (Cote D'Ivoire (aka Ivory Coast)) and 107 (Ivory Coast (aka Cote D'Ivoire)))
-    
-    Change-Id: Iabc2fafae5d756ff0cdfb4d16a8751b573378f06
-    Reviewed-on: https://code.wireshark.org/review/21396
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6a6f64d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Apr 28 07:59:41 2017 +0200
-
-    cipmotion: fix conflicting entry in its value_string
-    
-     Field 'Service Code' (cipm.svc.code) has a conflicting entry in its value_string: 83 is at indices 30 (Run Hookup Test) and 31 (Get Hookup Test Data))
-    
-    Change-Id: I3d650b0a6aeacb8e992126a7008e0b256cf1fe94
-    Reviewed-on: https://code.wireshark.org/review/21395
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 122c4dd
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Apr 27 17:34:46 2017 +0200
-
-    cmake: make docbook build optional if AsciiDoc is missing
-    
-    This prevents ASCIIDOC2xxx from being invoked (which would define
-    useless targets and error out during the build since a2x is missing).
-    
-    Now Wireshark.sln builds successfully without Cygwin.
-    
-    Change-Id: I37684ce4a2ef22bdc74b388ced44271e14a1d337
-    Reviewed-on: https://code.wireshark.org/review/21384
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 976d8ab
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Thu Apr 27 20:24:51 2017 +0100
-
-    Snort: get rid of dependency on struct timeval
+    Cope with a space between colon and start of options value.
+    When there are no constraining modifiers, let match for
+    next content or pcre field start from beginning of payload
+    again.
     
-    Change-Id: Iad529ddf85b315452adc26a2d1b4c609ac2aaa00
-    Reviewed-on: https://code.wireshark.org/review/21389
+    Change-Id: Ie1267a0a38143cbe9f0444945f78708bbefaa270
+    Reviewed-on: https://code.wireshark.org/review/22365
     Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit aeccfa3
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Apr 26 20:28:35 2017 +0200
-
-    GSM SMS: Use SIP To / From tapped addresses for reassembly
-    
-    Ping-Bug: 13592
-    Change-Id: Ie07033972943ef38ca88bc0e82463ebccd281ce2
-    Reviewed-on: https://code.wireshark.org/review/21354
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ffddacf
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Thu Apr 27 15:18:35 2017 +0200
-
-    uaudp: fixed decoding of CONNECT message
-    
-    Change-Id: I69e0d9abc8e2fccf2837bf7dee52480063f11193
-    Reviewed-on: https://code.wireshark.org/review/21366
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 015d919
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 27 18:23:48 2017 -0700
-
-    Add proto_tree_add_item_ret_boolean().
-    
-    It does what it says on the label.  You get back TRUE or FALSE in a
-    gboolean.
-    
-    While we're at it, remove a copied-and-pasted comment that doesn't
-    apply, and update another comment.
-    
-    Change-Id: I117391d2ffe44124a614a7f64dad1b389c1ebc6a
-    Reviewed-on: https://code.wireshark.org/review/21394
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b9d3db6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Apr 27 15:17:46 2017 +0200
-
-    ipdc: fix conflicting entry in its value_string (and convert to value_string_ext)
-    
-    Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 255 is at indices 3 (SS -> GW: MRJ: Message reject.) and 32 (GW -> SS: MRJ: Message reject.))
-    
-    Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 17 is at indices 17 (SS -> GW: RCR: Release channel request) and 45 (GW -> SS: RCR: Release channel request))
-    
-     Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 18 is at indices 18 (SS -> GW: ACR: Release channel complete) and 46 (GW -> SS: ACR: Release channel complete))
-    
-    Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 125 is at indices 23 (SS -> GW: RTE: Request Test Echo) and 52 (GW -> SS: RTE: Request Test Echo))
-    
-    Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 126 is at indices 24 (SS -> GW: ARTE: Response to Request Test Echo) and 53 (GW -> SS: ARTE: Response to Request Test Echo))
-    
-    Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 121 is at indices 25 (SS -> GW: NATV: Native Mode Q.931 Signaling Transport) and 54 (GW -> SS: NATV: Native Mode Q.931 Signaling Transport))
-    
-     Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 122 is at indices 26 (SS -> GW: TUNL: Tunneled Transport of signaling protocol data units) and 55 (GW -> SS: TUNL: Tunneled Transport of signaling protocol data units))
-    
-    Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 122 is at indices 26 (SS -> GW: TUNL: Tunneled Transport of signaling protocol data units) and 55 (GW -> SS: TUNL: Tunneled Transport of signaling protocol data units))
-    
-    Change-Id: I2d679f01ff9ddb6618ebd7212d1d7789045b434c
-    Reviewed-on: https://code.wireshark.org/review/21378
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 755bc5c
-Author: Radhashyam Behera <radhashyambehera@gmail.com>
-Date:   Wed Apr 19 16:22:52 2017 -0400
-
-    IEEE80211: Support of PHI, PSI Angle Decode in VHT Compressed Beamforming Report
-    
-    Bug: 13341
-    Change-Id: Ide9c9a08b73e97ddb716fd307800f58efb9bcb0e
-    Reviewed-on: https://code.wireshark.org/review/19739
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2a906b9
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Wed Apr 26 22:51:30 2017 +0200
-
-    ua3g: update decoding of START_RTP message (new compressors and new parameter)
-    
-    Change-Id: Ic5bd9afc2af14a64d074d598f1e185252308008b
-    Reviewed-on: https://code.wireshark.org/review/21357
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3f7f131
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Apr 27 09:28:25 2017 -0400
-
-    packet-rgmp.c: Ensure pinfo->dst is a valid IPv4 address
-    
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1243
-    Bug: 13646
-    Change-Id: I2174e79dd2a9679f099c87c55c33984aca891d22
-    Reviewed-on: https://code.wireshark.org/review/21368
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 92e61ed
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Apr 26 20:12:21 2017 +0200
-
-    cmake: cleanup package variable
-    
-    Do not print a message for a variable if the package does not provide it
-    (e.g. "Git includes: ").
-    
-    Change-Id: Ife5e58055c4eb24218b543f52fb7d7882dc1e04e
-    Reviewed-on: https://code.wireshark.org/review/21359
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit f045d17
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Apr 26 20:03:05 2017 +0200
-
-    CMake: prevent confusing "Git NOT FOUND" in CMake 3.1.3
-    
-    Change-Id: Ia7c03220f49ff862bf05a34727bf5c99297deeab
-    Reviewed-on: https://code.wireshark.org/review/21358
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit f7fdc06
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Apr 27 17:15:56 2017 +0200
-
-    lcsap fix conflicting entry in its value_string
-    
-    Field 'Positioning Method' (lcsap.pos_method) has a conflicting entry in its value_string: 15 is at indices 15 (Reserved for other location technologies) and 31 (Reserved for network specific positioning methods))
-    
-    Change-Id: If0db3d7466924da82e1307717b79dd3e4c2bdf6e
-    Reviewed-on: https://code.wireshark.org/review/21382
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3e038cb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Apr 27 09:59:06 2017 +0200
-
-    DSR: fix conflicting entry in its value_string
-    
-    Field 'Type' (dsr.option.err.type) has a conflicting entry in its value_string: 129 is at indices 3 (Unknown flow) and 4 (Default flow unknown))
-    
-    Change-Id: I06e31b9dd5f4887d2590a8dc0efa6d6706a5aff7
-    Reviewed-on: https://code.wireshark.org/review/21377
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bba1e38
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Apr 27 15:23:25 2017 +0200
-
-    t35: fix conflicting entry in its value_string
-    
-     Field 'H.225 Manufacturer' (h225.Manufacturer) has a conflicting entry in its value_string: 67108994 is at indices 3 (Siemens AG) and 13 (SITK Institut fuer Telekommunikation GmbH & Co KG))
-    
-    Field 'H.245 Manufacturer' (h245.Manufacturer) has a conflicting entry in its value_string: 67108994 is at indices 3 (Siemens AG) and 13 (SITK Institut fuer Telekommunikation GmbH & Co KG))
-    
-    Change-Id: I6b08ffce5e8335be0f31dda0a9530afef2950f09
-    Reviewed-on: https://code.wireshark.org/review/21379
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ca8a340
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Apr 27 16:14:48 2017 +0200
-
-    ieee802.11: fix conflicting entry in its value_string
-    
-    WARNING **: Field 'Rx STBC' (wlan.vht.capabilities.rxstbc) has a conflicting entry in its value_string: 2 is at indices 2 (1 to 2 Spatial Stream Supported) and 5 (160MHz and 80+80 Supported))
-    
-    Change-Id: I7b94a88d8b12b3c0e485d0cade0e9918668a7342
-    Reviewed-on: https://code.wireshark.org/review/21380
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f643169
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Apr 27 09:15:01 2017 -0400
-
-    [OpenSafety] Bugfix invalid length calculation.
-    
-    Length calculation leads to -1, which will result in a large malloc
-    
-    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1212
-    Bug: 13649
-    Change-Id: Iccb78b8c8ec9ca8e8f97bc12d0d8f41526d1f791
-    Reviewed-on: https://code.wireshark.org/review/21367
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a1152a2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Apr 27 09:50:34 2017 -0400
-
-    packet-sigcomp.c: Prevent large shift
-    
-    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1232
-    Bug: 13641
-    Change-Id: I6e53d07dd03a5b637ca27884fad32ba5f7a85d0e
-    Reviewed-on: https://code.wireshark.org/review/21369
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9290358
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Apr 27 09:58:14 2017 -0400
-
-    packet-netsync.c: Prevent large shift
-    
-    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1221
-    Bug: 13639
-    Change-Id: I0b67a270460473917f2481f79f404e4599727508
-    Reviewed-on: https://code.wireshark.org/review/21370
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b23536f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Apr 27 14:58:58 2017 +0200
-
-    [Diameter] Update experimental result codes according to 3GPP TS 29.230
-    V14.4.0 (2017-03).
-    
-    Change-Id: Ia9624ca6668dea8f673a70eb87482cd05238e920
-    Reviewed-on: https://code.wireshark.org/review/21365
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8d72865
-Author: Pavel Strnad <pavel_strnad@hotmail.com>
-Date:   Thu Apr 27 13:40:26 2017 +0200
-
-    S1AP: fix dissection of MS Classmark 2 and MS Classmark 3 IEs
-    
-    Bug: 13666
-    Change-Id: If65ba54db3541575fb71d1cd88a2fd3c47ef95c3
-    Reviewed-on: https://code.wireshark.org/review/21364
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    (cherry picked from commit 8a3e4650674a36fdfe7b38c60c8d83b4dfec0d11)
+    Reviewed-on: https://code.wireshark.org/review/22369
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 6471297
-Author: Adrian Simionov <daniel.simionov@gmail.com>
-Date:   Thu Apr 27 20:49:29 2017 +1000
-
-    [docsis->Annex C] Fix TLV 45 decoding
-    
-    Change-Id: I23830283c1a3323cfb3b72da1e329c72817119ab
-    Reviewed-on: https://code.wireshark.org/review/21362
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 265ed3e
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Apr 27 13:03:42 2017 +0200
-
-    [Diameter] Add a table for subdissectiong AVPs for VENDOR_VERIZON
-    
-    Change-Id: I37397e590f294d209b89fe868b365cafb5343464
-    Reviewed-on: https://code.wireshark.org/review/21363
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9f8c229
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 26 18:58:43 2017 -0700
-
-    Add/expand comments, add/shuffle #defines.
-    
-    Attempt to make the various metadata headers, and the code that
-    constructs them, a bit clearer.
-    
-    (Also, it's VeriWave; be consistent.)
-    
-    Change-Id: I0bb7d70f547d492c4947ceb313888991f2d374f2
-    Reviewed-on: https://code.wireshark.org/review/21360
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 54d92cd
-Author: Rémy Léone <remy.leone@gmail.com>
-Date:   Tue Apr 11 10:37:13 2017 +0200
-
-    Refactor header ie dissection
-    
-    - Change title of IE subtree
-    - extract dissect_802154_enhanced_beacon_filter
-    - Adding reference to the IEEE 802.15.4 standard
-    - fix Typo
-    - Explicit case of header termination
-    
-    Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a
-    Reviewed-on: https://code.wireshark.org/review/21187
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2c921eb
+commit e958a26
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 25 23:29:58 2017 -0400
+Date:   Thu Jun 22 17:02:35 2017 -0400
 
-    Add proto_tree_add_item_ret_uint64
+    Properly find packet comments "field" for protocol hierarchy stats.
     
-    Just like proto_tree_add_item_ret_uint, but with 64-bit support
+    That way it can be properly filtered out.
+    This was broken when pkt_comments was switched to a pino and
+    wasn't available in the protocol filters list.
     
-    Change-Id: Ie0cbfda9e63bf21e85df2d674e391a6c0abe92f7
-    Reviewed-on: https://code.wireshark.org/review/21355
+    Change-Id: Ie3f2b4f25eeb11be57111c98be87e33e0849174b
+    Reviewed-on: https://code.wireshark.org/review/22363
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 66c2f5b5f17c3873d0b9e6ea853ccf7bf8c7062d)
+    Reviewed-on: https://code.wireshark.org/review/22364
 
-commit 24c9396
-Author: Holger Hans Peter Freyther <holger@moiji-mobile.com>
-Date:   Wed Apr 26 16:49:31 2017 +0200
-
-    m2ua: Export the m2ua dissector for lua scripts or similar
-    
-    Make Dissector.get("m2ua"):call() work from within lua. So far
-    only m3ua, m2pa were exported to other dissectors.
-    
-    Change-Id: I3350c3f4b2614fa07254306464c5fdffbadd4f3b
-    Reviewed-on: https://code.wireshark.org/review/21351
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 50a1f90
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Apr 26 15:44:29 2017 +0200
-
-    FindPOD.cmake: look for pod2html.bat
-    
-    Strawberryperl 5.24.1.1 installs "pod2man", "pod2man.bat" and
-    "pod2html.bat", but not "pod2html" so find_program cannot locate it.
-    
-    Change-Id: Id52ee7e77bbbfc8c2fcc6ab66c498d4818f54bf8
-    Reviewed-on: https://code.wireshark.org/review/21350
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 35f620c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Apr 24 18:14:29 2017 +0200
-
-    cmake: make Cygwin optional
-    
-    Cygwin is not needed if the documentation is not built (i.e. asciidoc,
-    docbook, xsltproc are not needed). Via Chocolatey the following packages
-    can be installed: git, winflexbison, strawberryperl.
-    
-    Change-Id: Ib13d144321cf6d2ed5c3346a2ae271de983deada
-    Reviewed-on: https://code.wireshark.org/review/21316
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 46b105d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Apr 24 19:17:25 2017 +0200
-
-    Remove runlex.sh script, just run lex directly
-    
-    This removes the need for sh (and Cygwin) on Windows to build Wireshark.
-    
-    runlex.sh (added in commits 5be4499a and 517d6d57) was added because
-    older flex had quirks with its options (and the --header(-file) option
-    was not available). The minimum required flex version for reentrant
-    scanners (2.5.6) does not have these issues though, so remove the step.
-    
-    Change-Id: I73c82bb329e2130481efca94809dc60b86dcbafe
-    Reviewed-on: https://code.wireshark.org/review/21315
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a8d9777
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Apr 24 17:48:16 2017 +0200
-
-    cmake: remove dependency on sed
-    
-    runlex.sh does not need sed anymore since v2.3.0rc0-2386-g64f83641ad.
-    Since building docs already depends on Perl, let's use Perl instead.
-    
-    Change-Id: Id7e923e47001cfd32c8cef89960377026464f2ee
-    Reviewed-on: https://code.wireshark.org/review/21314
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 821a346
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Apr 25 22:01:21 2017 +0200
-
-    ISUP: restore number indicators2 display like what was done in master-1.12
-    
-    proto_tree_add_bitmask_list() should avoided as there is an interpreted field.
-    
-    Bug: 13588
-    Change-Id: Iec6bf9bb4002123b6913fbee6287472aaf9bc00b
-    Reviewed-on: https://code.wireshark.org/review/21340
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit b9adb80
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Tue Apr 25 17:31:39 2017 +0200
-
-    ua3g: fixed "GET_PARAM_RESPONSE" message decoding (firmware version) and display
-    
-    Change-Id: Ifb834d4895fda129878657468d21e3afc65cc5d3
-    Reviewed-on: https://code.wireshark.org/review/21339
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b861445
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Tue Apr 25 23:35:27 2017 +0200
-
-    ua3g: minor change in "UNSOLICITED" message decoding
-    
-    Display "Not Applicable" instead of "Unknown" when the "Additional VTA Type" is not set (0),
-    which is the case with 2G and 3G terminals.
-    
-    Change-Id: I178248e1de18176710fe978ebf90e99486e0ec7e
-    Reviewed-on: https://code.wireshark.org/review/21346
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8012dcc
+commit 76b1d48
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Apr 26 08:28:48 2017 +0200
-
-    Qt: Remove semicolon behind Q_UNUSED macro
-    
-    Change-Id: Ief5f7bca5d110df8958307b58fc11bf740787dfd
-    Reviewed-on: https://code.wireshark.org/review/21349
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 81bad32
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Apr 26 08:27:10 2017 +0200
-
-    Qt: Remove semicolon behind Q_UNUSED macro, part 2
-    
-    Change-Id: Id27a93c9a76b554bb2e98199d08d3d9604550889
-    Reviewed-on: https://code.wireshark.org/review/21348
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 30d98d1
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Apr 25 22:51:53 2017 +0200
-
-    Qt: Remove semicolon behind Q_UNUSED macro
-    
-    Change-Id: I75ff975216da23447b94bc513671ac269c52b7dc
-    Reviewed-on: https://code.wireshark.org/review/21342
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 3b5cfa9
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Apr 25 22:48:23 2017 +0200
-
-    Qt: Don't use _U_ for unused parameters in C++
-    
-    Change-Id: If7acab5f438bb20b053fdcfef86b2f06765b5321
-    Reviewed-on: https://code.wireshark.org/review/21341
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit f493bad
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Apr 25 21:47:29 2017 -0700
-
-    Fix no-extcap build.
-    
-    Change-Id: I9f01264bf5f0c28a4d871f6d983e9efed1c23259
-    Reviewed-on: https://code.wireshark.org/review/21347
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0557fe1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Apr 25 22:43:32 2017 +0200
-
-    Qt: fix compilation without pcap.
-    
-    Change-Id: Ia0fe79157f21fd0b1c0e5195c902ae07c55ca253
-    Reviewed-on: https://code.wireshark.org/review/21343
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5b1a802
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Apr 20 15:20:33 2017 +0200
-
-    tools: improve debian-setup.
-    
-    Change-Id: If547e0e1c821d3696eba0f303e8ab0769b1fabb4
-    Reviewed-on: https://code.wireshark.org/review/21245
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 451731f
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Apr 24 23:20:39 2017 +0200
-
-    cmake: fix build without libxml2
-    
-    When LibXml2 is not found, the LIBXML2_LIBRARIES is set to
-    "LIBXML2_LIBRARIES-NOTFOUND" rather than an empty string (as other
-    FindXxx modules do). This results in an error because the variable is
-    used in target_link_libraries (via epan_LIBS).
-    
-    As workaround, explicitly clear the variable to ignore the cache entry.
-    
-    Change-Id: I9e164f9c175b23559ac6bc37f9aca5f41df79d1f
-    Reviewed-on: https://code.wireshark.org/review/21321
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+Date:   Thu Jun 22 10:48:34 2017 -0400
 
-commit bfd1461
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Apr 25 12:13:01 2017 +0200
-
-    ieee80211: fix stack-use-after-return
+    Qt: Restore multi custom column width and align
     
-    Bug: 13662
-    Change-Id: I26c53ecc78005b26908d74877814be22924848bc
-    Fixes: v1.11.3-rc1-2029-g4b8b83407a ("Support for IEEE 802.11ad")
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1268
-    Reviewed-on: https://code.wireshark.org/review/21333
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 907d05d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Apr 25 11:36:18 2017 +0200
-
-    print: Avoid shadowing a global variable
+    Put custom column field settings in quotes in the recent file to
+    support multi custom columns which contains space.  Otherwise the
+    space will be removed in prefs_get_string_list() and the field will
+    not match when reading the recent file.
     
-    Change-Id: I9c04bc1d6fc5511d404987dd94eee342e0d75442
-    Reviewed-on: https://code.wireshark.org/review/21332
+    Change-Id: Ic6e2b1e02d68970a4e11fbecbe55a7b10f8b10dd
+    Reviewed-on: https://code.wireshark.org/review/22349
     Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 0d3da40
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Tue Apr 25 13:49:43 2017 +0300
-
-    UMTS FP: Cosmetic fixes
-    
-    Some fixes to comments and spaces
-    
-    Change-Id: I0b1abf9619f2aab2b30120f4086d99332171b69d
-    Reviewed-on: https://code.wireshark.org/review/21334
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cd58e67
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Apr 25 10:10:38 2017 +0200
-
-    etypes: Add ETHERTYPE_REALTEK
-    
-    The definition was found in RTL8324 / RTL8326 datasheet.
-    
-    Change-Id: Idaec6bb13ee1e321d6fe24c2a567bd9cd2a9d27d
-    Reviewed-on: https://code.wireshark.org/review/21331
+    (cherry picked from commit 578f2a15bb7534b3aad315a92989b6e4d577e4c3)
+    Reviewed-on: https://code.wireshark.org/review/22358
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit f9f2b84
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Apr 25 08:18:05 2017 +0200
-
-    Qt: Make text in SimpleDialog selectable by mouse
-    
-    This makes it easier to copy error messages.
-    
-    Change-Id: I39284d9b2d716336c6fc4b211e5346abcebf0aee
-    Reviewed-on: https://code.wireshark.org/review/21326
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 4ac4ab3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Apr 25 00:45:09 2017 -0700
-
-    Don't crash if we have no BOOTP option preferences.
-    
-    wmem_list_foreach() crashes if handed a null pointer, and saved_uat_opts
-    will be null if there are no BOOTP option preferences.  Don't do the
-    "free saved UAT options" stuff if there aren't any saved UAT options.
-    
-    Bug: 13655
-    Change-Id: I88e64c6ebec88fc04a5adc0a85d378bbba49b383
-    Reviewed-on: https://code.wireshark.org/review/21329
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 77751c9
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Apr 15 23:30:30 2017 +0200
-
-    Qt: Add interface toolbar support
-    
-    An extcap utility can provide configuration for controls to use in a
-    GUI interface toolbar.  This controls are bidirectional and can be
-    used to control the extcap utility while capturing.
-    
-    This is useful in scenarios where configuration can be done based on
-    findings in the capture process, setting temporary values or give other
-    inputs without restarting current capture.
-    
-    Todo:
-    - Add support for Windows
-    
-    Change-Id: Ie15fa67f92eb27d8b73df6bb36f66b9a7d81932d
-    Reviewed-on: https://code.wireshark.org/review/19982
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit cd55bd2
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Sun Apr 23 22:02:09 2017 +0300
-
-    UMTS FP: Improved MAC multiplexing detection
-    
-    Previous detection was based on DCH ID 31 or 24 and specific TB Size.
-    New method checks if the 'Transport Format' looks like the commonly used format for DCCH over DCH or DCH ID 24 and specific TB size (To not break that special case which I'm not familiar with personally)
-    
-    Change-Id: I59fe7772ec05f7cc15351ef78276085e25570461
-    Reviewed-on: https://code.wireshark.org/review/21304
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d3b2e44
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Sun Apr 23 23:59:41 2017 +0200
-
-    ua3g: fixed/updated "unsolicited" and "version information" messages
-    
-    Change-Id: If006c36a21556a8fb690401677e9ca62a594d82b
-    Reviewed-on: https://code.wireshark.org/review/21307
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dcaad43
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Apr 24 22:52:52 2017 +0200
-
-    GSM SMS: add more lower layer info for reassembly and switch preference to on by default
-    
-    Change-Id: I3faf15c326d14e246975094ad31431eba2404d8c
-    Ping-Bug: 13592
-    Reviewed-on: https://code.wireshark.org/review/21320
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit cb089dd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Apr 24 21:16:37 2017 +0200
-
-    GSM SMS: fix display of reassembled 8 bits SMS
-    
-    Change-Id: I0052fb1f311f18180fbc7c6b8bd2fbf23215ad67
-    Reviewed-on: https://code.wireshark.org/review/21319
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 13fbdfc
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Mon Apr 24 22:20:44 2017 +0200
-
-    fuzzshark: try to fix oss-build, remove oss-fuzzshark.c in old location.
-    
-    Step #3: /src/wireshark/tools/oss-fuzzshark.c:190:2: warning: implicit declaration of function 'wtap_init' is invalid in C99 [-Wimplicit-function-declaration]
-    (https://oss-fuzz-build-logs.storage.googleapis.com/log-472514ce-1a41-4f14-8798-d45084212a65.txt)
-    
-    Change-Id: I47715bdf55c20124a80da51d3c8812db1d8d94cf
-    Reviewed-on: https://code.wireshark.org/review/21317
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-
-commit 6cbea5c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Apr 22 00:09:35 2017 -0400
-
-    Convert BOOTP options into a dissector table.
-    
-    This allows for much easier addition or overriding of options and use of Decode As.
-    This includes adding heuristic dissector tables for vendor specific options.
-    
-    Change-Id: If52c00bbc23d89386ba3e777600f665609856de0
-    Reviewed-on: https://code.wireshark.org/review/21297
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4b2ee36
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 23 23:17:15 2017 +0200
-
-    GSM SMS: optionally use GSM-MAP info to perform reassembly (off by default)
-    
-    Change-Id: I62c7a04e62167bd2d68d861f1d8d854f3159b159
-    Ping-Bug: 13592
-    Reviewed-on: https://code.wireshark.org/review/21306
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 9785aed
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sun Apr 23 20:28:05 2017 +0200
-
-    oss-fuzzshark: Copy to separate directory, add build script.
-    
-    (oss-fuzz part https://github.com/google/oss-fuzz/pull/544)
-    
-    Change-Id: I54cf7a7b1aaa49582b5fff8bd034187aa6a9bdec
-    Reviewed-on: https://code.wireshark.org/review/21302
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 20d1db6
-Author: Adrian Simionov <daniel.simionov@gmail.com>
-Date:   Mon Apr 24 23:13:13 2017 +1000
-
-    [docsis->bpkm-attr] Updated Attribute 16 Error Codes
-    
-    Change-Id: If9156b4a73e7db006daf4ab4e278379f0e39905f
-    Reviewed-on: https://code.wireshark.org/review/21313
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4dde22c
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Apr 24 14:37:47 2017 +0200
-
-    [MIP6] Fix length calculation, APN name and PCO.
-    
-    Change-Id: I2a26ef0bbde07071f72c19d9465adf02cb177816
-    Reviewed-on: https://code.wireshark.org/review/21311
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9ccba0e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Apr 18 08:10:53 2017 +0000
-
-    Revert "Make the set of static routines match that in the current tip SQLite."
-    
-    This reverts commit 96c72df2dfe9c84bc2716352ebe1876ddd8ceaf4.
-    
-    Generated a lot of warning (-Wmissing-prototypes)
-    and i try to kept a sync branch on https://github.com/alagoutte/sqlite/tree/wireshark
-    
-    Change-Id: I42252a6e736f96783a9fa9805b84e525fe11726e
-    Reviewed-on: https://code.wireshark.org/review/21182
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 860abb0
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Mon Apr 24 07:57:32 2017 +0200
-
-    TFSHARK: Fix clobbing warning for variable success
-    
-    Without setting the success variable as volatile my build fails
-    with warning "error: variable success might be clobbered by 'longjmp' or 'vfork'"
-    
-    Change-Id: Ic7d4a9b8be4bf9211127dcf5a6bb4bef8bbcd7a9
-    Reviewed-on: https://code.wireshark.org/review/21310
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e52c95c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 23 16:48:17 2017 -0700
-
-    Move UI-only stuff out of libwireshark.
-    
-    Packet ranges are used only in the UI; move the packet range stuff into
-    libui.
-    
-    Don't pass a print_args_t structure to libwireshark packet-printing
-    routines, just pass the few parameters they need.  Move the declaration
-    of print_args_t into file.h.
-    
-    Change-Id: Icff5991eea7d7d56f33b4716105895263d275bcf
-    Reviewed-on: https://code.wireshark.org/review/21308
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 751e078
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 23 13:18:02 2017 -0700
-
-    Print first-pass read errors at the end.
-    
-    That way, they don't, for example, get lost as a result of being
-    scrolled off the screen by output from the second pass.
-    
-    Also, do the post-processing of output regardless of whether we got read
-    errors or not, and fix a code error hidden by a call to tshark_debug().
-    
-    Change-Id: I389c7c794f4dd5fda6e4c50ce480802c92701866
-    Reviewed-on: https://code.wireshark.org/review/21305
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e2f76f9
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sun Apr 23 21:00:31 2017 +0200
-
-    tshark: make success volatile.
-    
-    /home/wireshark/builders/ubuntu-x86-64-petri-dish/ubuntu-x86-64-petri-dish/build/tshark.c: In function ‘main’:
-    /home/wireshark/builders/ubuntu-x86-64-petri-dish/ubuntu-x86-64-petri-dish/build/tshark.c:653:12:
-    error: variable ‘success’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
-    
-    Change-Id: I793962c71b0ebfafc7c09b1d865cfa774456bb3a
-    Reviewed-on: https://code.wireshark.org/review/21303
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5ac7113
-Author: sswsdev <sswsdev@gmail.com>
-Date:   Sun Apr 23 19:20:26 2017 +0300
-
-    UMTS FP: Fix bug in heuristic dissectors
-    
-    The code was not allowing UDP port types, should ONLY allowed UDP ports.
-    
-    Change-Id: Ida5467313cbc24fcbac7cd432fb4a018cc00bdef
-    Reviewed-on: https://code.wireshark.org/review/21301
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 69762f5
+commit 9927004
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Apr 23 08:17:34 2017 -0700
+Date:   Wed Jun 21 10:45:29 2017 -0400
 
-    [Automatic update for 2017-04-23]
+    TCP: Make the header length display consistent with IPv4.
     
-    Update manuf, services enterprise-numbers, translations, and other items.
+    Format tcp.hdr_len in the tree similar to ip.hdr_len. Add comments
+    noting that they should be consistent.
     
-    Change-Id: If8e6efa61c4c2808c51c585b0c61fd76a321c3fd
-    Reviewed-on: https://code.wireshark.org/review/21298
+    Change-Id: Ic64282d8386c8ed339811bc9c22b5962c707d292
+    Reviewed-on: https://code.wireshark.org/review/22314
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit dc9127d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 23 01:29:23 2017 -0700
-
-    Rename read{_cap}_file() to process{_cap+_file().
-    
-    They might read the file once or twice, but the key is that they (and
-    what they call) are doing the work of processing the file's contents.
-    
-    Change-Id: I2df6257c55ff5ace944f1a1db5e2aec456ed2038
-    Reviewed-on: https://code.wireshark.org/review/21293
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e9f5e04
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 23 01:18:02 2017 -0700
-
-    Just have read_cap_file()/read_file() return a success/failure indication.
-    
-    No need to report the precise error code - it's already reported the
-    error.
-    
-    Change-Id: Ib52daf094253deac2a10d16793ebf0f42581afd6
-    Reviewed-on: https://code.wireshark.org/review/21292
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 045d1dc
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sun Apr 16 21:38:01 2017 +0200
-
-    HTTP: Add status code description
-    
-    This commit adds the IANA status code description to the tree.
-    
-    Furthermore it updates the registered status codes
-    s. https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-    
-    Change-Id: I6ec57569b784a137b57532a092c8781dec545039
-    Reviewed-on: https://code.wireshark.org/review/21162
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7eab596
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Apr 22 18:46:23 2017 +0200
-
-    slsk: fix infinite loop
-    
-    If check_slsk_format reports that the buffer does not contain the
-    expected data, do not try to find more items (break out of the loop).
-    
-    In one case, an infinite loop would occur because the index variable was
-    not incremented when the check fails. In all other cases, it would
-    perform up to 2^32 calls to check_slsk_format per loop (with the same
-    offset parameter, so no exception is triggered).
-    
-    Change-Id: I4b7fa10a36fee2551fa46831bcecd6bcd9f342d1
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1200
-    Bug: 13631
-    Reviewed-on: https://code.wireshark.org/review/21284
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a4eb68b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 22 22:22:00 2017 -0700
-
-    Rename some routines to better reflect what they do.
-    
-    In TShark, rename load_cap_file() to read_cap_file(); this is TShark,
-    not Wireshark, so you're not "loading" a file to be manipulated through
-    the GUI.
-    
-    In TFShark, rename it to "read_file()"; not only are we not loading it,
-    it's not even necessarily a capture file.
-    
-    Change-Id: I122b46ecd8cb7de9c1e1c249ba6c08fdeb93f7e2
-    Reviewed-on: https://code.wireshark.org/review/21291
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5e74b31
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Apr 23 00:15:12 2017 +0100
-
-    Snort: restore timestamp before showing alert
-    
-    Change-Id: I4772c9c46b7a79a7139229bcb43ee6c84109a26b
-    Reviewed-on: https://code.wireshark.org/review/21289
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6fdf8eb
-Author: Björn Ruytenberg <bjorn@bjornweb.nl>
-Date:   Sat Apr 22 23:33:57 2017 +0200
-
-    DOF: Fix buffer overflow (read)
-    
-    Perform sanity check on buffer length parsed from data. Check buffer
-    size before reading value.
-    
-    Change-Id: I8beaf8860b39426d79867b0dd2221e57e32da8e0
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1151
-    Bug: 13608
-    Reviewed-on: https://code.wireshark.org/review/21287
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f42b2a5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Apr 18 14:47:43 2017 +0000
-
-    aruba (PAPI): fix conflicting entry in its value_string
-    
-    Field 'Destination Port' (papi.hdr.dest.port) has a conflicting entry in its value_string: 8999 is at indices 143 (LAST_SERVICE) and 144 (MESSAGE_HANDLER))
-    
-    Field 'Source Port' (papi.hdr.src.port) has a conflicting entry in its value_string: 8999 is at indices 143 (LAST_SERVICE) and 144 (MESSAGE_HANDLER))
-    
-    Check from Services.pm and same value for both...
-    
-    Change-Id: I8ff56bfbee525e894235a9aea62e0f1d2a9b0ebc
-    Reviewed-on: https://code.wireshark.org/review/21191
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 003598e
-Author: sswsdev <sswsdev@gmail.com>
-Date:   Sat Apr 22 15:36:10 2017 +0300
-
-    UMTS Iub: Fixed some comments and replaced tabs with spaces
-    
-    Changes done to the FP, MAC and RLC dissectors
-    
-    Change-Id: I7ccf229a7a1d9a8c04d8ac04e74f03253eb3bff0
-    Reviewed-on: https://code.wireshark.org/review/21281
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit b370c02a02cef0e26f327342e085fa45b4e06e3f)
+    Reviewed-on: https://code.wireshark.org/review/22355
 
-commit e763fca
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 22 15:39:24 2017 -0700
-
-    Update a comment.
-    
-    Change-Id: Ice2727d691719a10c7163b9496107ec95fbd2e3b
-    Reviewed-on: https://code.wireshark.org/review/21288
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 22f05d6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Apr 19 21:43:49 2017 -0400
-
-    packet-quakeworld.c: Fix potential out of bounds error.
-    
-    Overflow can occur while writing to a buffer.
-    
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1179
-    Bug: 13624
-    Change-Id: I7511c43ed67f81d246e3eb66e092353e2ab4924c
-    Reviewed-on: https://code.wireshark.org/review/21235
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 26d5b3d
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Sat Apr 22 15:08:10 2017 +0200
-
-    ua3g: fixed/updated init message (vta type values)
-    
-    Change-Id: I8c500d6e049e9243c2c4b283731674bf3fc0a521
-    Reviewed-on: https://code.wireshark.org/review/21282
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c70d2ec
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Sat Apr 22 13:17:37 2017 +0200
-
-    ROS: Harden ROS dissection
-    
-    Make sure that on a OID search an actual OID is available to search for.
-    
-    Bug: 13637
-    Change-Id: I36f84cce5506f003d2a30a17f8671d5e22070612
-    Reviewed-on: https://code.wireshark.org/review/21280
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 951ac6c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 21 12:25:57 2017 -0700
-
-    Put all the capture dissector structures into epan/capture_dissectors.h.
-    
-    Don't scatter them amongst various other headers.
-    
-    Change-Id: I243954222cd4ad3e6bbe8b4d1dd25ee4952f87d6
-    Reviewed-on: https://code.wireshark.org/review/21277
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4bf38d7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Apr 21 13:58:53 2017 +0200
-
-    capwap: fix conflicting entry in its value_string
-    
-     Field 'Cisco Element ID' (capwap.control.cisco.element_id) has a conflicting entry in its value_string: 125 is at indices 31 (SPAM AP Led State) and 34 (AP Led State Config))
-    
-    Rename also some variable name...
-    
-    Change-Id: I4e3c1fa925492a570dad47a3d274d1f3e950c483
-    Reviewed-on: https://code.wireshark.org/review/21271
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 5d1a2a5
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Fri Apr 21 13:56:49 2017 +0200
-
-    UCP: Update Xser types
-    
-    Updated Xser types according to
-    http://documents.swisscom.com/product/1000174-Internet/Documents/Landingpage-Mobile-Mehrwertdienste/UCP_R4.7.pdf
-    
-    Bug: 13636
-    Change-Id: I4591c37534da0ccf1ee4352eaff00156eefff519
-    Reviewed-on: https://code.wireshark.org/review/21270
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 103c8b7
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Apr 21 15:46:15 2017 +0200
-
-    LTE RRC: insert an optional separator before adding message name to info column
-    
-    Bug: 13634
-    Change-Id: I9585d915b9bc9c895eabeed3d3d5453e94c31789
-    Reviewed-on: https://code.wireshark.org/review/21274
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0f41da9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Apr 21 14:05:01 2017 +0200
-
-    cast: fix conflicting entry in its value_string
-    
-     Field 'AudioCodec' (cast.audio) has a conflicting entry in its value_string: 1 is at indices 0 (G711) and 1 (G729))
-    
-    Change-Id: I094a85a84ca1e79d4cf817bd5222e902a34f3741
-    Reviewed-on: https://code.wireshark.org/review/21272
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2c52d95
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 21 03:10:21 2017 -0700
-
-    Code in epan/dissectors may require GeoIP.h, so include LIBGEOIP_FLAGS.
-    
-    Change-Id: I31bd53c49906db24b64fa3f1e3078b0658db3158
-    Reviewed-on: https://code.wireshark.org/review/21269
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 67a5d9b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 19:08:00 2017 -0700
-
-    Use the cfile_ failure_message routines in androiddump.
-    
-    Change-Id: Ic310eaafac054db7736c503252062c3dd3e00a99
-    Reviewed-on: https://code.wireshark.org/review/21265
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9e4c018
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 21:25:46 2017 -0700
-
-    Code in epan/crypt may require gcrypt, so include LIBGCRYPT_FLAGS.
-    
-    Change-Id: I7f6745eb39bae6ae37a63178bcd60c75fd9e9de2
-    Reviewed-on: https://code.wireshark.org/review/21268
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 41a917f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 20:29:16 2017 -0700
-
-    Update URL.
-    
-    Change-Id: Ice4235b6b2cda947ee5059380ad5a49556bb3e6a
-    Reviewed-on: https://code.wireshark.org/review/21267
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5c5a17b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Apr 18 15:09:32 2017 +0000
-
-    nstrace (mep/rpc): fix conflicting entry in its value_string
-    
-    Field 'Status Code' (nstrace.mep.errcode) has a conflicting entry in its value_string: 341 is at indices 7 (LARGE DATA) and 8 (SMALL DATA))
-    
-    Field 'Status Code' (nstrace.rpc.errcode) has a conflicting entry in its value_string: 341 is at indices 7 (LARGE DATA) and 8 (SMALL DATA))
-    
-    Change-Id: I75aba4140cbbcd412087e951bd35543f14ec1281
-    Reviewed-on: https://code.wireshark.org/review/21193
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 21178a0
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Wed Apr 19 08:57:33 2017 +0200
-
-    EAPOL-MKA: Add parameter set info to info column
-    
-    Show which parameter sets are present in the info column, and some more
-    relevant info. Prepare all parameter set handler function interfaces to
-    be able to add relevant info.
-    
-    Change-Id: Idd206eebc4d7196511e118fbf9e30919fb38328e
-    Reviewed-on: https://code.wireshark.org/review/21218
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a967ca5
+commit 9bc595f
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Apr 20 23:15:38 2017 +0200
-
-    Fixes for sfloat_ieee_11073_val_to_repr() function
-    
-    - when having a special value, leave function once buffer is written
-    - give the right buffer length to g_snprintf() function
-    
-    Bug: 13590
-    Change-Id: Iecf1456686b6e92a7cfcf8ed6d8619541ad50ace
-    Reviewed-on: https://code.wireshark.org/review/21260
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 70b6e40
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Apr 20 08:44:52 2017 -0400
-
-    dwarf.c: Fix potential too large shift
-    
-    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1167
-    Bug: 13616
-    
-    Change-Id: I43ab629ad8368bf672d1c079219d6b055c431e86
-    Reviewed-on: https://code.wireshark.org/review/21249
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 648b6eb
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Apr 20 23:45:19 2017 +0200
-
-    mergecap: remove a now useless variable
-    
-    Change-Id: I9acbbc03cbc2719abbe5b3ade62fc1c4e92cb8ff
-    Reviewed-on: https://code.wireshark.org/review/21262
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3dd274c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 14:25:59 2017 -0700
-
-    Use more of the cfile_ failure message routines.
-    
-    Change-Id: Iceb15f15622d391da0332e6ed55aac0e74abd0e2
-    Reviewed-on: https://code.wireshark.org/review/21261
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 804d3f6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 14:07:06 2017 -0700
-
-    Use cfile_write_failure_message() in the randpkt code.
-    
-    Change-Id: I32ef7ff85f854782e5dd02c3e7f12436a120bc13
-    Reviewed-on: https://code.wireshark.org/review/21259
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 64ec2b2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 13:25:21 2017 -0700
-
-    Take the error message generation out of the merge_files routines.
-    
-    Have them just return the information needed for the caller to produce
-    an error message, and have the callers use the new cfile_ routines for
-    reporting errors.
-    
-    This requires that the "write failure alert box" routine take the
-    *input* file name as an argument, so that, on a merge, if the problem is
-    that a record from a given input file can't be written out to the type
-    of output file we're generating, the input file name can be given, along
-    with the record number in that file.
-    
-    Change-Id: If5a5e00539e7e652008a523dec92c0b359a48e71
-    Reviewed-on: https://code.wireshark.org/review/21257
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2e6cb9d
-Author: sswsdev <sswsdev@gmail.com>
-Date:   Fri Apr 14 13:41:37 2017 +0300
-
-    UMTS Iub: Added U-RNTI resolving logic for UEs on DCH
-    
-    The goal is to figure out the U-RNTI for UEs in DCH to
-    preserve a single continous RLC session when the UE moves to FACH
-    (Since the UE ID in FACH is derived from the identity found in the
-    MAC layer, which is sometimes the U-RNTI)
-    UMTS RRC dissector now defines a single 'umts rrc private data'
-    structure as the way to access the actx->private_data field
-    
-    Change-Id: Id0ffcbcdf0a8babe533915855909e250852e46cf
-    Reviewed-on: https://code.wireshark.org/review/21087
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 09e787a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Apr 20 13:05:52 2017 -0400
-
-    sigcomp: Shift operand should be limited to 16 bits
-    
-    Change-Id: I5a6fbcacf874962c361e68fef7402dc775aca658
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1154
-    Bug: 13610
-    Reviewed-on: https://code.wireshark.org/review/21250
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d97ce76
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 11:46:45 2017 -0700
-
-    cf_open() pops up a dialog box on errors; its callers shouldn't do so.
-    
-    Change-Id: I1c65854b5bde1c64d70cb17a13080829f0faa27b
-    Reviewed-on: https://code.wireshark.org/review/21253
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9e9d284
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 11:23:51 2017 -0700
-
-    Have separate routines for open-for-reading and open-for-writing errors.
-    
-    Expand comments while we're at it.
-    
-    Change-Id: I6dcc791eab1c9e323a9572f3d54720d223bdd64b
-    Reviewed-on: https://code.wireshark.org/review/21252
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d09ef61
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 10:14:50 2017 -0700
-
-    Make the command-line and alert-box failure messages more similar.
-    
-    Change-Id: I94af221a0ce8b6b3ff8e0e1b94d5379351ac0962
-    Reviewed-on: https://code.wireshark.org/review/21251
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 46f0c35
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Wed Apr 19 22:37:04 2017 +0200
-
-    noe: reworked EVT_BT_KEY_... message handling
-    
-    Change-Id: I36763e4f1b6bad6c7fd62100164a61a239653646
-    Reviewed-on: https://code.wireshark.org/review/21226
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7312019
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 09:55:35 2017 -0700
-
-    Fix a compiler warning.
-    
-    (Clang FTW!  Is this not an issue on x86-64 macOS, so that it doesn't
-    warn about it, or does it, unlike GCC, require a particular -W flag to
-    warn about non-volatile variables being stomped by setjmp/longjmp?)
-    
-    Change-Id: I253c1ea324feac1372aa4077aaba03c787a47d9f
-    Reviewed-on: https://code.wireshark.org/review/21248
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9b0b2c3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Apr 12 22:04:38 2017 +0200
-
-    Qt: show relative time for the IO Graph in an appropriate unit
-    
-    The GTK+ UI performs automatic formatting of the units (us, ms, s) based
-    on the magnitude of the value (for MIN/MAX/SUM calculations). Internally
-    the numbers are stored as integers (microseconds).
-    
-    The Qt UI did not have this formatting feature yet and would therefore
-    display the values as-is (in microseconds). This patch rescales the Y
-    value and appends an appropriate label (s, ms or us).
-    
-    With multiple graphs, rescaling is disabled completely for simplicity
-    (GTK+ would still try to find an appropriate unit prefix if there are
-    multiple time graphs).
-    
-    Bug: 12828
-    Change-Id: I26ed68fc3497e06ac283a618fee8b673b1b0cf71
-    Reviewed-on: https://code.wireshark.org/review/21062
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 691d803
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Apr 12 00:55:06 2017 +0200
-
-    Qt: Prevent moving other columns on drag and drop
-    
-    This workaround prevents moving around other columns during drag and
-    drop and also transfers the sorting order to the new position.
-    
-    Bug: 13183
-    Ping-Bug: 13540
-    Change-Id: I4609c63557bf3abf06ba417ac1b40cac22a82abc
-    Reviewed-on: https://code.wireshark.org/review/21022
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 2ab4f63
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Apr 19 22:38:09 2017 -0400
-
-    packet-sigcomp.c: Fix potential negative shift
-    
-    Bug: 13619
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1172
-    Change-Id: Ifa5ed88031425701f9cb14c80eb61311e0bba4aa
-    Reviewed-on: https://code.wireshark.org/review/21236
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ba3fbc5
-Author: Max Dmitrichenko <dmitrmax@gmail.com>
-Date:   Wed Apr 19 17:11:43 2017 -0400
-
-    memory leak: Qt code doesn't pass 'parent' argument to some Qt class constructors
-    
-    found with valgrind
-    
-    Change-Id: I2d73bd50a6f0e13b1817c8a518189c0e56558f72
-    Reviewed-on: https://code.wireshark.org/review/21227
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 3e755bb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Apr 19 22:51:45 2017 -0400
-
-    packet-xot.c: Handle potentially large representation of packet sizes
-    
-    Value on wire is 2^x, so represent the field that way.
-    
-    Bug: 13618
-    Change-Id: Ida4a85e1f52b29b8b89fa835f78ef3fff2bde5c9
-    Reviewed-on: https://code.wireshark.org/review/21237
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 6d99d7f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 00:22:16 2017 -0700
-
-    Fix a comment.
-    
-    Change-Id: Ic99602ec405533dcf436463ee26bf312f9dd78f1
-    Reviewed-on: https://code.wireshark.org/review/21240
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bce5ec9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 20 00:19:01 2017 -0700
-
-    Use the new cfile_XXX_failure_message() routines more broadly.
-    
-    Change-Id: I7814b3fd0353f4836ae61cbdbd4e13f659cbcb59
-    Reviewed-on: https://code.wireshark.org/review/21239
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b0c48f3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 19 20:25:59 2017 -0700
-
-    editcap now uses stuff from libui.
-    
-    Change-Id: Ifa5cda67305682909559963ea5ce90cecc0c8e6e
-    Reviewed-on: https://code.wireshark.org/review/21238
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 347a19a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 19 19:21:11 2017 -0700
-
-    Add common routines for command-line libwiretap error reporting.
-    
-    These are similar to the routines added to ui/alert_box.c for dialog-box
-    libwiretap error reporting.
-    
-    This centralizes the knowledge about what to say for various libwiretap
-    errors, removing some duplicate code, and giving more details in some
-    programs.
-    
-    Change-Id: I737405c4edaa0e6c27840f78a8c587a8b3ee120b
-    Reviewed-on: https://code.wireshark.org/review/21234
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9e8bc9f
-Author: Max Dmitrichenko <dmitrmax@gmail.com>
-Date:   Wed Apr 19 17:36:48 2017 -0400
-
-    extcap: fix memory leak
-    
-    found by valgrind
-    
-    Change-Id: I8c5226a08be797ce72ec937138a6681d946fb13c
-    Reviewed-on: https://code.wireshark.org/review/20720
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit a426cf7
-Author: Max Dmitrichenko <dmitrmax@gmail.com>
-Date:   Wed Apr 19 17:29:44 2017 -0400
-
-    packet-xml.c: Fix memory leaks in XML DTD processing (mostly g_* to wmem_* transition)
-    
-    Change-Id: I6766e0ef3d33895ba04bca1347eabdfa854b78b1
-    Reviewed-on: https://code.wireshark.org/review/21229
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 860bfd8
-Author: Max Dmitrichenko <dmitrmax@gmail.com>
-Date:   Wed Apr 19 17:32:14 2017 -0400
-
-    decode as: Fix small memory leak
-    
-    Change-Id: I3b924ff3e81a5b4ca17fcb9a087b7d7520225f34
-    Reviewed-on: https://code.wireshark.org/review/21231
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d1c0f2b
-Author: Max Dmitrichenko <dmitrmax@gmail.com>
-Date:   Wed Apr 19 17:16:28 2017 -0400
-
-    Fix memory leak in create_persconffile_profile
-    
-    found by valgrind
-    
-    Change-Id: I15aef9d78dffac44e36849349dc57b4b36f23de1
-    Reviewed-on: https://code.wireshark.org/review/21228
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9e36106
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 19 15:06:20 2017 -0700
-
-    Have a common "capture file write failure alert box" routine.
-    
-    Take the code from save_record() to pop up an alert box and put it into
-    libui, with the name cfile_write_failure_alert_box().
-    
-    While we're at it, clean up some variable names and comments.
-    
-    Change-Id: If56e649e5afe50e7a20b39720ec96e8fe2983b24
-    Reviewed-on: https://code.wireshark.org/review/21233
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4362e63
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 19 14:43:11 2017 -0700
-
-    Have a common "capture file close alert box" routine.
-    
-    Take the code from cf_read() to pop up an alert box and put it into
-    libui, with the name cfile_read_failure_alert_box().  Use it in a couple
-    of places where we pop up such an error dialog.
-    
-    While we're at it, get rid of the "err" argument to rescan_file();
-    nobody uses what it returns.
-    
-    Change-Id: Iba7099b95de24309359d94eb96f606020e2ff2c3
-    Reviewed-on: https://code.wireshark.org/review/21232
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 26cc3f0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Apr 19 21:05:22 2017 +0200
-
-    pqsql: add salt for GSSAPI
-    
-    Change-Id: Iaab55d4c727b151687b242ad02d938164521e87c
-    Reviewed-on: https://code.wireshark.org/review/21225
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 27da638
-Author: Christian Ullrich <chris@chrullrich.net>
-Date:   Wed Apr 19 16:20:55 2017 +0200
-
-    pgsql: Add missing authentication types
-    
-    Bug: 13622
-    Change-Id: I0813ebb5f506d1e702f84399416994daeb527be2
-    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/21222
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cb018b4
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Wed Apr 19 17:40:02 2017 +0200
-
-    macosx-setup.sh: Allow downloading packages without installation
-    
-    For offline installation, or for checking if all links are working
-    
-    Change-Id: I0447d99b2accf6757b944a02a682b3ee7ed63846
-    Reviewed-on: https://code.wireshark.org/review/21223
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4c13bde
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 18 23:02:38 2017 -0400
-
-    P_Mul: Convert GHashtable -> wmem_map to fix memleaks
-    
-    Change-Id: I7bdd0a483d9744780c18b45ab9fad3de3ed238de
-    Ping-Bug: 13120
-    Reviewed-on: https://code.wireshark.org/review/21215
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d4519ff
-Author: Guy Davies <aguydavies@gmail.com>
-Date:   Tue Apr 18 16:39:46 2017 +0200
+Date:   Thu Jun 22 16:02:40 2017 +0200
 
-    [Diameter] Add Juniper SCG AVPs
+    E.212: update list to Operational Bulletin No. 1126 (15.VI.2017)
     
-    Change-Id: I832a82b4edbfce26e3edceb0f6baed3b7a1c8b62
-    Reviewed-on: https://code.wireshark.org/review/21190
+    Change-Id: Ib91dc1fca0d39b53f5f55223405f473dfa816a84
+    Reviewed-on: https://code.wireshark.org/review/22350
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 89e0bdf
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 18 19:20:48 2017 -0400
-
-    X11: Replace VALUEXX macros and handle endianness "natively."
-    
-    Change-Id: I45d4557377a445c981e6b7cfc1dbe57f586252e5
-    Reviewed-on: https://code.wireshark.org/review/21210
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 39167ab
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Wed Apr 19 12:43:31 2017 +0200
-
-    cmake: FixLibXML2 include
-    
-    Add default setting for the libraries entry, to satisfy windows builds,
-    if no libxml2 has been found
-    
-    Change-Id: I3db026b6b8446eb42c7f30ee63c00a07600948fa
-    Reviewed-on: https://code.wireshark.org/review/21221
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 84e7855
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Apr 19 01:40:25 2017 +0200
-
-    smb-pipe: fix memory leaks from descriptors
-    
-    The values from the requests are used in a later response, so use the
-    packet capture file scope instead.
-    
-    Bug: 13615
-    Change-Id: I480d9dbdc20c64eabea092065245d8687b7fc39f
-    Reviewed-on: https://code.wireshark.org/review/21211
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cfab5ef
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Tue Apr 4 23:23:59 2017 +0200
-
-    Add libxml2 as optional dependency
-    
-    This can be used by dissectors that need to parse out-of-band
-    configuration.
-    
-    Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783
-    Reviewed-on: https://code.wireshark.org/review/20912
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit d13c6d9
-Author: Xiaochuan Sun <linuxvxworks@gmail.com>
-Date:   Mon Apr 17 19:39:15 2017 +0800
-
-    remove unnecessary guint64 cast in IO graph
-    
-    Change-Id: I35d666a5a9fb5813706c312334f1552703c9475c
-    Reviewed-on: https://code.wireshark.org/review/21214
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 05140af
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Tue Apr 18 23:24:23 2017 +0200
-
-    RTCP: Handle large TMMBR value presentation
-    
-    TMMBR can be _very_ large (131072*2^63, larger than 64 bit entities can
-    hold). Therefore don't try to calculate and present the bitrate as an
-    integer value, but as an expression.
-    
-    Bug: 13611
-    Change-Id: Ieb8caae5d72d06f82c134eda63f99575218584c2
-    Reviewed-on: https://code.wireshark.org/review/21207
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fe003f1
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Tue Apr 18 23:42:33 2017 +0200
-
-    EAPOL-MKA: differentiate between actor and peers
-    
-    Actor member identifier and message numbers are something else than peer
-    member identifiers and message numbers. Give them their own header
-    field.
-    
-    Change-Id: I9ee0073447f861084e81ab2e23cf587005184686
-    Reviewed-on: https://code.wireshark.org/review/21208
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 111973c
-Author: Kenneth Soerensen <knnthsrnsn@gmail.com>
-Date:   Sun Mar 26 11:56:36 2017 +0200
-
-    ZigBee: Use value_string_ext and VALUE_STRING macros
-    
-    Change-Id: I04d8e1f89e0d6cf34f94ba1b6e0249297834c078
-    Reviewed-on: https://code.wireshark.org/review/21141
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 243da1f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 18 15:55:26 2017 -0400
-
-    X11: Replace UNUSED macro
-    
-    Change-Id: Ieed2c672fd2acb76dba0ef1c3182eb9f00a04253
-    Reviewed-on: https://code.wireshark.org/review/21205
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 913f9fb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Apr 18 15:27:28 2017 -0700
-
-    Rename BASE_VALS_NO_UNKNOWN to BASE_SPECIAL_VALS.
-    
-    It makes it a bit clearer what its purpose is - to allow a value_string
-    to be used for numeric rather than enumerated fields, giving certain
-    values of the field a special meaning.
-    
-    Change the explanation in the documentation to match as well.
-    
-    Change-Id: Id07b22eee996b79ea5f3473928d29adcabe09bf3
-    Reviewed-on: https://code.wireshark.org/review/21209
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c908846
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 18 10:42:35 2017 -0400
-
-    X11: Sort mesa_enum to allow for value_string_ext
-    
-    Adjust the dissector generator to put mesa_enum values in
-    numerical order.  Remove comments about where the specific
-    values came from as sorting them means the comments aren't
-    always going to be in the right place.
-    
-    Change-Id: I3c6b8252017c8a3ec379be49b3df069ec488cd1c
-    Reviewed-on: https://code.wireshark.org/review/21198
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 73e2354
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Apr 18 21:55:30 2017 +0200
-
-    mate: avoid redefining NDEBUG
-    
-    When building RelWithDebInfo target with MSVC, NDEBUG is automatically defined.
-    Avoid redefining the macro by checking if it already exists.
-    
-    Change-Id: I1720f47cce0df210c2b2dff3b20c218dc2ae7b02
-    Reviewed-on: https://code.wireshark.org/review/21200
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cf40e73
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Apr 18 14:20:25 2017 -0700
-
-    Fix a comment.
-    
-    Change-Id: I3a18e3fab9fa785e828df843b1b4b899beba1f19
-    Reviewed-on: https://code.wireshark.org/review/21206
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e6b9c77
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Apr 18 14:07:42 2017 -0700
-
-    Fix a comment.
-    
-    Change-Id: I2ed361efdaa6dcf632f054634dc473d518df4cc8
-    Reviewed-on: https://code.wireshark.org/review/21204
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1015fa0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Apr 18 14:02:18 2017 -0700
-
-    Have a common "capture file close alert box" routine.
-    
-    Take cf_close_failure_alert_box() and put it into libui, with the name
-    cfile_close_failure_alert_box().  Use it not only in file.c but also
-    in ui/export_pdu_ui_utils.c, ui/gtk/file_import_dlg.c, and
-    ui/qt/import_text_dialog.cpp where the error we get back isn't
-    necessarily an errno.
-    
-    Have ui/gtk/file_import_dlg.c and ui/qt/import_text_dialog.cpp also use
-    cfile_open_failure_alert_box() on open errors.
-    
-    Change-Id: I987f339a23ea58609390306a319923e7f92d5c07
-    Reviewed-on: https://code.wireshark.org/review/21203
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 870b3d2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Apr 18 16:28:52 2017 +0200
-
-    netflow: fix undefined shift
-    
-    Treat any prefix length larger than 32 as 32 (effectively not masking
-    anything) and treat a zero-length prefix as the empty mask (matching
-    anything).
-    
-    Change-Id: If96b03c2f76ff7624d50fefdf0b025ab373c07dc
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1152
-    Bug: 13607
-    Reviewed-on: https://code.wireshark.org/review/21189
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 31b7e16
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 18 14:33:59 2017 -0400
-
-    X11: Fix missing brackets caught by GCC
-    
-    packet-x11.c: In function ‘dissect_x11_request’:
-    packet-x11.c:3753:13: error: this ‘if’ clause does not guard...
-     [-Werror=misleading-indentation]
-                  if (next_offset - *offsetp > 0)
-                  ^~
-     packet-x11.c:3755:17: note: ...this statement, but the latter is misleadingly
-     indented as if it is guarded by the ‘if’
-                     *offsetp = next_offset;
-                      ^
-     cc1: all warnings being treated as errors
-     Makefile:4388: recipe for target 'packet-x11.lo' failed
-     make[6]: *** [packet-x11.lo] Error 1
-    
-    Change-Id: I3605c316e7b84f7cec21ce54431f6816fccca100
-    Reviewed-on: https://code.wireshark.org/review/21199
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 5df6cc4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Apr 18 16:01:10 2017 +0200
-
-    ositp: fix undefined behavior from large shift
-    
-    Display "2^105" instead of the expanded value.
-    
-    Change-Id: I455625ab66cd86587ca35d09e1eba98ae1d87a94
-    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1149
-    Bug: 13606
-    Reviewed-on: https://code.wireshark.org/review/21188
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 67d7a94
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Apr 18 14:57:15 2017 +0200
-
-    MPLS: Add Support for identifying Entropy Label (RFC6790)
-    
-    Bug: 13605
-    Change-Id: I414cad63df92b17f34676364fb38815dba9020e2
-    Reviewed-on: https://code.wireshark.org/review/21186
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ea9d9dc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Apr 18 15:02:30 2017 +0000
-
-    RMP: fix conflicting entry in its value_string
-    
-    Field 'Returncode' (rmp.retcode) has a conflicting entry in its value_string: 19 is at indices 8 (Default File Open Failed) and 10 (Bad Packet Detected))
-    
-    Change-Id: I77bd9b91f0c32f484ffd2406a493426f0ad3fbf8
-    Reviewed-on: https://code.wireshark.org/review/21192
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0012214
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Apr 17 21:52:51 2017 -0400
-
-    X11: General cleanup
-    
-    1. Replace bitmask macros with proto_tree_add_bitmask + bitmask field handling
-    2. Replace REQUEST_LENGTH macro with actual function.
-    
-    Change-Id: Ibb3b2bc8c9d0556092af0e3dc384a4aad6c07ac2
-    Reviewed-on: https://code.wireshark.org/review/21185
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d46adfe
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Apr 17 23:02:57 2017 -0400
-
-    X11: GHashTable -> wmem_map
-    
-    A few other cleanups related to switching to wmem_alloc()ed memory
-    
-    Change-Id: I86229affaa6b89dc86ab1589471734bba9efe50d
-    Reviewed-on: https://code.wireshark.org/review/21184
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6c33af3
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Tue Apr 18 09:00:01 2017 +0200
-
-    NETLINK: Show raw attribute data
-    
-    Once the netlink dissector does an attribute dissector callback it knows
-    whether or not the callback function could handle the data. If not then
-    simply add the raw data to be inspected by a human.
-    
-    Change-Id: Ibeb7a54f72f0f856008a50f5340e4ba142e00115
-    Reviewed-on: https://code.wireshark.org/review/21180
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1b7677e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Apr 18 10:11:06 2017 +0200
-
-    CMake: Sort entries
-    
-    Put additional_toolbar in sorted position.
-    
-    Change-Id: I483bca72265a5932f54ccf882c6659e94be5d95b
-    Reviewed-on: https://code.wireshark.org/review/21183
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 951cf71
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Apr 18 10:03:00 2017 +0200
-
-    Qt: AdditionalToolbars is a menu
-    
-    Rename actionViewAdditionalToolbars to menuAdditionalToolbars
-    because this is a menu, not an action.
-    
-    Change-Id: I85e45c065f415ffa008792f04127d81283e54b7e
-    Reviewed-on: https://code.wireshark.org/review/21181
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 3c51833
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Apr 17 19:50:36 2017 +0200
-
-    raknet: don't THROW() an exception from a dissector
-    
-    Show an expert info and return from raknet_dissect_system_address().
-    
-    Change-Id: Icedab5f1956d4b4c60318a1dd4f65bc7078d4e20
-    Reviewed-on: https://code.wireshark.org/review/21168
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit c54afb8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 22:58:28 2017 -0700
-
-    No need to close a descriptor that didn't get duped-to in the first place.
-    
-    Addresses CID 1398217.
-    
-    Change-Id: I387c4a9f1df739724b80ccaad173de2d9095b101
-    Reviewed-on: https://code.wireshark.org/review/21179
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6a049dd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 22:54:04 2017 -0700
-
-    Check the result of localtime().
-    
-    Unlikely to fail, but it squelches CID 1398219.
-    
-    Change-Id: Ibdabd2d71bdc2c09549f27f1ffe528005383ee3e
-    Reviewed-on: https://code.wireshark.org/review/21178
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7207050
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 22:43:22 2017 -0700
-
-    Check the result of localtime().
-    
-    Unlikely to fail, but it squelches CID 1398220.
-    
-    Change-Id: I0e40146f0a32c1082e84052c6b3e382fe6a15ae7
-    Reviewed-on: https://code.wireshark.org/review/21177
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 613476f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 22:31:53 2017 -0700
-
-    More checks for localtime() failing.
-    
-    Addresses CIDs 1398222 and 1398221.
-    
-    Fix the previous fix while we're at it.
-    
-    Change-Id: I6fe54e6ad115ac05154291b76de316426db72139
-    Reviewed-on: https://code.wireshark.org/review/21176
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 85d08e5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 07:52:38 2016 -0500
-
-    X11: Use proto_tree_add_bitmask for generated bitmasks
-    
-    Change-Id: Idc95500b74452911117be8903fe0bde0c8a6fefa
-    Reviewed-on: https://code.wireshark.org/review/21173
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8fb828f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 19:14:06 2017 -0700
-
-    Have a common "print a capture file open error message" routine.
-    
-    Use that for both "open for input" and "open for output" errors.
-    
-    Change-Id: Id17b732a2ca91bd080957b9fa010f781a1c65471
-    Reviewed-on: https://code.wireshark.org/review/21175
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e34d769
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 18:58:55 2017 -0700
-
-    Have a commont "capture file open alert box" routine.
-    
-    Take cf_open_failure_alert_box() and put it into libui, with the name
-    cfile_open_failure_alert_box().  Use it not only in file.c but also in
-    ui/export_pdu_ui_utils.c, where the error we get back isn't necessarily
-    an errno.
-    
-    Change-Id: Ia053f3e403ba464d446bd9530778d5ed302796d2
-    Reviewed-on: https://code.wireshark.org/review/21174
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4ce5467
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 17:37:21 2017 -0700
-
-    Just say "pcap" in the short names of all pcap variants.
-    
-    That's more consistent.
-    
-    Handle the "libpcap" names for backwards compatibility.
-    
-    Change-Id: I819404d69bddd733b7ee38e23d3ddc71110c0faf
-    Reviewed-on: https://code.wireshark.org/review/21172
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ce6430e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 17:17:01 2017 -0700
-
-    Eliminate an unneded member of a wtap_dumper.
-    
-    The only place the time stamp precision is used is in the libpcap code,
-    where it determines whether to write out microsecond-precision or
-    nanosecond-precision time stamps; we can determine that by looking at
-    the type/subtype field, which is also part of that structure, so do
-    that.
-    
-    We weren't setting it consistently - we were only setting it in libpcap
-    and a few other capture file writers, and not in other capture file
-    writers - and none of the writers other than libpcap used it.
-    
-    Change-Id: If53779cf4823ca936b8bf3e8a7dbcfea5850e652
-    Reviewed-on: https://code.wireshark.org/review/21171
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c9bb6b8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 17:09:26 2017 -0700
-
-    Don't close a wtap that you don't have open in the first place.
-    
-    Change-Id: I4d9d539957d06cb3568df287eb36ecc34677373f
-    Reviewed-on: https://code.wireshark.org/review/21170
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3fac48d
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Apr 6 21:50:53 2017 +0200
-
-    raknet: re-structure raknet_dissect_system_address()
-    
-    Create the subtree first. Increment *offset as we process the fields.
-    
-    Change-Id: I03b6ba9a20541593b90ac7932aab5ac88538f640
-    Reviewed-on: https://code.wireshark.org/review/21167
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e1e31ed
-Author: Binh Trinh <beango@gmail.com>
-Date:   Sun Apr 16 14:10:02 2017 -0400
-
-    [GTPv2]:  Add preference to Decode the SRVCC Transparent Containers
-    
-    This is to re-enable SRVCC Transparent Containers by letting the user make the assumption of the target technology
-    
-    Change-Id: I54812716a011c6a68f48bd0c8c7d18c06c0431fd
-    Reviewed-on: https://code.wireshark.org/review/21147
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 55f98f6
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Apr 17 18:00:27 2017 +0200
-
-    Simplify dissector_try_uint_new().
-    
-    Exit straight away if there's no entry for our value in the dissector
-    table.
-    
-    Change-Id: I2637b4f03cb852dca0a6993b9f63fdc15e8edc58
-    Reviewed-on: https://code.wireshark.org/review/21165
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit cfb23d874345eede2860afa155b181a2e2e208c0)
+    Reviewed-on: https://code.wireshark.org/review/22357
 
-commit 2273cf0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Apr 17 08:52:57 2017 -0400
-
-    packet-nsh.c: Create dissector table for next protocol
-    
-    Change-Id: Id8be2a37f99f4ac9d531a694273c7d5d3f843cc1
-    Reviewed-on: https://code.wireshark.org/review/21163
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 25382fd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 11:02:49 2017 -0700
-
-    Don't assume gmtime() or localtime() succeed.
-    
-    The chances that they won't, in this case, are slim to none, as the time
-    is after the Epoch, but this squelches CID 1398223.
-    
-    We'll change the master branch to require an err_info string for
-    WTAP_ERR_INTERNAL and to display it in a future commit.
-    
-    Change-Id: Ifb51076b25117efc53ba3ad8b434e36c71f7600f
-    Reviewed-on: https://code.wireshark.org/review/21169
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 07e2f65
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Apr 17 17:55:09 2017 +0200
-
-    Fix the description of dissector_try_uint_new().
-    
-    We return the number of bytes consumed by the dissector.
-    
-    Change-Id: Icc22c9e033dfb11f230fb59cfb79932bc8c80548
-    Reviewed-on: https://code.wireshark.org/review/21164
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 6d67dff
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Mon Apr 17 18:08:27 2017 +0200
-
-    oss-fuzzshark: disable setresgid(), it fails with -EINVAL
-    
-    Change-Id: I28abb1d0beb89ce45e20414298b2046f5149a25b
-    Reviewed-on: https://code.wireshark.org/review/21166
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit e6f944d
-Author: Gabriel Ganne <gabriel.ganne@enea.com>
-Date:   Wed Apr 12 13:53:19 2017 +0200
-
-    nsh: add support for nsh/nsh, and nsh/mpls
-    
-    Change-Id: If7c8d703c3a019af75ef24d3813bfe64a9db2471
-    Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
-    Reviewed-on: https://code.wireshark.org/review/21161
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b478df6
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Fri Apr 14 11:33:57 2017 +0200
-
-    Qt: Provide both file save and open preferences
-    
-    This is a breaking change.
-    
-    prefs_register_filename_preference hasn't been differentiating
-    between files to be saved and ones to be opened.
-    
-    On GTK, a neutral dialog is used, so no problems there.
-    On Qt, a save dialog has been always used, even in dissectors that
-    were reading configuration files without modification.
-    
-    prefs_register_filename_preference now takes an argument to indicate
-    whether UI could be a save dialog with a warning on overwriting
-    a file, or whether it's a general purpose open file dialog.
-    
-    Qt now does this. Previously no warning was shown on overwriting a file,
-    so it may be used for opening files too without irritating the user.
-    This has been changed, as non-destructive reads should now use
-    the open dialog.
-    
-    Dissectors were changed accordingly.
-    
-    Change-Id: I9087fefa5ee7ca58de0775d4fe2c0fdcfa3a3018
-    Reviewed-on: https://code.wireshark.org/review/21086
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit f63ad23
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Apr 17 00:48:20 2017 -0700
-
-    Check for localtime() failing.
-    
-    It "shouldn't happen", but at least this squelches a Coverity complaint,
-    CID 1398224.
-    
-    Change-Id: I9555f71a50574e9386a3c96d52143d838f7f121f
-    Reviewed-on: https://code.wireshark.org/review/21160
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ca29ec9
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Apr 8 10:15:11 2017 +0200
-
-    sharkd: support for "downloading" decoded RTP stream in wave-like format.
-    
-    Change-Id: Ic6b241f9b7ed302e7b11644e63230474d5933a85
-    Reviewed-on: https://code.wireshark.org/review/20963
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 067ef3e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 20:47:34 2017 -0700
-
-    Clean up documentation and help messages for protocol enabling/disabling.
-    
-    List all of --enable-protocol, --disable-protocol, --enable-heuristic,
-    and --disable-heuristic in the SYNOPSIS section of the man pages.
-    
-    Undent after the list of taps for the -z option, so the following
-    options are at the same indentation as other options.
-    
-    List --enable-protocol in the DESCRIPTION, above --disable-protocol.
-    
-    Include --enable-protocol in the help message.
-    
-    Change-Id: I680a54430789f3543b2d539fbded22b0b57f7f76
-    Reviewed-on: https://code.wireshark.org/review/21159
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ea1f62a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 20:02:00 2017 -0700
-
-    Get rid of unnecesary #includes.
-    
-    Change-Id: I379a2a1007be1b844873d9c5e8ea53bd689f0f4d
-    Reviewed-on: https://code.wireshark.org/review/21158
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4db20ec
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 19:57:51 2017 -0700
-
-    Remove unnecessary tap.
-    
-    The tap was just a trick to get fields and protocols registered as being
-    of interest.  Now that we have mechanisms by which postdissectors can
-    explicitly register fields and protocols as being of interest, and are
-    using that, the trick is no longer needed.
-    
-    Change-Id: I0bccc88a1e4ee4c9fc84b90d968820375594c5c1
-    Reviewed-on: https://code.wireshark.org/review/21157
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b9c6e2d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 19:37:00 2017 -0700
-
-    Remove unnecessary tap.
-    
-    The tap was just a trick to get fields and protocols registered as being
-    of interest.  Now that we have mechanisms by which postdissectors can
-    explicitly register fields and protocols as being of interest, and are
-    using that, the trick is no longer needed.
-    
-    Change-Id: Ib2620ff32c41ffa050203c1d4481c63535fb3f4b
-    Reviewed-on: https://code.wireshark.org/review/21156
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit acf349e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 19:32:33 2017 -0700
-
-    Fix backwards test.
-    
-    If fdata->flags.visited *isn't* set, this is the first pass over the
-    packets since opening a file or starting a redissection.
-    
-    Change-Id: Ib72d122c9291ce5ac9c3a3df1b6dfb4db163698e
-    Reviewed-on: https://code.wireshark.org/review/21155
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 190350d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Apr 5 01:51:19 2017 +0200
-
-    Initial support for Linux 802.11 Netlink (nl80211) dissection
-    
-    Only commands and top-level attributes are recognized, no specialization
-    is done (yet?) since it is a large protocol.
-    
-    Fields are extracted from Linux v4.10-rc4-749-g8585989d146c using the
-    "tools/generate-nl80211-fields.py --update" command.
-    Depends on the Generic Netlink (genl) dissector.
-    
-    Change-Id: I7f81b91e3beacca8ebcb853137212406004f65e8
-    Ping-Bug: 13561
-    Reviewed-on: https://code.wireshark.org/review/20914
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 61c5e8e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Apr 17 00:54:32 2017 +0200
-
-    genl: make subdissectors responsible for header
-    
-    Allow subdissectors to specify the command field for the Generic Netlink
-    message header, similar to how Netlink subdissectors handle the Netlink
-    message header (for its type field).
-    
-    Pass the root tree instead of the genl tree to subdissectors (so
-    subdissectors can add their own layer).
-    
-    Change-Id: I3e56f538661b7e8a51d2411da14d181ead820c4b
-    Reviewed-on: https://code.wireshark.org/review/21150
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 407a2b0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 18:48:30 2017 -0700
-
-    Rename some routines and structure members.
-    
-    They deal with sets of hfids, which can belong to protocols as well as
-    fields (I guess you could argue that a protocol is a field, but...).
-    
-    Change-Id: Ibd103cfa26427ead4ef54be89f1251908004cfae
-    Reviewed-on: https://code.wireshark.org/review/21154
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1bfc858
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 18:29:26 2017 -0700
-
-    Include protocols in the list of wanted hfids.
-    
-    That's currently required to get the fields we want.
-    
-    Bug: 12161
-    Change-Id: Ic1066334358c58fa915ef886b2658902393172c7
-    Reviewed-on: https://code.wireshark.org/review/21153
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0cc4543
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 18:22:48 2017 -0700
-
-    Consistently call mate_config pointers "mc".
-    
-    Some routines had "matecfg", some had "mc"; be a bit more consistent.
-    
-    Change-Id: I3406488315483fb281ebc3fb8a23e9e1b2104a14
-    Reviewed-on: https://code.wireshark.org/review/21152
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit dae1088
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 18:18:11 2017 -0700
-
-    Make the current MATE config pointer static only to packet-mate.c.
-    
-    Pass it as an argument to everything else, so only packet-mate.c has the
-    notion of there being *a* configuration, and everything else takes the
-    configuration as an argument.
-    
-    Change-Id: Ia92c1539586d3e71580fd822cf07bd3d79a6f093
-    Reviewed-on: https://code.wireshark.org/review/21151
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3f912df
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Wed Apr 12 13:02:45 2017 +0200
-
-    noe: improved EVT_LOCAL_APPLICATION message decoding (and updated code to match previous reviews)
-    
-    Change-Id: I3cf3687303cc582261aa62feef6bd81576965dfd
-    Reviewed-on: https://code.wireshark.org/review/21038
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d28d537
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 14:50:30 2017 -0700
-
-    No need for this to be a global variable.
-    
-    Make it local to mate_tree(), and pass it to mate_pdu_tree().
-    
-    Change-Id: I489683614b4d65aec3ddd94ce2c9077180e769ca
-    Reviewed-on: https://code.wireshark.org/review/21149
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5d7bd7c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 14:36:57 2017 -0700
-
-    Work around a Lemon bug.
-    
-    There's a Lemon bug where this grammar produces a parser that fails
-    assertions; to work around it, we disable assert() failures.
-    
-    (A bug report has been sent to sqlite-users about this.)
-    
-    Change-Id: I6812b20fafe318425b37755a15009b0baf2d68a2
-    Reviewed-on: https://code.wireshark.org/review/21148
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b1a41ac
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 05:56:42 2016 -0500
-
-    X11: Resolve filter differences between a "list" and its "item".
-    
-    The "list" is of type FT_NONE and the "item" is not.  That can
-    cause type conflicts.
-    
-    Change-Id: If62f7113bc120e392588724a0dd65b7ab32ccde7
-    Reviewed-on: https://code.wireshark.org/review/21146
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4fa9c5f
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sun Apr 16 17:48:49 2017 +0200
-
-    oss-fuzzshark: search for dissector in given table.
-    
-    Change-Id: Ia02b0e6a92213599307e5b382e9fd7ba6c9833a3
-    Reviewed-on: https://code.wireshark.org/review/21145
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 6e708bd
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 16 10:24:56 2017 -0400
-
-    MQ: Remove duplicate values from mq_PrmId_xvals.
-    
-    Appears to be duplicates between "regular" and "64-bit" versions
-    of values.
-    
-    Change-Id: Ib615c0d85c29e11daf5d4379c18563c58ad152f9
-    Reviewed-on: https://code.wireshark.org/review/21138
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f5f5e8c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 16 10:22:33 2017 -0400
-
-    packet-hislip.c: Remove duplicate entries from vendorID.
-    
-    This does occasionally happen to enumerated vendor ID values for protocols
-    (company/product line buyouts/acquisitions, etc).
-    Use "first value" as the vendor ID of choice.
-    
-    Change-Id: I9a277bf07276809e0684bd3a9f121d4a656d87f6
-    Reviewed-on: https://code.wireshark.org/review/21137
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1ebdf3d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 16 10:19:43 2017 -0400
-
-    Netlink: Remove duplicate from nfq_ctinfo_vals
-    
-    Problem seems to stem from handling of enum (and that first value has to be 0)
-    
-    Change-Id: I4c5d749cc53c73988c54f2aa08e60b7f55779348
-    Reviewed-on: https://code.wireshark.org/review/21136
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 965723a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 16 10:18:28 2017 -0400
-
-    packet-qnet6.c: Remove duplicates from qnet6_kif_msg_devctl_cmd_class_vals.
-    
-    Maybe the value_string needs to be broken up into the different pieces.
-    
-    Change-Id: I1c69ca486eea6d8d8d1ea33d5d0d9eb2e2832ee6
-    Reviewed-on: https://code.wireshark.org/review/21135
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fe45986
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 16 10:15:27 2017 -0400
-
-    [TACACS] Fix typo with TAC_PLUS_AUTHEN_METH_KRB5
-    
-    Causes duplication in value_string
-    
-    Change-Id: Ifdafab2f32f69115dcbb0d1e65604a60a603563c
-    Reviewed-on: https://code.wireshark.org/review/21134
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9d9bb8e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 16 09:13:16 2017 -0400
-
-    [DOCSIS] Fix typo in docsis_conf_code.
-    
-    Flagged during value_string duplication check
-    
-    Change-Id: Ia6b657b6e0d8e60cf69ea0e40199b78e96837ecc
-    Reviewed-on: https://code.wireshark.org/review/21133
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7b68dda
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 16 09:12:11 2017 -0400
-
-    packet-vsip.c: Remove duplicate value in EVsipConfigItem_vals
-    
-    Looks like it's just a typo.
-    
-    Change-Id: Ic1fe505a311b423c24f24f2060b8a84c4f577ad3
-    Reviewed-on: https://code.wireshark.org/review/21132
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4227755
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 16 09:11:03 2017 -0400
-
-    packet-v52.c: Remove duplicates from info_element_values.
-    
-    ETSI EN 300 347-1 V2.2.2 does have the duplicated values
-    documented.  Maybe the value_string needs to be broken up
-    into the different pieces (PSTN, Control, etc).
-    
-    Change-Id: I92477d9532d334945cb9e55e75534520d51dd1d1
-    Reviewed-on: https://code.wireshark.org/review/21131
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 099556c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 16 09:07:43 2017 -0400
-
-    packet-starteam.c: Remove duplicate entries from starteam_opcode_vals.
-    
-    Comments around the duplicates suggest author was unsure of their
-    values to begin with.
-    
-    Change-Id: Idc55e2b6e721e1061d8707ede4faad39901d3085
-    Reviewed-on: https://code.wireshark.org/review/21130
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f9b8e64
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 04:40:55 2016 -0500
-
-    X11: Revert mesa_enum_ext back to mesa_enum
-    
-    Values aren't numerically sorted in the XML, so they aren't put
-    in the value_string in numerical order.  That's a problem for
-    value_string_ext.
-    
-    Change-Id: Ie40c5ab1083cc7be140d11dc131e3588759819b7
-    Reviewed-on: https://code.wireshark.org/review/21128
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ef9150a
-Author: Binh Trinh <beango@gmail.com>
-Date:   Sun Apr 16 10:14:50 2017 -0400
-
-    [GTPv2]: Add Request/Response Lookups for SRVCC PS-to-CS Messages
-    
-    Change-Id: I12fcb180fd361f1df4e6d0f78f8f34f01284d7a4
-    Reviewed-on: https://code.wireshark.org/review/21129
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b2219bb
+commit 27b6fe4
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Apr 16 08:16:47 2017 -0700
-
-    [Automatic update for 2017-04-16]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I8165b1b2db0f81049a88dd17163a4367f04f83cc
-    Reviewed-on: https://code.wireshark.org/review/21142
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f4f252d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Apr 12 14:15:00 2017 +0200
-
-    btatt: failed assertion 'hf->bitmask != 0' (btatt.glucose_measurement.type_and_sample_location.type)
-    
-    Fixes: v1.99.9rc0-246-ga50a49e527 ("Bluetooth: ATT: Add some remaining attributes")
-    
-    Bug: 13590
-    Change-Id: I8e92ec80ee9e93a3e507f86c8354f1909070b0b9
-    Reviewed-on: https://code.wireshark.org/review/21041
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 287a9cf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 11:33:35 2017 +0000
-
-    Revert "Temporary hack to debug the MATE grammar."
-    
-    This reverts commit c63c5c8c4262c8f58b12f56bf659383a1b0aa47a.
-    
-    This is probably easier than just abandoning it and trying to remove it from my repository.
-    
-        https://xkcd.com/1597/
-    
-    Change-Id: Ibba2107cfa9c60c86862b16a4cac31689670e137
-    Reviewed-on: https://code.wireshark.org/review/21127
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c63c5c8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 01:51:23 2017 -0700
-
-    Temporary hack to debug the MATE grammar.
-    
-    Builds on my machines, physical and virtual, crash with an assertion
-    failure in the MATE Lemon grammar when parsing the MATE configuration
-    file in bug 12161 - on Mac OS X Lion with llvm-gcc, Ubuntu 15.10 with
-    GCC, and on macOS Sierra with clang.
-    
-    Builds on the macOS buildbot do *not* fail.
-    
-    So put the result of Lemon in the MATE plugin into the release tarball,
-    so I can compare it with what Lemon generates on my machine.
-    
-    Change-Id: I2d5ecee68535a8b4803de0bd7f02d448ab629083
-    Reviewed-on: https://code.wireshark.org/review/21126
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 55220d3
-Author: Dhiru Kholia <dhiru.kholia@gmail.com>
-Date:   Fri Apr 14 13:24:00 2017 +0530
-
-    VRRP: Improve dissection of VRRP packets using MD5 authentication
-    
-    VRRP v2 in Cisco routers can use "Keyed MD5" for IP authentication, and
-    such packets are now dissected slightly better.
-    
-    The offset of the MD5 digest value pointed out by this patch can be
-    validated against Cisco's IOU software by using the IOU's "debug vrrp
-    auth" feature.
-    
-    Sample VRRP (version 2) .pcap files can be found at,
-    https://github.com/kholia/my-pcaps
-    
-    Change-Id: Ib421428bea9c2a074aec4594b26c76bc271fada8
-    Reviewed-on: https://code.wireshark.org/review/21084
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit cb1967a
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Apr 14 22:37:10 2017 +0100
-
-    Snort: map more pcre modifiers to GRegexCompileFlags
-    
-    Change-Id: I5df8cb794b7b76b708448ae4b74b7481bdd8faff
-    Reviewed-on: https://code.wireshark.org/review/21097
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 581db4c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 16 01:23:16 2017 -0700
-
-    Get rid of some generated files with "make distclean".
-    
-    register.c, and the plugin.c for various plugins, are generated by tools
-    that must be available to do a build, and aren't distributed as part of
-    the source tarball.  That means "make distclean" should remove them.  Do
-    so.
-    
-    Change-Id: I9e37abdafb50234cf1ebb5fb828446e45e605d78
-    Reviewed-on: https://code.wireshark.org/review/21125
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b88cb66
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 03:17:29 2016 -0500
-
-    X11: Ensure mesa_enum value_string has unique values
-    
-    Also convert usage to a value_string_ext
-    
-    Change-Id: Ie515591355879f8eb65faf50e7c04b30cff13519
-    Reviewed-on: https://code.wireshark.org/review/21124
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c7e32fb
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sun Mar 26 17:06:04 2017 +0200
-
-    sharkd: support for limits in sending information about rows (columns).
-    
-    Suboptimal, but still much better than sending columns
-    for whole capture file. webshark by defaults requests for 120 rows.
-    
-    Change-Id: I96188e0d2bc4539a57e5061c7784f8c44f318393
-    Reviewed-on: https://code.wireshark.org/review/20715
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b9edace
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Apr 15 23:29:32 2017 +0200
-
-    Fix memleak of g_pservices_path.
-    
-    Change-Id: Iaee6f3773bc3b4164935092f2c9c9c888171a5b7
-    Reviewed-on: https://code.wireshark.org/review/21117
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-
-commit ce50000
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Fri Apr 14 14:46:11 2017 +0200
-
-    DICOM: Revert 3752a643ac5c85622822c88c69d83ce23828acb8
-    
-    Revert commit 3752a643ac5c85622822c88c69d83ce23828acb8
-    to fix bug 13164 and bug 13570 introduced with this commit.
-    
-    This reopens bug 13110.
-    
-    Bug: 13164
-    Bug: 13570
-    Change-Id: Id237f08258ca100f675614a9cb36a32340944b3e
-    Reviewed-on: https://code.wireshark.org/review/21089
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cbc2c84
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 15 14:45:12 2017 -0700
-
-    Catch attempts to pass unregistered protocols to prefs routines.
-    
-    That way, you don't end up with "(none)" being used as the filter name
-    and getting confusing error messages.
-    
-    Change-Id: Ifc77d4434d82dabebe74118742938cfa5234791d
-    Reviewed-on: https://code.wireshark.org/review/21118
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 237d23d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 15 12:37:34 2017 -0700
-
-    Squelch some compiler warnings.
-    
-    Cast an ssize_t value to unsigned int before subtracting it from an
-    unsigned int.  The value is already known to be >= 0 and <= the value
-    from which we're subtracting it, and that latter value is an unsigned
-    int, so it's guaranteed to fit into an unsigned int.  (ssize_t can be
-    bigger than unsigned int.)
-    
-    Change-Id: I5c4d3c7fa4bf241c9ea72661beca89bc30495a3b
-    Reviewed-on: https://code.wireshark.org/review/21114
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3743186
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Apr 15 13:13:24 2017 -0400
-
-    packet-slsk.c: Fix potential uninitialized variable.
-    
-    Change-Id: Ic1ae372bb50192d4503b1d5ba02684f44a51f968
-    Reviewed-on: https://code.wireshark.org/review/21113
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 731d6e5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Apr 14 19:58:13 2017 -0400
-
-    x11: proto_tree_add_uint_format -> proto_tree_add_uint_format_value
-    
-    Change-Id: Ib8b80b2c4a79941cf56d8add783c88d1078f079a
-    Reviewed-on: https://code.wireshark.org/review/21104
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7e002ed
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Apr 12 07:21:12 2017 -0400
-
-    packet-slsk.c: General cleanup
-    
-    1. Use FT_UINT_STRING as appropriate
-    2. Replace many proto_tree_add_xxx_format with proto_tree_add_item[_xxx]
-    
-    Change-Id: Id9853c54074c2c033b3494b2d687df8e9fd33881
-    Reviewed-on: https://code.wireshark.org/review/21098
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 22ccd2a
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Apr 15 17:34:59 2017 +0200
-
-    Add oss-fuzzshark.c tool, for integration with oss-fuzz.
-    
-    Change-Id: I8a6b620c8ef1454e57db1d9a6341263ffc9fca3b
-    Reviewed-on: https://code.wireshark.org/review/21110
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit e66f9c7
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Sat Apr 15 13:21:48 2017 +0200
-
-    CMake: include PKG_INCLUDE_DIR if PKG_INCLUDE_DIRS is undefined
-    
-    FindLibXml2.cmake populates LIBXML2_INCLUDE_DIR and leaves
-    LIBXML2_INCLUDE_DIRS undefined.
-    
-    Libxml2 inclusion as optional dependency is suggested in Change-Id
-    I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783.
-    
-    Change-Id: If49c778230e99af4b2ebb97dcb2f8acb4b55aa88
-    Reviewed-on: https://code.wireshark.org/review/21109
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c2386c5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 14 22:41:33 2017 -0700
-
-    Update to the current lempar.c in the SQLite repository.
-    
-    Change-Id: I86ca187a7c698541d70bab558c4073fdff28dea3
-    Reviewed-on: https://code.wireshark.org/review/21108
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 96c72df
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 14 22:04:49 2017 -0700
-
-    Make the set of static routines match that in the current tip SQLite.
-    
-    This reduces the differences between our lemon.c and SQLite's.
-    
-    Change-Id: Ie672fa564a43ffe2fae271968accfed2a864bb63
-    Reviewed-on: https://code.wireshark.org/review/21107
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c64ab9d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 14 19:36:36 2017 -0700
-
-    Update symbols.
-    
-    Change-Id: I41a075758103f0c37d30b3e764eef5f87e87234f
-    Reviewed-on: https://code.wireshark.org/review/21106
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d523f61
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 14 19:24:05 2017 -0700
-
-    Make memory_error() a routine.
-    
-    That makes the code more like Lemon as distributed.
-    
-    Note that Lemon, as distributed, at least claims to have a bunch of
-    stuff "From the file "XXX.{c,h}", which might be the result of lemon.c
-    being an "amalgamation":
-    
-            https://www.sqlite.org/amalgamation.html
-    
-    although, unlike SQLite, the individual bits of the amalgamation don't
-    appear to be present in the SQLite Fossil repository, so maybe they've
-    been permanently glued together.
-    
-    Change-Id: I361d0d16be0744b127110d7d237fdd84e30b6432
-    Reviewed-on: https://code.wireshark.org/review/21105
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Jun 20 11:43:07 2017 -0400
 
-commit 3bd7671
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 14 18:28:25 2017 -0700
-
-    Make whitespace match what's checked into the SQLite repository.
-    
-    They accepted some of our changes, but with no space between "struct
-    XXX" and "*.  Whatever.
-    
-    Change-Id: I6b29462dc8b04ebf0822f8512d82f5f8df575447
-    Reviewed-on: https://code.wireshark.org/review/21101
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0f3e200
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 14 17:44:04 2017 -0700
-
-    Fix parsing of packet ranges.
-    
-    Replace the dash in a range with a '\0', so that the first value in the
-    range is properly terminated.
-    
-    Change-Id: Ib2807c2534c1e99e643848ca0fc32f4b78025ce3
-    Reviewed-on: https://code.wireshark.org/review/21099
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ccef2d8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 14 13:44:08 2017 -0700
-
-    Make prefs_register_subtree() static too.
-    
-    It's not used outside epan/prefs.c, and it probably shouldn't be.
-    
-    Change-Id: I8a10961a33b93db1de982eec264c134f9f3bc66c
-    Reviewed-on: https://code.wireshark.org/review/21096
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6dd6fc9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 14 13:05:16 2017 -0700
-
-    Make prefs_register_module() static.
-    
-    It's not used outside epan/prefs.c, and it *shouldn't* be used outside
-    epan/prefs.c - there are other APIs that call it, and handle the details
-    of picking the right name, title, description, etc..
-    
-    Change-Id: Ib95b4811d50c2bf1c480f115ee998274252243c9
-    Reviewed-on: https://code.wireshark.org/review/21095
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit dcd3d7b
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Fri Apr 14 20:04:54 2017 +0200
-
-    pcep: add registration of missing ett fields
-    
-    Add registration of ett fields:
-     - ett_pcep_obj_unreach_destination,
-     - ett_pcep_obj_branch_node_capability,
-    
-    Which were used since 7bca5e168817f6f665e9aaec70ca37722c7afbea.
-    
-    Reorder, ett_ registration to match declaration order.
-    
-    Change-Id: Ie88cf518a77e134257570a054f6173ee49f27776
-    Reviewed-on: https://code.wireshark.org/review/21091
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c398858
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Apr 14 12:34:18 2017 -0700
-
-    Give a better error message for invalid characters in preference module names.
-    
-    And make the message for an invalid character in a preference name more
-    like it, by putting the offending name in quotes.
-    
-    Change-Id: I40db8b87eae5e46a1d49213a9a45861b6b3565af
-    Reviewed-on: https://code.wireshark.org/review/21092
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 74784bd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Apr 14 16:52:10 2017 +0200
-
-    Update Windows binaries to GeoIP 1.6.10 with a local GeoIP_free function
-    
-    This solves a crash occurring when trying to free memory allocated by
-    GeoIP (cross-compiled with mingw(32|64)) with MSVC function
-    
-    Bug: 13598
-    Change-Id: I757cff13660bd485d7ea91d10660e9bf86404728
-    Reviewed-on: https://code.wireshark.org/review/21090
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 90afc25
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Fri Apr 14 10:14:09 2017 +0200
-
-    Units: add millibel unit string
-    
-    Add millibel unit string, for wireless and optical power useage.
-    
-    Change-Id: I7fe98fbeea7431fb74db57d2253ea78813379629
-    Reviewed-on: https://code.wireshark.org/review/21083
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1928592
-Author: Patryk Nowak <patryk.nowak@tieto.com>
-Date:   Fri Apr 14 12:33:12 2017 +0200
-
-    Bluetooth: HCI: fix dissection of command Enhanced Setup Synchronous Connection
-    
-    Change-Id: I6f66b583f50da841eb67eb1995b637db327be6a9
-    Reviewed-on: https://code.wireshark.org/review/21088
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bf5fd11
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Apr 13 16:34:49 2017 +0200
-
-    Functions that put large amounts of static data onto the stack may be
-    worth looking at every now and then.
-    
-    The value of 16384 is the same as the default in VS.
-    
-    Change-Id: I68fd51e373437088f59c1e197d1a889f856caded
-    Reviewed-on: https://code.wireshark.org/review/21030
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 77e67a3
-Author: sswsdev <sswsdev@gmail.com>
-Date:   Thu Apr 13 20:42:46 2017 +0300
-
-    UMTS RLC: Fixing incorrect direction
-    
-    Using 'link_dir' instead of 'p2p_dir'
-    
-    Change-Id: I98c0b98396a6fe3b6d4c5243e1abb33edff43229
-    Reviewed-on: https://code.wireshark.org/review/21080
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 166c9cf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Apr 14 11:09:01 2017 +0200
-
-    Diameter: update Reservation-Priority AVP values
-    
-    Change-Id: I5609385ee0a13fe5262a35ac65e206f0bc492a61
-    Reviewed-on: https://code.wireshark.org/review/21085
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c8dd3a1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Apr 13 18:24:46 2017 +0200
-
-    mate: move 3 big structures from stack to heap
-    
-    Change-Id: I03bdb1f17c8c8b79cc78e37b14ac4e959f1ed089
-    Reviewed-on: https://code.wireshark.org/review/21078
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3a8db34
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 13 18:25:48 2017 -0700
-
-    Remove some unused code.
-    
-    It's copied-and-pasted from {somethingelse}shark.c, such as tshark.c;
-    it's not needed here.
-    
-    Fixes CID 1405103.
-    
-    Clean up indentation while we're at it.
-    
-    Change-Id: Ia3ab41f64f055fcebeac6e49ebf5f5581125b960
-    Reviewed-on: https://code.wireshark.org/review/21082
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 32c9c08
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Apr 13 17:31:58 2017 +0200
-
-    LBMC: move lbmc_extopt_reassembled_data_t structure from stack to heap
-    
-    This structure contains an array of 65536 bytes.
-    
-    Change-Id: Ied2c584100cb613dc195fbc5de7ae9a5ec5b770b
-    Reviewed-on: https://code.wireshark.org/review/21077
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit eff51c6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Apr 13 20:02:48 2017 +0200
-
-    sharkd: reduce buffer put on stack from 16K to 2K
+    Manuf: Konica Minolta updates.
     
-    Change-Id: Ie86f68ed48b881f4803377a3e1ad94fcfe1947e3
-    Reviewed-on: https://code.wireshark.org/review/21079
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 3fefb19
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Apr 13 14:46:08 2017 -0700
-
-    Update to GeoIP 1.6.10.
-    
-    That's the most recent version of the GeoIP legacy API.
-    
-    GeoIP 1.6.1, and later, are available from GitHub, but not from
-    MaxMind's Web site.
+    Correct a couple of entries related to Konica Minolta.
     
-    Change-Id: I67b1b5b47761beac2fc303e18e39d9accac86e3b
-    Reviewed-on: https://code.wireshark.org/review/21081
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3f71262
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Apr 12 21:07:20 2017 +0200
-
-    netlink (sock_diag): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    The payload dissection should start after the header, so do not reset offset.
-    
-    Fixes: v2.3.0rc0-3039-g92ebd63892 ("netlink: let subdissectors handle the netlink header")
-    Change-Id: I6bdfdd967bc56cb99c07f4f151ef96592e18a508
-    Reviewed-on: https://code.wireshark.org/review/21057
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0c597f1
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Apr 13 16:59:22 2017 +0200
-
-    [GSM MAP] Update to 3GPP TS 29.002 V14.3.0 (2017-03).
-    
-    Change-Id: I97a4ee7cdcb8644a4f2e3f108842d4c28d788c54
-    Reviewed-on: https://code.wireshark.org/review/21076
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I3acea1cf7ab1ad9be5d1b367a1015f5205b9e80b
+    Reviewed-on: https://code.wireshark.org/review/22268
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4e56c06
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Apr 13 13:17:41 2017 +0200
-
-    LTE RRC: do not display twice RRCConnectionReestablishmentReject in info column
-    
-    Bug: 13595
-    Change-Id: I5d1537afea7f5a2dddd5e11a06c451ec00913d12
-    Reviewed-on: https://code.wireshark.org/review/21073
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f8bbdec
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Apr 12 22:40:32 2017 -0400
-
-    Bugfix bad checksum of ICMP extension header.
-    
-    Use offset in tvb, not 0 for computation.
-    Also add check for checksum = 0, which means checksum isn't present.
-    
-    Bug: 13586
-    Change-Id: I18812894104c35e50ecb99aa8eca6b030c78c486
-    Reviewed-on: https://code.wireshark.org/review/21070
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a96dc7b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Apr 12 11:15:08 2017 -0400
-
-    Require MLE to have IEEE802.15.4 as an underlying layer.
-    
-    MLE runs over UDP, but presumes IEEE802.15.4 is also an underlying layer.
-    Enforce it by ensuring IEEE802.15.4 protocol data is present.
-    
-    Bug: 13589
-    Change-Id: I5fd54244499980637c121f5f8d1fb2d152d31c73
-    Reviewed-on: https://code.wireshark.org/review/21053
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6c096f3
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Wed Apr 12 19:36:27 2017 +0200
-
-    packet-epl.c: Fix bigger-than-actual offset being reported
-    
-    dissect_epl_asnd_nmtdna returns the offset + 27,
-    adding that to the original offset isn't correct,
-    unless the offset was 0 to begin with, which isn't the case.
-    
-    Change-Id: Id0d5043b23a83aef8d07a6f6ee3b70486d913e9f
-    Reviewed-on: https://code.wireshark.org/review/21056
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d732098
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Apr 12 21:16:27 2017 +0200
-
-    zbee zcl: fix conflicting entry in its value_string
-    
-    Field 'Command' (zbee_zcl_general.applctrl.execcmd.id) has a conflicting entry in its value_string: 4 is at indices 4 (Start Superfreezing) and 5 (Stop Superfreezing))
-    
-    Field 'Meter Type ID' (zbee_zcl_ha.metidt.attr.meter_type.id) has a conflicting entry in its value_string: 0 is at indices 0 (Utility Primary Meter) and 2 (Data Quality ID))
-    
-    Change-Id: I9e92a5c58aea0d6ef00e8d5f61fdfb073b41ee80
-    Reviewed-on: https://code.wireshark.org/review/21058
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e5a120a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Apr 12 21:19:24 2017 +0200
-
-    unistim: fix conflicting entry in its value_string
-    
-    Field 'Stream Based Volume ID' (unistim.stream.volume.id) has a conflicting entry in its value_string: 111 is at indices 0 (C1=0xFF00 C2=0x00 C3=0x00 c4=0x00 Steady on.  -13 dBmO per frequency.) and 1 (C1=0x0505 C2=0x0505 C3=0x0505 c4=0xFF00 3 burst(0.1 sec on,0.1 sec off),Then steady on.-13 dBmO per frequency.))
-    
-    Change-Id: I49f50688b9e68d597190d891b114eea1ff3e4858
-    Reviewed-on: https://code.wireshark.org/review/21059
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9769e8a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 12 17:09:39 2017 -0700
-
-    Use proto_get_finfo_ptr_array() rather than proto_find_finfo().
-    
-    As the comments say, proto_find_finfo() is slower than
-    proto_get_finfo_ptr_array(), as it has to scan the entire tree, and,
-    given that we're priming the tree with the fields we need (which we
-    *have* to do to *guarantee* that we'll get the fields we want;
-    requesting that a protocol tree be constructed isn't sufficient, and
-    asking for a "visible" protocol tree is overkill),
-    proto_get_finfo_ptr_array() will work.
-    
-    Change-Id: Ic1e21105a0a89003a3cdd3d7a2e55ac287ddad5e
-    Reviewed-on: https://code.wireshark.org/review/21068
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 37e45cc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 12 16:44:51 2017 -0700
-
-    Fix indentation.
-    
-    Change-Id: Idc3d9c40a5f8ecd0f192c289538c3303ba2b7ffe
-    Reviewed-on: https://code.wireshark.org/review/21067
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 847c25c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 12 13:52:07 2017 -0700
-
-    Prime the epan_dissect_t with postdissector wanted fields if necessary.
-    
-    This makes sure that postdissectors that indicate that they need certain
-    fields in the first pass will get them.
-    
-    While we're at it:
-    
-    Fix the field-fetching code in TRANSUM not to assume it got any
-    instances of the field being fetched.
-    
-    Rename process_packet_first_pass() in sharkd to process_packet(), as
-    it's the only routine in sharkd that processes packets.
-    
-    Rename process_packet() in tshark and tfshark to
-    process_packet_single_pass(), as it's what's used if we're only doing
-    one-pass analysis.
-    
-    Clean up comments and whitespace.
-    
-    Change-Id: I3769af952c66f5ca4b68002ad6213858ab9cab9b
-    Reviewed-on: https://code.wireshark.org/review/21063
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 74f9b27
-Author: Robert Cragie <Robert.Cragie@arm.com>
-Date:   Wed Apr 12 13:17:31 2017 +0100
-
-    Changes to Connectivity TLV for Thread v1.1 plus a couple of minor
-    bugfixes.
-    
-    Change-Id: I7c42ddabea263bb15178a71014b6e25eb690cc4c
-    Reviewed-on: https://code.wireshark.org/review/21042
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c587edb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Apr 12 07:34:31 2017 -0400
-
-    packet-thread.c: rename remainder -> remaining
-    
-    Pacify macOS buildbot
-    
-    Change-Id: I60bdb0ca7b9a1456d6fe12879dec61c5dff19e53
-    Reviewed-on: https://code.wireshark.org/review/21039
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ccdb907
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Apr 11 16:21:55 2017 +0200
-
-    ieee80211: fix "INVALID" label in Endpoints dialog
-    
-    Problem: the "Apply as filter" option in the Endpoints dialog creates
-    the "INVALID==11:22:33:44:55:66" filter for IEEE 802.11 packets.
-    
-    Since dissect_ieee80211_common initialises the address "whdr->src" and
-    "whdr->dst" fields using the "wlan_address_type" type, we have to do the
-    same in "wlan_host_get_filter_type". While at it, remove the check for
-    AT_ETHER since these will never match.
-    
-    Change-Id: I43f9298adfa406ea37a383187137e3e0c1f8733d
-    Reviewed-on: https://code.wireshark.org/review/21015
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 75d4059
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 12 01:56:21 2017 -0700
-
-    No need to include <epan/packet.h> in <epan/ftypes/ftypes-int.h>.
-    
-    It's sufficient to include <epan/proto.h>...
-    
-    ...as long as <epan/proto.h> includes <epan/tfs.h>, just as it includes
-    <epan/value_string.h>.
-    
-    And, since it's already including <epan/value_string.h>, it doesn't need
-    to have a definition of struct _value_string as an incomplete type,
-    given that <epan/value_string.h> gives a definition of it as a complete
-    type.
-    
-    Change-Id: Ic296bc0b0d68277ba7e0569412b780fd847ecca2
-    Reviewed-on: https://code.wireshark.org/review/21033
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c6fb9ee
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 6 21:22:39 2017 +0100
-
-    Add -Wduplicated-branches to extra warnings
-    
-    Change-Id: I11d60b4405f4fde039affcdeebb13a3ceb2aded6
-    Reviewed-on: https://code.wireshark.org/review/20428
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5be11a5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Apr 12 10:24:12 2017 +0200
-
-    GSM SMS: also consider source and destination address for reassembly
-    
-    Change-Id: I68ca00c970828311392565882bd7e4803df9818a
-    Reviewed-on: https://code.wireshark.org/review/21032
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 4d2d423
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Apr 11 21:56:14 2017 -0700
-
-    Rename routines to clarify what they do.
-    
-    XXX_prime_with_YYY makes it a bit clearer than does XXX_prime_YYY that
-    we're not priming YYY, we're priming XXX *using* YYY.
-    
-    Change-Id: I1686b8b5469bc0f0bd6db8551fb6301776a1b133
-    Reviewed-on: https://code.wireshark.org/review/21031
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c079255
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Apr 11 19:53:48 2017 -0700
-
-    Add an API to let a postdissector specify fields whose values it needs.
-    
-    Currently, this is only used to determine whether a protocol tree needs
-    to be built on the first pass or not - if there are postdissectors that
-    need fields, it does - but eventually we should be able to use it to
-    prime the dissection to deliver those fields in cases where we don't
-    need the *entire* protocol tree (rather than using a hack such as
-    cooking up a fake tap with a fake filter to do that).
-    
-    Update MATE and TRANSUM to use it.
-    
-    Clean up code to check whether we need a protocol tree, and add comments
-    before that code indicating, in each case, what the criteria are.
-    
-    The array of postdissectors includes a length, so we don't need to
-    separately keep track of the number of postdissectors.
-    
-    Clean up indentation while we're at it.
-    
-    Change-Id: I71d4025848206d144bc54cc82941089a50e80ab7
-    Reviewed-on: https://code.wireshark.org/review/21029
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit aa9a0b3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 31 18:14:38 2017 +0200
-
-    cmake: fix sporadic WSDG build failure on Windows
-    
-    The Windows builds (using msbuild) fail sporadically when building
-    documentation (target developer_guides). The problem is that the targets
-    "developer_guide_pdf_a4" and "developer_guide_html" both depend on
-    developer-guide.xml and msbuild does not notice that the file has
-    already been generated by the generate_developer-guide.xml target.
-    
-    For a discussion of the problem, see
-    https://gitlab.kitware.com/cmake/cmake/issues/16767
-    
-    To fix this, remove the "developer-guide.xml" dependency from
-    "developer_guide_xyz" (to prevent these targets from triggering building
-    "developer-guide.xml"). Instead, depend on a generated
-    "developer-guide.xml-stamp" file which is created by the
-    "generate_developer-guide.xml" target (but do *not* add it as output of
-    this target, otherwise we will have the original problem again).
-    
-    This workaround is restricted to the MSVC generators because otherwise
-    it would trigger a CMP0058 policy warning when used with Ninja.
-    
-    Change-Id: Idb3975cde35be2601b038a500d4886bbd3a684d7
-    Reviewed-on: https://code.wireshark.org/review/20812
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a71811a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 11 15:31:15 2017 -0400
-
-    packet-wsp.c: Fix WSP dissector loop (add_capabilities)
-    
-    Bug: 13581
-    Change-Id: I8b9f2df47fabb25d8851debc616fee1091d49f31
-    Reviewed-on: https://code.wireshark.org/review/21018
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a445efd
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 11 16:14:20 2017 -0400
-
-    packet-sigcomp.c: Fix sigcomp dissector loop
-    
-    Bug: 13578
-    Change-Id: I92892a74adea49b71670b4dca57dd52e13537bd5
-    Reviewed-on: https://code.wireshark.org/review/21019
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9830ead
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 11 16:38:35 2017 -0400
-
-    packet-slsk.c: Fix (many potential) SLSK long dissector loops
-    
-    Bug: 13576
-    Change-Id: I9a0f6c6b682877ed7b5ce4b6b249d4aa4034096a
-    Reviewed-on: https://code.wireshark.org/review/21020
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0d040f6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 11 16:57:30 2017 -0400
-
-    packet-asterix.c: Make hf_021_230_RA FT_DOUBLE type
-    
-    Bug: 13580
-    Change-Id: I4861c9b69bafe72ecb44e57c9be393506fb9715b
-    Reviewed-on: https://code.wireshark.org/review/21021
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 73e24b3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Apr 11 18:13:48 2017 +0200
-
-    Qt: mark bool and enum prefs as changed when modified via the menu
-    
-    When preferences are modified, these must be marked to ensure that the
-    "prefs_changed" callback for Lua dissectors is invoked.
-    
-    Bug: 13536
-    Change-Id: Ib93b2920ebefbc1532d3c6cd097f802a45ec6f35
-    Reviewed-on: https://code.wireshark.org/review/21016
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6924610
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Mon Apr 10 12:06:52 2017 +0200
-
-    NOE: fix "EVT_DEVICE_PRESENCE" message decoding
-    
-    Change-Id: Ib4c7cee28586a9506b94f4cd28ed6417809f76ce
-    Reviewed-on: https://code.wireshark.org/review/20952
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 14a1e1c
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Mon Apr 10 10:13:36 2017 +0200
-
-    Fix is_broadcast_bssid() for GCC.
-    
-    This seems to be working for clang, but with gcc bssid_broadcast.data
-    don't have FFs, and is_broadcast_bssid() fails.
-    
-    Change-Id: I69bdd91fe1838ab1f2a22a082a460c6cb3e34616
-    Reviewed-on: https://code.wireshark.org/review/20989
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 90c2e34
-Author: Mathias Kurth <mathias.kurth@commsolid.com>
-Date:   Mon Apr 10 10:45:08 2017 +0200
-
-    NB-IoT SRB1bis implementation
-    
-    Change-Id: If0c9dd3f3ca2321aaf9176330299a32f611d34ce
-    Reviewed-on: https://code.wireshark.org/review/20990
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 87fc4cc
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Apr 11 11:23:03 2017 +0200
-
-    GSM SMS: take into consideration TP-OA/TP-DA fields and direction for reassembly
-    
-    Bug: 13572
-    Change-Id: Ieb1b972f95bc5c445597dd9aa2a0d8e7e9985238
-    Reviewed-on: https://code.wireshark.org/review/21013
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5bcd2f6
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Apr 3 02:32:03 2017 +0200
-
-    Initial support for Generic Netlink (genl) dissection
-    
-    For consistency with other netlink dissectors, the file is named
-    "netlink-generic", but the short protocol name is "genl" for brevity.
-    
-    Ping-Bug: 13561
-    Change-Id: I6f94454f8366467fd833c3e57364c515aee9e86f
-    Reviewed-on: https://code.wireshark.org/review/20875
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4eed07a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 18 16:03:43 2017 +0100
-
-    sctp: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: Ia2cca91f03f312b0163848917f04bb5e17baf876
-    Reviewed-on: https://code.wireshark.org/review/20692
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a265283
-Author: Rémy Léone <remy.leone@gmail.com>
-Date:   Mon Mar 20 15:39:31 2017 +0100
-
-    Simplify filter and 6Top commands
-    
-    - Change internal variables to have shorter and explicit name
-    - Add extra item to perform filtering
-    
-    Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6
-    Reviewed-on: https://code.wireshark.org/review/20928
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6b30fe1
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Apr 10 23:26:07 2017 -0400
-
-    packet-icmp.c: Remove tree check that prevents expert info
-    
-    proto_tree_add_checksum uses expert info and shouldn't be
-    "NULL tree protected"
-    
-    Change-Id: If8a367c2be69252e9c6613329b7f78ad7e1e34eb
-    Ping-Bug: 13586
-    Reviewed-on: https://code.wireshark.org/review/21012
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 069c15c
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Mon Apr 10 20:18:27 2017 +0200
-
-    LDP: Add Entropy Label Capability TLV
-    
-    s. https://tools.ietf.org/html/rfc6790#section-5.1
-    
-    Bug: 13584
-    Change-Id: I1271b154960d7c46f9d0776a431beab3290c2871
-    Reviewed-on: https://code.wireshark.org/review/21007
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 14ba815
-Author: Robert Cragie <Robert.Cragie@arm.com>
-Date:   Fri Mar 17 16:59:23 2017 +0000
-
-    MLE and Thread: Additional dissectors
-    
-    Additional dissectors for Mesh Link Establishment (MLE) and Thread CoAP
-    TMF messages. MLE is also used in ZigBee IP.
-    
-    Change-Id: I5b9c224d7df48855b79ccac67dca7661a51d0a9b
-    Bug: 13495
-    Reviewed-on: https://code.wireshark.org/review/20594
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 043df01
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 27 06:42:03 2017 -0400
-
-    Add support for BASE_VALS_NO_UNKNOWN
-    
-    BASE_VALS_NO_UNKNOWN is a special value_string value for only a single
-    (maybe 2) numerical value(s).  If a field has the numerical value
-    that doesn't match anything in the value_string, just the number
-    is supplied for the field (no "Unknown")
-    
-    Dissectors that had this use case have been converted in the patch.
-    
-    Change-Id: Ie63a36cceec2fe4436938ec7e3d7f9e690d2b8d9
-    Reviewed-on: https://code.wireshark.org/review/20736
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ded9ad7
-Author: Robert Cragie <Robert.Cragie@arm.com>
-Date:   Fri Mar 17 11:52:27 2017 +0000
-
-    IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP
-    
-    Enhancements to security processing add support for Thread, MLE and ZigBee
-    IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE
-    security processing. Thread additionally uses a sequence counter.
-    
-    Ping-Bug: 13495
-    Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742
-    Reviewed-on: https://code.wireshark.org/review/20585
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2321a92
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Apr 10 11:44:17 2017 +0200
-
-    PacketBB: do not add more bytes to the protocol tree than the real addr array length
-    
-    Bug: 13559
-    Change-Id: I612a7e2c104603a0aa14a0775bf9b8d247069398
-    Reviewed-on: https://code.wireshark.org/review/20992
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fa97a31
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Apr 10 14:26:00 2017 +0200
-
-    RTPproxy: use tvb_format_text() to add text to info column
-    
-    Otherwise you can have put multiple lines in the info column when a
-    packet is wrongly identified as RTPproxy (TCP connection using the
-    default RTPproxy port for example)
-    
-    Bug: 13582
-    Change-Id: I817f67d5fc8c0d5f9d252f0f949af715bfc0ef56
-    Reviewed-on: https://code.wireshark.org/review/21000
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Lemenkov <lemenkov@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 82442d7
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Apr 10 13:12:14 2017 +0200
-
-    [SGSAP] Add a cause value.
-    
-    Change-Id: I62c04933fa0f80c2e4af8a885554328cc9fc50a7
-    Reviewed-on: https://code.wireshark.org/review/20995
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2861b38
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Apr 10 10:13:33 2017 +0200
-
-    NBAP: fix malformed packet error when having a single byte BindingID
-    
-    The tvb length must be checked before trying to read 2 bytes
-    
-    Bug: 13577
-    Change-Id: I8ba8320b3a0a96239e52a36bc09bb6b41e65a657
-    Reviewed-on: https://code.wireshark.org/review/20991
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d10421a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Apr 10 09:41:08 2017 +0200
-
-    WSP: fix addition of x-up-proxy-tod in tree
-    
-    Regression introduced in gcf7979c
-    
-    Bug: 13579
-    Change-Id: Ia2c0d95eec45937ffcdbee52022466a30ebab1f8
-    Reviewed-on: https://code.wireshark.org/review/20988
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 77c580d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Apr 10 08:14:10 2017 +0200
-
-    dpnet: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I874ce616ef2b3d7eac0d7b034c83c0b7ac8ac731
-    Reviewed-on: https://code.wireshark.org/review/20987
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 69ccb66
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Apr 10 08:11:38 2017 +0200
-
-    noe: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I7a20dd07b378dbd27122b3a92b1bfa9bdb5b5d4d
-    Reviewed-on: https://code.wireshark.org/review/20986
-    Reviewed-by: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b8acaac
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Apr 10 11:45:03 2017 +0200
-
-    bthci_cmd: fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7
-    
-    Change-Id: Id18a0879114f11acb1db8dea8d94a1fb845b5e58
-    Reviewed-on: https://code.wireshark.org/review/20993
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8344f5a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Apr 10 11:47:39 2017 +0200
-
-    dns: fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7
-    
-    and add also a missing (optional) break after default
-    
-    Change-Id: I03d594db4702ccb4ebab3fca6b071d323e7f8d39
-    Reviewed-on: https://code.wireshark.org/review/20994
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 6b802f3
-Author: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date:   Fri Apr 7 14:52:19 2017 +1000
-
-    dpnet: Use a bitfield for the Enum Reponse description flags
-    
-    Change-Id: I296c032a48c103e32fe886a317fddf7a52bff6c9
-    Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-    Reviewed-on: https://code.wireshark.org/review/20959
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 58406cf
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sun Apr 9 19:47:22 2017 +0200
-
-    SSH: display protocol without carriage return / newline
-    
-    Add protocol to tree without carriage return / newline bytes
-    
-    Bug: 13574
-    Change-Id: I757a0a3b034943da7f42557a96cdb10a45627dc7
-    Reviewed-on: https://code.wireshark.org/review/20981
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6b37142
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 9 12:27:57 2017 -0700
-
-    Pull all the "load settings" calls into a epan_load_settings() routine.
-    
-    That way, nothing using libwireshark needs to know what settings need to
-    be loaded, they just call epan_load_settings().
-    
-    Change-Id: I9390e259e286fc4f5acaeaac2767e4c3c4b656af
-    Reviewed-on: https://code.wireshark.org/review/20983
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7d5ce06
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 9 02:01:05 2017 -0700
-
-    Pull the error reporting into {read,save}_filter_list.
-    
-    Change-Id: I4d9582661f2f1728d400eeb2a1b1dea98f32ce7f
-    Reviewed-on: https://code.wireshark.org/review/20982
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1abbb50
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 31 18:13:01 2017 +0200
-
-    cmake: fail if ENABLE_CHM_GUIDES but HTMLHelp is unavailable
-    
-    While "cmake -DENABLE_CHM_GUIDES=ON" succeeds on Linux, the actual build
-    fails. Since the default for ENABLE_CHM_GUIDES is OFF, let's fail early
-    when ENABLE_CHM_GUIDES is requested.
-    
-    When hcc.exe is found, do report the package as available.
-    
-    Change-Id: If6fc3eb18f1150c251e2886f1f16277669f8ec25
-    Reviewed-on: https://code.wireshark.org/review/20811
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 05c5013
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Apr 9 10:00:45 2017 -0700
-
-    [Automatic update for 2017-04-09]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I147cbfa4c9cca70ad581d2e3c149473afd243086
-    Reviewed-on: https://code.wireshark.org/review/20978
+    (cherry picked from commit c919c625025afdca318a1a3413b268d00ad1985c)
+    Reviewed-on: https://code.wireshark.org/review/22356
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1fd23e2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 21:50:48 2017 -0700
-
-    We use libui with dumpcap, which is built PIE, so libui should be, too.
-    
-    Change-Id: Ic469517dc414e1eb62b27b6d2b0b0a7837790bf9
-    Reviewed-on: https://code.wireshark.org/review/20975
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 77cad85
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 21:24:45 2017 -0700
-
-    Move the filter file reading code to libui.
-    
-    It doesn't belong in libwireshark, as it doesn't affect dissection, but
-    it *does* belong in libui, as it's helper code for the UIs.
-    
-    Change-Id: I8a5e0640a299a08e9ec1917dd253197438ebfdbc
-    Reviewed-on: https://code.wireshark.org/review/20974
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 62b3424
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 20:02:53 2017 -0700
-
-    Pull the error-reporting code for preference files into read_prefs().
-    
-    No need to duplicate it in N different programs.
-    
-    Update comments while we're at it.
-    
-    Change-Id: I3096cbe5448a19363eff6303bdd54e522dae9336
-    Reviewed-on: https://code.wireshark.org/review/20973
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f0a24be
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 19:54:08 2017 -0700
-
-    Have vwarning_alert_box() pop up a warning, not an error.
-    
-    Change-Id: I993133931af222c94f4a8814583fef97e49542ca
-    Reviewed-on: https://code.wireshark.org/review/20972
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ed6f234
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 19:42:57 2017 -0700
-
-    Fix routine name.
-    
-    Change-Id: I3c1e4080c28d0d14eaf7ecfb5540c53f8736703c
-    Reviewed-on: https://code.wireshark.org/review/20971
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 23a7890
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 18:59:17 2017 -0700
-
-    Pull the code to save enabled/disabled lists into libwireshark.
-    
-    It's identical in the GTK+ and Qt UIs, and it should just be done in
-    libwireshark.
-    
-    Rename some routines to just speak of enabled_and_disabled_lists, so we
-    don't have to say enabled_and_disabled_protos_and_heuristic_dissectors
-    or something such as that.
-    
-    Clean up indentation.
-    
-    Change-Id: Ief2e612d9e1b60d8d0123b6bd3409dce5faf6495
-    Reviewed-on: https://code.wireshark.org/review/20970
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 92ebd63
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Apr 4 21:30:45 2017 +0200
-
-    netlink: let subdissectors handle the netlink header
-    
-    Let subdissectors handle parsing and addition of the Netlink header
-    instead of doing this before calling subdissectors. After this patch:
-    
-     - Protocol filters like "netlink-netfilter" can be used to match
-       packets (previously only a text item was added to the tree).
-     - Subdissectors have more freedom in modifying the type field, so now
-       it shows the correct type directly rather than "Message type:
-       Protocol-specific".
-     - netfilter: the type fields are now actually linked to a tvb,
-       previously it was linked to a NULL tvb.
-     - netfilter: fix unintended rejection of packets (the length should
-       have been added to the offset, otherwise it would fallback to the
-       data dissector).
-     - Now subdissectors will not be called for control messages (so the
-       netlink-conntrack.pcap sample now shows "Netlink" instead of "Netlink
-       route" for the "End of dump" control message).
-    
-    Change-Id: I2ab1bef91fb0080664195b281a6a45c9702914e5
-    Reviewed-on: https://code.wireshark.org/review/20910
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0add542
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Apr 4 13:13:59 2017 +0200
-
-    netlink: add helper for dissecting an array of attributes
-    
-    From https://wiki.linuxfoundation.org/networking/generic_netlink_howto
-    "Arrays can be represented by using a single nested attribute as a
-    container with several of the same attribute type inside each
-    representing a spot in the array."
-    
-    This patch adds a helper function to dissect such a type (it will be
-    used by Generic Netlink for CTRL_ATTR_OPS and CTRL_ATTR_MCAST_GROUPS).
-    
-    Change-Id: I60537712f7fb0f9d4fb8850c6c8eef590635f49f
-    Reviewed-on: https://code.wireshark.org/review/20903
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 802479d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 15:26:32 2017 -0700
-
-    Update symbol lists.
-    
-    Change-Id: I5bd2aaaa28923a6fb5f0954e306cf0fc0c6dca5a
-    Reviewed-on: https://code.wireshark.org/review/20969
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a5fadc9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 14:59:31 2017 -0700
-
-    Link dftest with libui.
-    
-    No need to select one source file from libui and build it independently;
-    just go ahead and link.
-    
-    Change-Id: I7ae5d8f9b83832518a4fb3430cb348e8c4d6b7ab
-    Reviewed-on: https://code.wireshark.org/review/20968
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8f2b1bf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 14:44:00 2017 -0700
-
-    Link rawshark with libui.
-    
-    No need to select one source file from libui and build it independently;
-    just go ahead and link.
-    
-    Change-Id: Ie451b736411bcdac52ccde56f329c933a0065ead
-    Reviewed-on: https://code.wireshark.org/review/20967
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2c44a7f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 8 12:45:19 2017 -0700
-
-    Clean up handling of enabled/disabled protocols/heuristic dissectors.
-    
-    Add a "report a warning message" routine to the "report_err" code in
-    libwsutil, and rename files and routines appropriately, as they don't
-    only handle errors any more.
-    
-    Have a routine read_enabled_and_disabled_protos() that reads all the
-    files that enable or disable protocols or heuristic dissectors, enables
-    and disables them based on the contents of those files, and reports
-    errors itself (as warnings) using the new "report a warning message"
-    routine.  Fix that error reporting to report separately on the disabled
-    protocols, enabled protocols, and heuristic dissectors files.
-    
-    Have a routine to set up the enabled and disabled protocols and
-    heuristic dissectors from the command-line arguments, so it's done the
-    same way in all programs.
-    
-    If we try to enable or disable an unknown heuristic dissector via a
-    command-line argument, report an error.
-    
-    Update a bunch of comments.
-    
-    Update the name of disabled_protos_cleanup(), as it cleans up
-    information for disabled *and* enabled protocols and for heuristic
-    dissectors.
-    
-    Support the command-line flags to enable and disable protocols and
-    heuristic dissectors in tfshark.
-    
-    Change-Id: I9b8bd29947cccdf6dc34a0540b5509ef941391df
-    Reviewed-on: https://code.wireshark.org/review/20966
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f1751ef
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Apr 8 19:34:24 2017 +0200
-
-    checkhf: handle C++-style comments
-    
-    "tools/checkhf.pl epan/dissectors/packet-umts_fp.c" gave this error:
-    
-        Complex regular subexpression recursion limit (32766) exceeded at tools/checkhf.pl line 273.
-    
-    This is caused by the comment "// ... Indicator's ..." which failed to
-    match the single-quoted string and caused "catastrophic backtracking".
-    Solution to fix this case is to disallow unescaped newlines (add "\n" to
-    the negated character class). Additionally, add logic to remove
-    C++-style comments for completeness.
-    
-    Tested against all epan/dissectors/packet-*.c files, the only difference
-    in output is this umts_fp case, the running time has not regressed.
-    
-    Change-Id: I7b43e01e1580acf831c0485513135b613bb02e8b
-    Reported-by: Joerg Mayer
-    Reviewed-on: https://code.wireshark.org/review/20965
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6d204e5
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sat Apr 1 22:48:33 2017 +0200
-
-    ANCP: Update to RFC6320
-    
-    Updates ANCP dissector to final RFC6320.
-    Additional updates types and codes to current IANA registry values:
-    https://www.iana.org/assignments/ancp/ancp.xhtml
-    
-    Bug: 13532
-    Change-Id: I15d3e66e049d425350a528d04d4a5ff24d9b26bd
-    Reviewed-on: https://code.wireshark.org/review/20964
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 029c38d
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sat Apr 8 09:50:29 2017 +0100
-
-    Cope with spaces among options better, plus trivial cleanups
-    
-    Change-Id: I3a00cf5dbcc0ee83a31f95ac74759cbc0aaa0e89
-    Reviewed-on: https://code.wireshark.org/review/20962
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Michael Mann <mmann78@netscape.net>
-
-commit 8cfa57c
-Author: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Date:   Fri Apr 7 10:17:35 2017 -0300
-
-    Fix NR-SACK DuplicateTSN field
-    
-    It was commented out because the loop reading it was filling using the
-    wrong header field, probably just due to a copy&paste issue.
-    Also, fix its width, which is actually 4-bytes long. The loop reading it
-    is reading it correctly already.
-    
-    Change-Id: Ie1a3cb901ec578e51395ba110ea1792476919d75
-    Reviewed-on: https://code.wireshark.org/review/20961
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dc81822
-Author: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Date:   Wed Apr 5 22:36:13 2017 -0300
-
-    Fix size information for sctp.sack_duplicate_tsn
-    
-    It was listed as UINT16 while it's actually UINT32.
-    The loop that actually parses the duplicate_tsn's in dissect_sack_chunk
-    is already parsing it using 4-bytes, as per SACK_CHUNK_DUP_TSN_LENGTH
-    definition.
-    
-    Change-Id: I90fa115844a397f143d39770da9f5bc3c5c891b5
-    Reviewed-on: https://code.wireshark.org/review/20960
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 99e0b39
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Fri Mar 31 20:35:51 2017 +0200
-
-    sharkd: add tap for RTP stream analysis.
-    
-    Change-Id: Idf88a891b69e4d89b2d0c62d505059ab073e266e
-    Reviewed-on: https://code.wireshark.org/review/20816
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit b9b5703
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 31 01:06:07 2017 +0200
-
-    Qt: Remember exact position of selected item in tree
-    
-    When switching between packets, the first field at a level would be
-    selected. This is annoying if you have similarly structured trees (like
-    TLVs or text labels).
-    
-    Combined with something like bug 13533, this causes erratic jumping. Fix
-    this by incorporating the level position in the path.
-    
-    Change-Id: I998853ce899fffc69dd4932902508141325c35a4
-    Ping-Bug: 13533
-    Reviewed-on: https://code.wireshark.org/review/20799
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 4384591
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Apr 6 20:41:03 2017 +0200
-
-    kpasswd: remove unused entry hf_kpasswd_newpassword
-    
-    Change-Id: I46a295ee55f97c9b384aca07f6de50bc85bd5151
-    Reviewed-on: https://code.wireshark.org/review/20954
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2780ad6
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Apr 6 20:43:26 2017 +0200
-
-    kpasswd: remove unnecessary if(tree) check
-    
-    Change-Id: I6f50198f9bd646bb01365feef929213f4fa274a9
-    Reviewed-on: https://code.wireshark.org/review/20955
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9d5f172
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Apr 6 20:53:42 2017 +0200
-
-    simplify the description of tvb_memeql()
-    
-    Make the description simpler than the code (hopefully).
-    
-    Change-Id: Iaede1a6eb18e25e379b719f9b66ecbef0c00ea63
-    Reviewed-on: https://code.wireshark.org/review/20956
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ae9efa2
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Apr 6 21:10:00 2017 +0200
-
-    adwin: remove an unnecessary if(tree) check
-    
-    Change-Id: If55f3e30192d5af6700d5193880bc932623d254f
-    Reviewed-on: https://code.wireshark.org/review/20957
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4baa0c2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 20:45:56 2017 +0100
-
-    adb: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: Iaa441f2f1c6147effe47d735d296f3c496518796
-    Reviewed-on: https://code.wireshark.org/review/20424
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a771a12
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Wed Apr 5 23:31:13 2017 -0400
-
-    PCEP: Decode "SR-RRO subobjects" as defined in draft-ietf-pce-segment-routing-08.
-    
-    Change-Id: I93cc00da055364b2a6d647966fcd299c1f4e206e
-    Reviewed-on: https://code.wireshark.org/review/20943
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit cc30b7b
-Author: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
-Date:   Wed Apr 5 23:55:27 2017 +0200
-
-    NOE: fix "EVT_LOCAL_APPLICATION" message decoding
-    
-    Change-Id: Ic27d05afa3a785152c7a6e114d8cf1f13cb65859
-    Reviewed-on: https://code.wireshark.org/review/20942
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2bd5adc
-Author: Rémy Léone <remy.leone@gmail.com>
-Date:   Mon Apr 3 11:01:36 2017 +0200
-
-    randpkt: Add support to generate IEEE802.15.4 packets
-    
-    Change-Id: I17a93c18d204cb7ab70a5c6898f866b32f745a4b
-    Reviewed-on: https://code.wireshark.org/review/20878
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 280f2fe
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Apr 5 22:58:18 2017 +0200
-
-    RPC-over-RDMA: protect against a variable overflow
-    
-    Bug: 13558
-    Change-Id: I0cb379df1a6c40a3c4a84f18c631d9239550c3ab
-    Reviewed-on: https://code.wireshark.org/review/20941
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0bd1190
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Apr 5 22:29:01 2017 +0200
-
-    BGP: fix a variable underflow
-    
-    Bug: 13557
-    Change-Id: I882c8a7161ff233e289a413579ed51c3b8f43c36
-    Reviewed-on: https://code.wireshark.org/review/20940
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 899f989
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Apr 5 22:01:35 2017 +0200
-
-    WASSP: replace a DISSECTOR_ASSERT() by an expert info
-    
-    Bug: 13555
-    Change-Id: I052600eee1e0bf0f036e419bc9df7ff228941883
-    Reviewed-on: https://code.wireshark.org/review/20937
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 462fba9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Apr 5 21:33:15 2017 +0200
-
-    LAPSat: remove a useless assert
-    
-    If the length is bigger than the captured length, an excpetion will be thrown anyway
-    
-    Bug: 13554
-    Change-Id: Icf0f2b049847ec945efdf42815b49c4e6040e19d
-    Reviewed-on: https://code.wireshark.org/review/20936
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f53333f
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Wed Apr 5 13:35:46 2017 -0400
-
-    BGP: Update BGP Path Attributes with latest IANA assignment.
-    
-    Change-Id: I6f66a5d51677db6cfea279c322ef9f976452de90
-    Reviewed-on: https://code.wireshark.org/review/20930
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a00b971
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Apr 5 20:53:34 2017 +0200
-
-    TAPA: replace DISSECTOR_ASSERT() calls by expert info
-    
-    Bug: 13553
-    Change-Id: I01d35c7e68bfee6d30da63cb804dd9913bb5a7a2
-    Reviewed-on: https://code.wireshark.org/review/20932
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9737754
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 5 12:26:26 2017 -0700
-
-    More OS name cleanups.
-    
-    Use macOS when not referring to a particular release; use the
-    appropriate name when referring to a particular release.
-    
-    Change-Id: I9293d4db7c91d7c859d7c067c0f0b3c9c482fcc5
-    Reviewed-on: https://code.wireshark.org/review/20935
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3dd45f5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 5 12:19:28 2017 -0700
-
-    Remove trailing whitespace.
-    
-    Change-Id: If044e0df526cfba0061ab3e5beec5a56dfe1e870
-    Reviewed-on: https://code.wireshark.org/review/20934
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 357cfd3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 5 12:15:27 2017 -0700
-
-    A bunch of "{Mac} OS X" -> "macOS" changes.
-    
-    Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
-    10.0", for example.  It was "Mac OS X" until 10.8 (although 10.7 was
-    sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
-    X" from 10.8 to 10.11.
-    
-    Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
-    Reviewed-on: https://code.wireshark.org/review/20933
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1f94d34
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Apr 5 10:50:53 2017 -0700
-
-    Update comments.
-    
-    The OS is now called macOS.
-    
-    In newer versions of macOS, tar can uncompress xz'ed tarballs, but older
-    versions don't support that.
-    
-    Change-Id: Ife8ac7fc7da69586ad6b718def4a52588740686b
-    Reviewed-on: https://code.wireshark.org/review/20931
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 71905a3
-Author: Ahmad Fatoum <ahmad@a3f.at>
-Date:   Wed Apr 5 11:31:48 2017 +0200
-
-    Follow HTTP redirects when fetching tarballs in macosx-setup.sh
-    
-    xz now hosts older releases on SourceForge and does a 302 redirect
-    to SourceForge, which cURL without -L won't follow.
-    The default value of 50 redirects before giving up is left unchanged.
-    
-    Change-Id: I2d73301f025737ad84438d01a445fe6f257ba9d5
-    Reviewed-on: https://code.wireshark.org/review/20926
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2eca457
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 4 22:05:10 2017 -0400
-
-    Display numeric fields in their base display type for columns.
-    
-    Don't force display of BASE_DEC
-    
-    Change-Id: Id6f115c074f0d4b1bd277dcbf6c523ffaa295edb
-    Reviewed-on: https://code.wireshark.org/review/20918
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c018405
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Dec 1 12:00:07 2016 +0100
-
-    Bluetooth: HCI_CMD: Implement all remaining commands
-    
-    Commands:
-      Set Connectionless Slave Broadcast Data
-      Read Synchronization Train Parameters
-      Write Synchronization Train Parameters
-      Read Secure Connections Host Support
-      Write Secure Connections Host Support
-      Read Authenticated Payload Timeout
-      Write Authenticated Payload Timeout
-      Read Local OOB Extended Data
-      Read Extended Page Timeout
-      Write Extended Page Timeout
-      Read Extended Inquiry Length
-      Write Extended Inquiry Length
-    
-    Change-Id: If6d7a7b5405c9b9bd708553d56c6bd372b0b293b
-    Reviewed-on: https://code.wireshark.org/review/20891
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 023cf32
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Mar 28 18:27:28 2017 +0200
-
-    Qt: support selecting the min/max packet from IO Graph
-    
-    GTK+ supports selecting the first packet (via the "left mouse button")
-    and the last packet (via the "right mouse button") in an interval, and
-    Qt supports selecting the last packet of an interval. This patch enables
-    picking the packet matching the extreme value in Qt.
-    
-    Bug: 12401
-    Change-Id: If0b7f2f1bf8c384ea0d68b5f5fae2d1e8b4b0ac2
-    Reviewed-on: https://code.wireshark.org/review/20769
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a5f9b4e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Mar 28 18:19:23 2017 +0200
-
-    Qt: fix tracer and selection of packet in IO Graph
-    
-    Do not assume first graph in the list, pick the first visible graph.
-    This (1) fixes the tracer which would otherwise show a marker at an
-    non-obvious position that is not located on the graph and (2) fixes the
-    GoToPacket action when clicking on the graph.
-    
-    Bug: 13537
-    Change-Id: I49d750102ad25c8539aa2e44fe1583cd535dd471
-    Reviewed-on: https://code.wireshark.org/review/20768
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 48a614d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Apr 5 10:59:51 2017 +0200
-
-    LTE RRC: add description of FGI 42 bit
-    
-    Change-Id: Ie72e82c26eddef9ca99b7da801cc85e54ba5158e
-    Reviewed-on: https://code.wireshark.org/review/20924
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3053d7c
+commit 8ddc581
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Apr 5 09:13:38 2017 +0200
+Date:   Thu Jun 22 09:58:14 2017 -0400
 
-    Qt: Remove unused argument in Size string
+    wsutil: Back out profile_write_info_file
     
-    Change-Id: I4c09092aba986c4fe224a46cac23d70bc5915aa6
-    Reviewed-on: https://code.wireshark.org/review/20923
+    Change-Id: I9253a4295aecb23ec5e87d0453249955ca1ea18a
+    Reviewed-on: https://code.wireshark.org/review/22347
     Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 9f71c86
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 4 10:43:51 2017 -0400
-
-    A few more BASE_UNIT_STRING cases.
-    
-    Change-Id: Ic443f773d19e63aad59292bfb540f58bda565241
-    Reviewed-on: https://code.wireshark.org/review/20917
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 70eeeff
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 4 10:41:55 2017 -0400
-
-    packet-etch.c: Optimize proto_item_append_text use
-    
-    Change-Id: I0272b7160fa2207fd4bba40d9d4b59ab920c6298
-    Reviewed-on: https://code.wireshark.org/review/20916
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 76edea1
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Mar 16 19:14:47 2017 +0100
-
-    Bluetooth: HCI_CMD: Fix master-slave role
-    
-    Initiator is always master. Only Role switch event may change it.
-    Improve "Accept Connection Request" to avoid users confusion
-    by using new specification description:
-    0x00 Become the Master for this connection. The LM will perform the role switch.
-    0x01 Remain the Slave for this connection. The LM will NOT perform the role switch.
-    
-    Field "Role" is now splitted from: "bthci_cmd.role"
-    and it name is "bthci_cmd.acr.role".
-    
-    Change-Id: I98e3641b9ba9d2fd6c97808e4772beb4265018fd
-    Reviewed-on: https://code.wireshark.org/review/20894
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
-
-commit cf54564
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Apr 2 18:44:15 2017 -0400
-
-    packet-geneve.c: Convert print_flags to proto_tree_add_bitmask
-    
-    Change-Id: Ibf3ed8885737dcec2f59ba640ff202097195322d
-    Reviewed-on: https://code.wireshark.org/review/20915
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 697ea9a
-Author: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date:   Sun Apr 2 12:20:03 2017 +1000
-
-    dpnet: Dissect command frame packets
-    
-    Change-Id: I00305d1a2d6f3d0f260f5ca6352e7f40ea3e878b
-    Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-    Reviewed-on: https://code.wireshark.org/review/20876
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f9c800a
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Sun Apr 2 14:41:41 2017 -0400
-
-    ISIS: Adjust header field names to align with ISO 10589:2002.
-    
-    Change-Id: Id495f1ca5a7ea2081b6ed35690ad94978c17ec6f
-    Reviewed-on: https://code.wireshark.org/review/20808
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 919b263
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Apr 4 14:07:07 2017 +0200
-
-    dpnet: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Ic3831f8d4e174a56c3b3f6ca2428496e9b307d05
-    Reviewed-on: https://code.wireshark.org/review/20901
-    Reviewed-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e46a8fc
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Apr 5 00:05:17 2017 +0200
-
-    E.212: fix a typo
-    
-    Thanks Gerald
-    
-    Change-Id: I9e076e2b83e0868620cb943cd29e93f0495bc913
-    Reviewed-on: https://code.wireshark.org/review/20913
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0852b7b
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Tue Apr 4 11:59:42 2017 +0200
+commit a4694da
+Author: Chris Bontje <cbontje@gmail.com>
+Date:   Tue Jun 20 14:15:31 2017 -0600
 
-    EAPOL-MKA: Implement updates from IEEE standards
-    
-    Alignment with IEEE 802.1X-2010
-    - Addition of Announcement
+    packet-mbtcp - Fix retrieval of Holding/Input Register Format Preference
     
-    Alignment with IEEE 802.1X-2010 EAPOL-MKA
-    - Interpretation of algorithm agility value
-    - Interpretation of confidentiality offset values
-    - Interpretation of (wrong) cipher suite ID
-    - Padding handling for more parameter sets
-    - Improved robustness malformed frames
-    - Flexible SAK size handling
-    - Addition of Announcement parameter set
-    - Split ICV from ICV indicator
-    - Handle unknown parameter set
-    
-    Additions for IEEE 802.1Xbx-2014
-    - Allow version 2 handling
-    - Addition of XPN parameter set
-    
-    Change-Id: If7a36de6bb3b5148bfd1bd890e4490c045fba40d
-    Reviewed-on: https://code.wireshark.org/review/20899
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I7a6a409df5c977db1898aec6a47ae3dd8427a00c
+    Reviewed-on: https://code.wireshark.org/review/22286
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2a8bcfe
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Apr 4 11:05:24 2017 -0700
-
-    White space and style cleanups.
-    
-    Get rid of extra blank lines.
-    
-    Clean up indentation.
-    
-    Use the same style for switch statements inside cases for the main
-    switch statement in dissect_dns_answer() that's used for the main switch
-    statement.
-    
-    Change-Id: I77da88a9ffcbf176d27e16222e75c778202c651b
-    Reviewed-on: https://code.wireshark.org/review/20907
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 20edef4
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Tue Apr 4 14:34:15 2017 +0200
-
-    NOE: fix "Context" field decoding of EVT_CONTEXT_SWITCH message (was "Unknown" instead of "Call Server" or "Presentation Server")
-    
-    Change-Id: I85e2980d5cb4adb4f5806dbc215df016c094c75e
-    Reviewed-on: https://code.wireshark.org/review/20904
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4c555c6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Apr 4 14:07:37 2017 +0200
-
-    osi-utils: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I48121b5e73501a39ff5fb7986ab58242ee32af53
-    Reviewed-on: https://code.wireshark.org/review/20902
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2fb1cef
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Apr 4 10:55:36 2017 -0400
-
-    debian-nightly-package.sh: Add Wireshark license
-    
-    Change-Id: Idff9c807cbc3714acafd98bea5b15b06bf23f0a9
-    Reviewed-on: https://code.wireshark.org/review/20906
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7f32349
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Nov 24 10:50:46 2016 +0100
-
-    Bluetooth: HCI_CMD: Implement a lot of remaining commands
-    
-    Commands:
-      Enhanced Setup Synchronous Connection
-      Enhanced Accept Synchronous Connection Request
-      Truncated Page
-      Truncated Page Cancel
-      Set Connectionless Slave Broadcast
-      Set Connectionless Slave Broadcast Receive
-      Start Synchronization Train
-      Receive Synchronization Train
-      Remote OOB Extended Data Request Reply
-      Set MWS Channel Parameters
-      Set External Frame Configuration
-      Set MWS Signaling
-      Set MWS Transport Layer
-      Set MWS Scan Frequency Table
-      Set MWS Pattern Configuration
-      Set Reserved LT_ADDR
-      Delete Reserved LT_ADDR
-      Set Triggered Clock Capture
-      AMP Test
-      Write Secure Connections Test Mode
-    
-    Fix copy-paste issue:
-    Implementation for "Get MWS Transport Layer Configuration"
-    was in: "Set Triggered Clock Capture"
-    
-    Change-Id: I4a2119278b1f3a7e1a3ec87f499d9aa43e8b8a96
-    Reviewed-on: https://code.wireshark.org/review/20890
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 386dd82
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 2 22:09:56 2017 +0200
-
-    ICMPv6: use a single field for RPL Secure Algorithm
-    
-    Bug: 13551
-    Change-Id: If652f2c7c351cca271e9b08708db7c0b47b82932
-    Reviewed-on: https://code.wireshark.org/review/20872
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit 130b514be216e8ccc42c6831f62ecb23e9b83917)
+    Reviewed-on: https://code.wireshark.org/review/22351
 
-commit 1e5f39d
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Apr 3 22:22:14 2017 +0200
-
-    cmake: add feature info for yapp
-    
-    Explain what it is and where to get it from.
-    
-    Change-Id: I0a02f1c3c25b76772dddda95d8e6c410b595c036
-    Reviewed-on: https://code.wireshark.org/review/20886
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 077f99f
+commit 61d2f5e
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Apr 4 06:48:17 2017 +0000
-
-    RTPS: fix no previous prototype for function 'rtps_util_add_timestamp' [-Wmissing-prototypes]
-    
-    Change-Id: I2757f6442b9f3d37897225a90dd6d848e4a9c373
-    Reviewed-on: https://code.wireshark.org/review/20889
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 174dc4b
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Mar 4 19:03:15 2017 +0100
-
-    Bluetooth: HFP: Fix "Parameters" field highlight
-    
-    It seems that "Parameters" highlight only one byte instead of all
-    parameters. Fix that before someone requests to fix that.
-    
-    Change-Id: If056f16ffbfc234e5d6443fb43b34bc107df964f
-    Reviewed-on: https://code.wireshark.org/review/20898
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 34fa55c
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Mar 23 12:55:37 2017 +0100
-
-    Bluetooth: HCI: Fix tracking for "Read Clock Offset"
-    
-    Fix missing information about command-event(response) tracking.
-    
-    Change-Id: I060ae71f8efb774d4d04693e58f750dec442c046
-    Reviewed-on: https://code.wireshark.org/review/20896
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 889752a
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Mar 7 19:15:57 2017 +0100
-
-    Bluetooth: PBAP: Fix two Application Parameters fields
-    
-    Application Parameters:
-      vCard Selector
-      Data Filter
-    
-    Both are splitted to two 4-bytes subfield, so there is a need to
-    move offset for second field.
-    
-    Change-Id: I66c106f5455bff8789f25c683301276b1e484e65
-    Reviewed-on: https://code.wireshark.org/review/20892
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2db162d
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Mar 20 16:03:31 2017 +0100
-
-    Qt: Fix Conversation dialog's refreshing table
-    
-    Fix wrong slot statement ("name").
-    
-    Change-Id: I6911d6f7cb6d01ea14d5172c334c54f74ae6e546
-    Reviewed-on: https://code.wireshark.org/review/20897
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ae7ac44
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Mar 20 16:00:51 2017 +0100
-
-    Bluetooth: HFP: Fix expert info for reserved field in +BRSFs
-    
-    It seems to be issue introduced while implementing
-    features from new specification - add new bits in bitmask field
-    without correcting expert info condition.
-    
-    Change-Id: I5a4fb4147971f565cfb5dd1abf4e5616ce9da4c5
-    Reviewed-on: https://code.wireshark.org/review/20895
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4543d33
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Mar 16 16:13:41 2017 +0100
-
-    Bluetooth: HCI_CMD: Fix wrong field name
-    
-    Interval -> Window
-    
-    Change-Id: Ic40811a87fd301a07e2a9af60b152feeab395ead
-    Reviewed-on: https://code.wireshark.org/review/20893
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c449ca0
-Author: Nicolas Bertin <nicolas.bertin@al-enterprise.com>
-Date:   Mon Apr 3 15:33:57 2017 +0200
-
-    NOE: update protocol definitions
-    
-    Change-Id: I3cf8b006d792b8c866297aa6c06d9d7b005307fe
-    Reviewed-on: https://code.wireshark.org/review/20881
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bc40ae8
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 2 21:34:51 2017 +0200
-
-    WLCCP: ensure that offset is always incremented in dissect_wlccp_tlvs()
-    
-    Bug: 13549
-    Change-Id: I4613d1e2708a65b6e9968a5a920bd1b15366ffe0
-    Reviewed-on: https://code.wireshark.org/review/20871
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 03f372f
-Author: Patryk Nowak <patryk.nowak@tieto.com>
-Date:   Mon Apr 3 13:07:04 2017 +0200
-
-    Qt/Bluetooth: add results filter in HCI Summary window
-    
-    Add ability to display only these HCI commands whose names match specified
-    filter. Currently only simple filtering is implemented (substring search,
-    no regex-matching).
-    
-    Change-Id: I418d3d2d3e7a3b196d5ba05496d31c508e842dec
-    Reviewed-on: https://code.wireshark.org/review/20880
-    Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
-    Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bf524d9
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Mar 30 19:00:34 2017 +0200
+Date:   Wed Jun 21 23:32:38 2017 +0200
 
-    wbxml: don't THROW() an exception from a dissector
+    OSPF: Opaque ID is not longer be zero
     
-    If the offset is out of bounds, we can simply continue and
-    proto_tree_add_...() will throw an exception for us.
-    While at it, wrap some long lines and remove obsolete coments about
-    g_malloc()ed memory (the dissector has been converted to wmem).
+    With RFC7770 the Opaque ID for Router Information is not longer be zero
     
-    Change-Id: Icd36418f07c0cf33c5fe906a8a2d3160789ee1f2
-    Reviewed-on: https://code.wireshark.org/review/20856
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 965cd91
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Apr 3 15:32:56 2017 +0200
-
-    E.212: update list to Operational Bulletin No. 1121 (1.IV.2017)
-    
-    Change-Id: Ic04f30108deb004281569eb225e42a9515430db0
-    Reviewed-on: https://code.wireshark.org/review/20882
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I22f9917ac5b5b0261e36b1097765dab6ce216a46
+    Ping-Bug: 13823
+    Reviewed-on: https://code.wireshark.org/review/22329
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9d7ce7a
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Apr 3 21:38:45 2017 +0200
-
-    ieee802154: Add missing parenthesis in incorrect FCS
-    
-    Change-Id: Iea1855c00dbceac340bc0f65f23fdb1cb74250ec
-    Reviewed-on: https://code.wireshark.org/review/20883
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit b215b92
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Fri Mar 17 15:13:33 2017 +0100
-
-    Add script for generating nightly .debs with git revision
-    
-    Change-Id: I5478feabd6966fa9ed46258da4815bb8ac882ec9
-    Reviewed-on: https://code.wireshark.org/review/20601
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 877b9a0
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Apr 1 12:00:47 2017 +0200
-
-    tcp: (trivial) remove some unnecessary if (tree) checks
-    
-    Doing the checks ourselves doesn't save a lot of time.
-    
-    Change-Id: Icd96d6487ba88bc8a0f9d475e8f569803b40cf1a
-    Reviewed-on: https://code.wireshark.org/review/20859
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7b0e5f8
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Apr 3 12:01:30 2017 +0200
-
-    MAC-LTE: enhance a bit dissection of Bandwidth Reduced related packets
-    
-    Change-Id: I12fac09c982b78b16df1ca93cbae8850a4e214ed
-    Reviewed-on: https://code.wireshark.org/review/20879
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d99112d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Apr 2 20:08:15 2017 +0200
-
-    Use col_append_str() for fixed strings
-    
-    Change from col_append_fstr() to col_append_str() when
-    appending strings without formatting.
-    
-    Change-Id: I8975704c246f2b9a1301ed5f96273aa9d61c6f44
-    Reviewed-on: https://code.wireshark.org/review/20857
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a344452
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 2 22:25:36 2017 +0200
-
-    GTPv2: fix dissection of TWAN PLMN-ID
-    
-    Bug: 13552
-    Change-Id: I8c854eb30fd025a286f3823526c7f26acc8a758c
-    Reviewed-on: https://code.wireshark.org/review/20873
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ae3797e
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Apr 1 21:07:37 2017 +0200
-
-    Don't compile plugins when configured --without-plugins.
-    
-    --without-plugins didn't affect plugins_dir=, fix it.
-    
-    Change-Id: I375aa15e38993008eaea9e311eed5cb1c3731e49
-    Reviewed-on: https://code.wireshark.org/review/20839
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 12434e9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Apr 2 15:32:39 2017 -0700
-
-    Fix dissection of Get Info requests.
-    
-    If the length of the input buffer is zero, it means there *is* no input
-    buffer; don't use the offset of that buffer plus the length as the
-    offset past the end of the end of the packet, as both will probably be
-    zero.  Also, for a request to get quota info, report a warning if
-    there's no input buffer, as MS-SMB2 seems to say there must be one.
-    
-    If the length of the input buffer is *not* zero, ignore the iput buffer
-    for requests other than requests to get quota info or full extended
-    attribute info, as MS-SMB2 says a server should do that.  Otherwise,
-    make sure the offset of the input buffer is past the end of the
-    fixed-length part of the request and the offset+length doesn't overflow
-    or go past the end of the message.
-    
-    While we're at it, for some routines that return a "next offset", use
-    that return value rather than wiring in the length in the caller.
-    
-    Bug: 12954
-    Change-Id: If3d8846f5e03d0d7cdfe10ddfacb347bd0915a5a
-    Reviewed-on: https://code.wireshark.org/review/20874
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bc48169
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 2 18:42:05 2017 +0200
-
-    DNS: add an expert info if buffer is too short to compute a key id
-    
-    Bug: 13548
-    Change-Id: I4c018ae7a46ebb3e667004293b3f6e180f9d693f
-    Reviewed-on: https://code.wireshark.org/review/20855
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cf7979c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 2 17:12:43 2017 +0200
-
-    WSP: fix addition of X-Wap-Tod header in tree
-    
-    Bug: 13546
-    Change-Id: Ie1e78cc7ada338b17a21a32714fed4816724a4f8
-    Reviewed-on: https://code.wireshark.org/review/20850
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a68cb9e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 2 17:31:47 2017 +0200
-
-    PacketBB: fix hf_packetbb_addr_value[3] field type
-    
-    Bug: 13545
-    Change-Id: Ic2dff0eeb2d312f573696cba9376cc004be17af9
-    Reviewed-on: https://code.wireshark.org/review/20852
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b0b39a7
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 2 17:50:15 2017 +0200
-
-    PEEKREMOTE: treat header size as a signed integer
-    
-    Bug: 13544
-    Change-Id: If04ad8e71f06c289673492db3ed916e85cfc55e5
-    Reviewed-on: https://code.wireshark.org/review/20853
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f564e2d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 2 18:08:32 2017 +0200
-
-    MIH: fix subtree addition in dissect_dev_states()
-    
-    Bug: 13547
-    Change-Id: Ib3eed331178284758953db5300ce6ea651d7dddd
-    Reviewed-on: https://code.wireshark.org/review/20854
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9d1f2ef
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Apr 2 12:34:44 2017 +0200
-
-    Use col_append_sep_str() for fixed strings
-    
-    Change from col_append_sep_fstr() to col_append_sep_str() when
-    appending strings without formatting.
-    
-    Change-Id: I315aca9b815c204a5bc78f7326402c40d1325f0e
-    Reviewed-on: https://code.wireshark.org/review/20846
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5225326
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Apr 2 08:13:02 2017 -0700
-
-    [Automatic update for 2017-04-02]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I9e722e963dcf7437feb98a3176e6c507d86a9485
-    Reviewed-on: https://code.wireshark.org/review/20848
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 8350873
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Apr 2 16:52:20 2017 +0200
-
-    BGP: remove some true_false_string values obsoletes after gf998923
-    
-    Change-Id: I10753353d0593b736630118ccf0a797d48e087b8
-    Reviewed-on: https://code.wireshark.org/review/20847
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit fe2857d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Apr 2 08:07:17 2017 +0200
-
-    tcp: Add separator to Info column when segmented
-    
-    Prefix the Info column entry "[TCP segment of a reassembled PDU]"
-    with a space if the column is not empty.
-    
-    Change-Id: If4fc46b2d8a2d261044767c534da34e2d27435f8
-    Reviewed-on: https://code.wireshark.org/review/20845
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f998923
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Sun Mar 26 21:37:15 2017 -0400
-
-    BGP: Remove redundant  text in Path Attributes.
-    
-    Also added display of lower-order four bits of the Attribute Flags ("unused").
-    
-     Current implementation of displaying path attribute flags shows flag description twice if the flag was set.
-    
-     For example, with Optional and Length set, the attribute flags were displayed as follows:
-    
-                 Flags: 0x90, Optional, Length: Optional, Non-transitive, Complete, Extended Length
-                     1... .... = Optional: Optional
-                     .0.. .... = Transitive: Non-transitive
-                     ..0. .... = Partial: Complete
-                     ...1 .... = Length: Extended length
-    
-     Now they are displayed as follows:
-    
-                Flags: 0x90, Optional, Extended-Length, Non-transitive, Complete
-                    1... .... = Optional: Set
-                    .0.. .... = Transitive: Not set
-                    ..0. .... = Partial: Not set
-                    ...1 .... = Extended-Length: Set
-                    .... 0000 = Unused: 0x0
-    
-    Change-Id: Iec3c92ac2383dd3f736598b089a74f0f3c165bae
-    Reviewed-on: https://code.wireshark.org/review/20732
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7a1679b
-Author: Nick <jimschaettle@gmail.com>
-Date:   Wed Mar 22 09:23:00 2017 -0500
-
-    ACN with blobs and magic bullet
-    
-    Bug: 13315
-    Change-Id: I2322e5f08fefbe6979cf4bed46596ac6636cccf9
-    Reviewed-on: https://code.wireshark.org/review/19542
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 235ee14
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Apr 1 23:02:00 2017 +0200
-
-    ssl: Fix Info column separator
-    
-    Always prefix Info column entries with comma if the column is
-    not empty.
-    
-    Bug: 13539
-    Change-Id: I47b43841b092671fe5a74c99ec8aaa15f144bced
-    Reviewed-on: https://code.wireshark.org/review/20844
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit de032c6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Apr 1 12:28:05 2017 -0700
-
-    Check before setting the length of a protocol item.
-    
-    Don't assume that 8 + {32-bit unsigned integer} won't overflow.  Use
-    tvb_ensure_bytes_exist() to ensure that the data in question is present;
-    it also checks for overflows.
-    
-    Also, set the length after we've succeeded in dissecting the item - if
-    we throw an exception, it's because we don't have all the data, so the
-    tvb_ensure_bytes_exist() would have failed, but this way we at least get
-    to dissect what data we *do* have.
-    
-    Change-Id: If27a2e3ed7978c2051ccb2ddba0d498255d0e350
-    Reviewed-on: https://code.wireshark.org/review/20840
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 38bc42b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Mar 31 19:35:04 2017 +0200
-
-    Fix IPv6/IPX statistics generation
-    
-    g70381f7 switched from a sorted GSList to a wmem_tree.
-    But the strings "ipx" or "ipv6" must be tested before "ip" to select the
-    right tap so the sorting does matter.
-    Use a wmem_list and parse it by reverse order like what was done with
-    the GSList to ensure proper selection of the tap.
-    
-    Change-Id: Ic8d291c265e9c83c960d9a2f6713c25e3aa0e60d
-    Reviewed-on: https://code.wireshark.org/review/20813
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 420da27
-Author: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date:   Wed Mar 15 15:25:42 2017 +1100
-
-    Add DirectPlay 8 Enumation Query/Response packets
-    
-    Bug: 13541
-    Change-Id: Ie8133be9ef7b3943d8cf66c5c4fe024250912253
-    Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-    Reviewed-on: https://code.wireshark.org/review/20820
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ebcfc1b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 23:32:50 2017 -0700
-
-    Improve the display of metrics.
-    
-    Give the value and the "supported" bit names that reflect what they are.
-    
-    Show both the "supported" bit and the value as bitfields, because that's
-    what they are.
-    
-    Show the "supported" bit before the value.
-    
-    Show the metric value as decimal; there's nothing particularly
-    hexadecimal about it.
-    
-    The "supported" bit is 1 if it's *not* supported and 0 if it *is*
-    supported.
-    
-    Fetch the byte for the metric within dissect_metric(), rather than in
-    the call to dissect_metric().
-    
-    Change-Id: Ief3bb74b273df06e07066ccdede38a2eeedc6db2
-    Reviewed-on: https://code.wireshark.org/review/20836
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit aa82f52
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 20:39:20 2017 -0700
-
-    You can't get a string value from an FT_NONE string.
-    
-    Make it an FT_STRING.
-    
-    Change-Id: I2a44c4542c79daa486382bd5b28f6c37c9c46111
-    Reviewed-on: https://code.wireshark.org/review/20827
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 19bb1b1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 19:41:47 2017 -0700
-
-    Provide better error messages for field type mismatches.
-    
-    Don't just report an assertion failure with a line in proto.c; give the
-    name of the field with the wrong type, and a list of the types that are
-    valid for the routine in question.
-    
-    Change-Id: Id3ed7c376fdc72bf6cff69c647833946cfa99ee6
-    Reviewed-on: https://code.wireshark.org/review/20824
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d967d71
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 19:22:54 2017 -0700
-
-    FT_CHAR is an integral type, so list it in the diagnostic message.
-    
-    Change-Id: I8d095a2424033bee5b3569c906327ac15de33890
-    Reviewed-on: https://code.wireshark.org/review/20823
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6a67209
-Author: Mikael Kanstrup <mikael.kanstrup@gmail.com>
-Date:   Wed Mar 29 13:23:45 2017 +0200
-
-    ieee80211: Fix parsing of supported operating classes IE
-    
-    Fix parsing of Supported Operating Classes information element
-    
-    - Fix min tag length check message (min length is 2 not 3)
-    - Fix max tag length check (no max defined)
-    - Fix malformed packet exception on frames with min tag length
-    - Handle OneHundredAndThirty and Zero field delimiters
-    - Use same base (dec) for both current and alternate op classes
-    
-    Bug: 13534
-    Change-Id: I05b2238eb07f65fde0a33479e9459d2a99911a50
-    Reviewed-on: https://code.wireshark.org/review/20784
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d57f03c
-Author: Priyanka Mondal <priyanka02010@gmail.com>
-Date:   Fri Mar 24 15:29:29 2017 -0400
-
-    Add citrix mep dissectors
-    
-    Change-Id: Id574fc20e17333646d615cab415b2d40b4487375
-    Reviewed-on: https://code.wireshark.org/review/20333
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7aed334
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 18:52:31 2017 -0700
-
-    Don't add an FT_UINT32 with proto_tree_add_none_format().
-    
-    Make it an FT_NONE.
-    
-    Change-Id: I83339d84b88c7decffa6e6a48d12acc4b063a4ad
-    Reviewed-on: https://code.wireshark.org/review/20822
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 01ec229
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 18:41:16 2017 -0700
-
-    Don't use proto_tree_add_uint() to add an FT_BOOLEAN field.
-    
-    We don't allow that.  Use proto_tree_add_boolean() instead.
-    
-    Change-Id: I59ed0f0dc731b1ce4b5d921cd4e85b1c101cb2a8
-    Reviewed-on: https://code.wireshark.org/review/20821
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 62d7819
-Author: Scott Deandrea <sdeandrea@apple.com>
-Date:   Wed Mar 29 17:20:06 2017 -0700
-
-    Add packet capture support for Darwin USB
-    
-    Change-Id: Iec9e4ac2362cf8e88a3cf6ae3483cefe938967e5
-    Reviewed-on: https://code.wireshark.org/review/20814
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 02f74e4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 14:47:49 2017 -0700
-
-    Fix some dissection errors.
-    
-    "XXX supported" for a metric type is a Boolean, not an int; add it as
-    such.
-    
-    Add the value of the item without the extra bits.
-    
-    The length of an address prefix is in semi-octets (nibbles/hex digits),
-    not in octets.
-    
-    Change-Id: I642f0dab5030f7609e89f45cf2cff15cd74dfbda
-    Reviewed-on: https://code.wireshark.org/review/20819
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7dc0653
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Fri Mar 31 12:52:58 2017 +0200
-
-    Optimize frame_data layout.
-    
-    Move tsprec to remove padding. It saves 8 bytes on amd64,
-    shrink size of frame_data structure from 96 to 88 bytes.
-    
-    Change-Id: Ib69687b2e5b7d65b5c15eda7d5834100a02c059e
-    Reviewed-on: https://code.wireshark.org/review/20807
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a8ce98f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Mar 31 18:31:14 2017 +0200
-
-    Fix endpoints statistics optional filter parsing
-    
-    Bug: 13538
-    Change-Id: I4cd66d2dffc976610d41126c50b5722bc06a72f8
-    Reviewed-on: https://code.wireshark.org/review/20810
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
-
-commit c5d7183
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 10:58:25 2017 -0700
-
-    Fix comments.
-    
-    Change-Id: Iac768dd2f06ce081a7b82c58c225f2674f3f1174
-    Reviewed-on: https://code.wireshark.org/review/20815
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e767f42
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 28 09:54:56 2017 +0100
-
-    AMQP: fix field amqp.value is not of type FT_NONE
-    
-    Bug: 13435
-    Change-Id: Ib61404fc3a8c461593d2a8a60224463ef2b9c4b6
-    Reviewed-on: https://code.wireshark.org/review/20309
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fff930d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 31 02:08:30 2017 +0200
-
-    Qt: do not expand collapsed trees when switching packets
-    
-    Scenario: user selects a field, collapsed tha parent tree and selects
-    the next packet. Before this patch, the tree would be expanded again,
-    selecting the child. After this patch, the tree will not be expanded,
-    instead selecting the tree node that got collapsed.
-    
-    Change-Id: I7968fca1056a937cf3b399afb6f3089c2d199067
-    Reviewed-on: https://code.wireshark.org/review/20801
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 641a48e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Mar 30 13:26:56 2017 +0200
-
-    checkAPIs: improve trailing item suggestion for XXX_string
-    
-    Tighten the check (do not just check for "0,NULL}};" but also
-    "{0,NULL}};" in case someone decides to use "{0x10,NULL}};" as trailing
-    item. Improve the suggestion, "{NULL,NULL}" is better for string_string
-    than "{0,NULL}".
-    
-    For now treat 0 the same as NULL since files like packet-fix.h would
-    need editing otherwise. Accept octal notation for value_string since
-    packet-nfs.c uses this in nfs2_mode_names.
-    
-    Change-Id: Ic507dbd8b07f3ae062b3f0310aa3398115d54273
-    Reviewed-on: https://code.wireshark.org/review/20796
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 0896352
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 01:09:38 2017 -0700
-
-    Fix typo.
-    
-    Change-Id: I55137590280024dd383c0d005a2d9d79f9b7d38a
-    Reviewed-on: https://code.wireshark.org/review/20804
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9a3f177
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 31 00:27:48 2017 -0700
-
-    Fix incorrect NSAP AFI values.
-    
-    Change-Id: I302041f5a08973229317455d8df8690256557e76
-    Reviewed-on: https://code.wireshark.org/review/20803
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 93cf590
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 31 01:12:06 2017 +0200
-
-    dns: prevent repeatedly overwriting resolved entries
-    
-    When a packet contains multiple conflicting names for the same address,
-    it would result in modification of the resolved name every time this DNS
-    packet is selected. In Qt, this causes a periodic (one second)
-    redissection of the current (DNS!) packet which interferes with user
-    interaction. To avoid this, only add the address on the first visit.
-    
-    Bug: 13533
-    Change-Id: Ic71515131da4d666bfd589df9ff90a866a30778c
-    Reviewed-on: https://code.wireshark.org/review/20800
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fb97e82
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 30 17:48:58 2017 -0700
-
-    Distinguish between the two flavors of ITU-T AFIs.
-    
-    As ISO 8348/X.213 Annex A says:
-    
-    A.5.2.1.2 Format and allocation of the IDI
-    
-    A specific combination of IDI format and DSP abstract syntax is
-    associated with each allocated AFI value, as summarized for use in
-    individual addresses in Table A.4 (the corresponding AFI values for use
-    in group addresses is found via Table A.2).  Two AFI values are
-    associated with each combination that involves a variable-length IDI
-    format.  In each case, both of the AFI values identify the same
-    combination of IDI format and DSP abstract syntax.  The numerically
-    lower AFI value is used when the first significant digit in the IDI is
-    non-zero.  The numerically greater AFI value is used when the first
-    significant digit in the IDI is zero.
-    
-    and A.5.3 talks further about this.
-    
-    Change-Id: I3fdad04064451b3c891731dc8f107bc57586eb84
-    Reviewed-on: https://code.wireshark.org/review/20802
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0ea51ad
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Mar 28 18:14:35 2017 +0200
-
-    Qt: Fix uninitialized memory access in val_units_
-    
-    Fixes the following UBSAN errors:
-    
-        ui/qt/io_graph_dialog.cpp:1720:75: runtime error: load of value 3200171710, which is not a valid value for type 'io_graph_item_unit_t'
-            #0 0x5611f0b0cd1d in IOGraph::setFilter(QString const&) ui/qt/io_graph_dialog.cpp:1720:75
-            #1 0x5611f0b737a1 in IOGraph::IOGraph(QCustomPlot*) ui/qt/io_graph_dialog.cpp:1682:5
-            #2 0x5611f0afb3f3 in IOGraphDialog::addGraph(bool, QString, QString, int, IOGraph::PlotStyles, io_graph_item_unit_t, QString, int) ui/qt/io_graph_dialog.cpp:340:24
-            #3 0x5611f0af7c19 in IOGraphDialog::IOGraphDialog(QWidget&, CaptureFile&) ui/qt/io_graph_dialog.cpp:289:13
-    
-        ui/qt/io_graph_dialog.cpp:1818:19: runtime error: load of value 3200171710, which is not a valid value for type 'io_graph_item_unit_t'
-            #0 0x5611f0b1167e in IOGraph::setPlotStyle(int) ui/qt/io_graph_dialog.cpp:1818:19
-            #1 0x5611f0b062ee in IOGraphDialog::syncGraphSettings(QTreeWidgetItem*) ui/qt/io_graph_dialog.cpp:420:10
-    
-        ui/qt/io_graph_dialog.cpp:1872:29: runtime error: load of value 3200171710, which is not a valid value for type 'io_graph_item_unit_t'
-            #0 0x5611f0b13e6a in IOGraph::setValueUnits(int) ui/qt/io_graph_dialog.cpp:1872:29
-            #1 0x5611f0b06640 in IOGraphDialog::syncGraphSettings(QTreeWidgetItem*) ui/qt/io_graph_dialog.cpp:422:10
-    
-    Note that calling setFilter with an empty string is pretty useless,
-    especially since the filter is initialized later, so remove it.
-    The choice for IOG_ITEM_UNIT_FIRST is quite arbitrary and needed because
-    setValueUnits reads the "old" (uninitialized) value.
-    
-    Change-Id: I32c65a30593cb718b838c0f324e0d1b0eaab90e5
-    Reviewed-on: https://code.wireshark.org/review/20767
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit aa6dcf9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 30 15:00:06 2017 -0700
-
-    Add a bunch of #defines for OSI NSAP AFI values, and use them.
-    
-    Have the ISUP value_string for those AFI values show "decimal" and
-    "binary" indicators.
-    
-    Update some references.
-    
-    Change-Id: I07797455f5ffa5fa9cd4e0702a6f5db831054937
-    Reviewed-on: https://code.wireshark.org/review/20798
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8bf0a57
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 30 12:39:29 2017 -0700
-
-    Make some routines static.
-    
-    Change-Id: I04860f058345cb633ab379c83dcfc24b6cf1a846
-    Reviewed-on: https://code.wireshark.org/review/20797
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1c3d85d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 20 14:14:43 2017 +0000
-
-    .mailmap: Update (of February and March)
-    
-    Change-Id: Ib728c6ebf0a029e7241a042a0ca80c602df8e89e
-    Reviewed-on: https://code.wireshark.org/review/20202
-    Reviewed-by: Mark Phillips <mark.phil@samsung.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 038679c
-Author: Chema Gonzalez <chemag@gmail.com>
-Date:   Wed Mar 29 15:35:23 2017 -0700
-
-    ssl-utils: fix a couple of uninitialized variables
-    
-    Fixed these (false-positive) warnings:
-    
-        epan/dissectors/packet-ssl-utils.c:4149:30: error: 'mac_frag' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-        epan/dissectors/packet-ssl-utils.c:4149:30: error: 'mac_fraglen' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-             else if(tls_check_mac(decoder,ct,TLSV1_VERSION,mac_frag,mac_fraglen,mac)>= 0) {
-    
-    Change-Id: I282d5d60d96953858844deeaaf2069ffed3fabca
-    Reviewed-on: https://code.wireshark.org/review/20793
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 732d54e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Mar 30 11:09:25 2017 +0200
-
-    pcapng: Align code name and hf name.
-    
-    Use common name for "Number of Received Packets".
-    
-    Change-Id: Ib57b142e8fc5c85a03c5622c264ce1d7e113f795
-    Reviewed-on: https://code.wireshark.org/review/20795
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 77e308f
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Wed Mar 29 20:08:37 2017 +0300
-
-    [UMTS FP] Fixed some comments
-    And also removed an unused length check in the DCCH over DCH heuristic dissection method
-    
-    Change-Id: I534200acb66e11a0c49d15e478e1f1d902e0ba05
-    Reviewed-on: https://code.wireshark.org/review/20788
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5cd5341
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Mar 29 17:27:40 2017 -0700
-
-    Terminate string_strings with { NULL, NULL }.
-    
-    checkAPIs.pl looks for { 0, NULL }, so use that.
-    
-    Change-Id: Ia8ec0bddcb346649ac760df8b42a8589d6b67983
-    Reviewed-on: https://code.wireshark.org/review/20794
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 57d1571
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Mar 26 19:11:02 2017 +0200
-
-    Prevent crash/assert on access to "uninitialized" device.if_info.name.
-    
-    While this is one possible way to fix it, it probably is not the "right"
-    way to do it. I just don't know which one would be right. I regard
-    several options to be cleaner:
-    - Remove if_info from interface_t altogether and add the required fields
-      to interface_t directly.
-    - Never use device.if_info.name but always use device.name (same with
-      friendly_name)
-    - Initialize both fields the same (same with friendly_name)
-    - Also not nice: device is optically a struct, not a pointer. So into the
-      function, when we create a new struct (that's where the error "is made"),
-      the same name continues to be used.
-    
-    Not improving my confidence into my solution:
-    - I haven't bee able to figure out why the automated Windows builds don't
-      crash/assert.
-    
-    Last but not least: The two qt/gtk functions should probably have their common
-    core extracted into a common function.
-    
-    Change-Id: I1b36d1765d1a1ec975927cb5785a1540ba4952f5
-    Ping-Bug: 13448
-    Reviewed-on: https://code.wireshark.org/review/20721
-    Petri-Dish: Jörg Mayer <jmayer@loplof.de>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit a2cf383
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Mar 29 19:22:21 2017 +0200
-
-    c15ch: fix value_string termination
-    
-    Change-Id: I305ec694e2eea75dd1826d3ae82b39d2716ef7c1
-    Reviewed-on: https://code.wireshark.org/review/20789
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c981793
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Mar 29 19:22:39 2017 +0200
-
-    sysex: fix value_string termination
-    
-    Change-Id: I7063db4b748a96ad3fb190f575d04ca4a411a404
-    Reviewed-on: https://code.wireshark.org/review/20790
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 123d170767f6e51ce6b216d633fb03a3cf311109)
+    Reviewed-on: https://code.wireshark.org/review/22348
 
-commit 483daa4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Mar 29 19:24:37 2017 +0200
-
-    checkAPIs.pl: check value_string termination
-    
-    Check for the expected "{0, NULL}" termination, disallowing things like
-    "{9, NULL}". Also add val64_string and bytes_string while at it. Remove
-    a stale comment since we allow some c99 syntax now.
-    
-    Change-Id: I1685255bbb11d84eba46b7cd00934d2f74187e03
-    Reviewed-on: https://code.wireshark.org/review/20792
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4d1060e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Mar 29 19:24:43 2017 +0200
+commit 632ae0d
+Author: Jiří Engelthaler <engycz@gmail.com>
+Date:   Thu Jun 22 13:33:54 2017 +0200
 
-    mrcpv2: fix value_string termination
+    IEC104: Added checking of correct ApduLen in context of ASDU type
     
-    Not actually used in a header field, but in str_to_str. Caught by an
-    updated checkAPIs.pl script.
+    Added displaying of raw data for unknown ASDU type
     
-    Change-Id: I8b7173716034b71b556c3d95fa0541ca9117e1f1
-    Reviewed-on: https://code.wireshark.org/review/20791
+    Change-Id: I17e2ae048dbec61718610dd86d6878cdc0563ef0
+    Reviewed-on: https://code.wireshark.org/review/22341
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit d2ed7fcf9e0dca17f1a0181364910b9533dc7091)
+    Reviewed-on: https://code.wireshark.org/review/22345
 
-commit f8c870e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Mar 29 09:45:29 2017 -0700
-
-    Throw in a cast to squelch a compiler warning.
-    
-    MSVC warns that comparing a gboolean (which is a typedef for int) to a
-    bool is unsafe; convert the gboolean to a bool (the post-C++11 draft C++
-    standard I have says that the conversion from integral to bool does
-    pretty much what you'd expect - zero goes to false, non-zero goes to
-    true - and is exactly what we want).
-    
-    Change-Id: Ia7d7b62baf87ca3a29da5140f68c2c5b38b2d6de
-    Reviewed-on: https://code.wireshark.org/review/20787
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 25dc3ee
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Mar 29 09:38:54 2017 -0700
+commit 472043e
+Author: Dirk Weise <code@dirk-weise.de>
+Date:   Thu Jun 22 10:16:17 2017 +0200
 
-    Squelch 64-to-32-bit narrowing warnings.
+    Add notes about predefined strings not available to plugins
     
-    Change-Id: Ifc6938ab8deb62fc8b53c9d68504210b6fcc58f7
-    Reviewed-on: https://code.wireshark.org/review/20786
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0369b50
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Mar 29 09:27:31 2017 -0700
-
-    Fix processing of AMQP 0-10 arrays, maps, and conneciton locales.
+    The documention refers dissector authors to helpful predifined string structures
+    that plugin authors unfortunately cannot use.
     
-    You can't call proto_tree_add_XXX routines on a proto_item * that hasn't
-    been given a subtree with proto_item_add_subtree().  Fix that.
-    
-    The packet offset for a FT_UINT_STRING is a pointer to the first byte of
-    the *length*, not to the first byte *after* the length.
-    
-    Properly pluralize "entry".
-    
-    Change-Id: I7f2a55eaad850e3e52e62eb061e0444d176c593a
-    Reviewed-on: https://code.wireshark.org/review/20785
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 601fe5e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 10 14:37:18 2017 +0100
-
-    Qt: propagate selection from main screen to dialog
-    
-    Ensure that the selection in main screen is updated on refreshing
-    interfaces (InterfaceFrame::interfaceListChanged). Add additional
-    patches to ensure that selection changes from the main screen propagate
-    to the dialog and be careful to avoid infinite recursions.
-    
-    Life of a signal for InterfaceFrame:
-    
-        ui->interfaceTree->selectionModel emits selectionChanged
-        -> slot InterfaceFrame::interfaceTreeSelectionChanged
-          -> emits InterfaceFrame::itemSelectionChanged
-            -> slot MainWelcome::interfaceSelected
-               -> emits MainWelcome::interfacesChanged
-                  -> slot CaptureInterfacesDialog::interfaceSelected
-                     (updats dialog selection)
-    
-    Life of a signal for CaptureInterfacesDialog:
-    
-        ui->interfaceTree emits itemSelectionChanged
-        -> slot CaptureInterfacesDialog::interfaceSelected
-           (emission of next signal because sender is ui->interfaceTree)
-           -> emits CaptureInterfacesDialog::interfacesChanged
-              -> slot InterfaceFrame::updateSelectedInterfaces
-                 (updates main screen selection)
-    
-    This should probably be updated to model/view with shared selection
-    model in the future.
-    
-    Change-Id: Ibb32c201a92bd2f1310523b3e6e63b03209c9ce4
-    Reviewed-on: https://code.wireshark.org/review/20487
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 5eaa9e7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Mar 29 07:37:38 2017 -0400
-
-    packet-icmpv6.c: Fix some value_strings
-    
-    Change-Id: Ieae37af709b670792cca3937674ba0cc1026d45f
-    Reviewed-on: https://code.wireshark.org/review/20783
+    Bug: 13828
+    Change-Id: I62cdfeb200c9b354aed44d40c80a0e8f9e8f910b
+    Reviewed-on: https://code.wireshark.org/review/22339
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 9fe90b93ce9bbb802f45b93632a78f5261b3f717)
+    Reviewed-on: https://code.wireshark.org/review/22342
 
-commit 08e4d57
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Mar 28 21:53:04 2017 -0400
-
-    Bluetooth: fix conflicting entries in its value_string.
-    
-    Change-Id: Ie0f9bc800b5d86effa18a8ae333bbf8da18d0c3b
-    Reviewed-on: https://code.wireshark.org/review/20775
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-
-commit f706011
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Mar 28 22:28:13 2017 +0200
-
-    TLS: fix decryption with Encrypt-then-MAC (RFC 7366)
-    
-    Bug: 13522
-    Change-Id: I0dfe30e086c3ef1a4f96f22e2db46e4d4cc7dffa
-    Reviewed-on: https://code.wireshark.org/review/20771
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 2de68eb
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Mar 25 13:05:50 2017 +0100
-
-    sharkd: support exporting ssl secrets
-    
-    Change-Id: Ie7db733d8aa7189b1ade6ef85d911653ed8c490f
-    Reviewed-on: https://code.wireshark.org/review/20703
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 572b80d
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Mar 28 17:07:33 2017 +0200
-
-    Add ENC_TIME_MSEC_NTP and use it in packet-gtpv2.c
-    
-    While at it fix expert info a typo and an calculation.
-    
-    Change-Id: I071a36edb7eed5f58708b98aebcb24bc6c34f2a8
-    Reviewed-on: https://code.wireshark.org/review/20766
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 79ba8c3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 28 21:16:19 2017 -0700
-
-    Print signed values with %d, not %u.
-    
-    Change-Id: I1ad46df006976c052ff42baf6415e18b488b215f
-    Reviewed-on: https://code.wireshark.org/review/20780
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b56bbb4
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Mar 28 19:36:50 2017 -0400
-
-    Fix "warning C6246: Local declaration hides declaration of the same name in outer scope" warnings
-    
-    Change-Id: I98edc076fdab40ef1fd05313168011f58e13a4d6
-    Reviewed-on: https://code.wireshark.org/review/20773
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6b0f846
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 28 19:29:44 2017 -0700
-
-    Fix problem found by Coverity.
-    
-    The loop was using bytes_read, but wasn't setting it.  Go back to
-    something similar to the previous loop condition, but don't lose the
-    error tests.
-    
-    Fixes Coverity CID 1403388.
-    
-    Change-Id: I557cbfa6e9ad81491af4fc90e85ce87c71fec8aa
-    Reviewed-on: https://code.wireshark.org/review/20776
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 630b5a8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 28 18:41:43 2017 -0700
-
-    Check for localtime() failing.
-    
-    It "shouldn't happen", but at least this squelches a Coverity complaint,
-    CID 1394503.
-    
-    Change-Id: I40af10d47c1d1b026f6b40ef68b139e6bf246109
-    Reviewed-on: https://code.wireshark.org/review/20774
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1bea950
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 28 11:56:53 2017 -0700
-
-    Add bounds checks for references to outhdr_values.
-    
-    Don't run past the end of the outhdr_values array.
-    
-    While we're at it, don't make it a global array - it doesn't need to be
-    global, as its values don't persist from invocation to invocation, and
-    this would allow use of this routine in multiple threads in parallel.
-    (Yes, we have other global variables that don't maintain state, but we
-    should get rid of that, too.)
-    
-    Change-Id: I7ceed3c9ba6356eddb7d52472e9d53dd08f90029
-    Reviewed-on: https://code.wireshark.org/review/20770
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 616bbce
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Mar 28 16:53:19 2017 -0400
-
-    packet-nstrace.c: Ensure value_strings end with {0, NULL}
-    
-    Change-Id: I548c51dd7333b0dc26a84f77b1e848530b79dde3
-    Reviewed-on: https://code.wireshark.org/review/20772
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8efd42c
-Author: Martin Sehnoutka <msehnout@redhat.com>
-Date:   Mon Mar 27 14:55:05 2017 +0200
-
-    Reflect new default value of snaplen in man pages.
-    
-    Default value for snaplen is defined in wiretap/wtap.h:
-     #define WTAP_MAX_PACKET_SIZE    262144
-    
-    and used in capture_opts.c:
-        capture_opts->default_options.snaplen         =
-        WTAP_MAX_PACKET_SIZE;
-    
-    but help and man pages don't reflect this change.
-    
-    Change-Id: I35ddf1e8b7ffd657f4e01b3fe6b4c44c9acece2b
-    Reviewed-on: https://code.wireshark.org/review/20738
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1721075
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Mar 28 08:08:57 2017 +0200
-
-    voip_calls_infO_model(.h): fix extra ‘;’ [-Wpedantic]
-    
-    Change-Id: I2f131999cd0337d0d65d52f303c8ab9ca6bda39a
-    Reviewed-on: https://code.wireshark.org/review/20757
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit aa998d7
+commit ed558b5
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Mar 28 13:42:54 2017 +0200
+Date:   Thu Jun 22 02:13:52 2017 +0200
 
-    Qt: update endpoint statistics column labels to match GTK ones
+    MQ: put declaration before code
     
-    Bug: 13526
-    Change-Id: I40485c6f9b54ff0bf07f955c1dde8cd5ac05ef9b
-    Reviewed-on: https://code.wireshark.org/review/20762
+    Change-Id: I2b0d1a4795e3278a1702d51d4fd532a37a4eba19
+    Reviewed-on: https://code.wireshark.org/review/22332
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2f324e7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Mar 28 08:21:55 2017 -0400
-
-    randpkt_core: Fix a handful of warnings
-    
-    1. randpkt_core.c(559): warning C6262: Function uses '65596' bytes of stack:  exceeds /analyze:stacksize '16384'.  Consider moving some data to heap.
-    2. randpkt_core.c(615): warning C6386: Buffer overrun while writing to 'buffer':  the writable size is '65536' bytes, but '-1' bytes might be written.
-    
-    Change-Id: I0f3bcd19b49d6c8cde0d2ad9f745b14f5462a708
-    Reviewed-on: https://code.wireshark.org/review/20763
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6b929ab
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 28 03:33:45 2017 -0700
-
-    Don't wire in 262144, use WTAP_MAX_PACKET_SIZE.
-    
-    That way, if we ever increase WTAP_MAX_PACKET_SIZE, this code won't need
-    to be changed.
-    
-    Change-Id: I68d21e10810b7b8a4732d9ecf7e145668b0fe1cb
-    Reviewed-on: https://code.wireshark.org/review/20761
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bd486eb
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Mar 28 11:15:13 2017 +0200
-
-    text2pcap: define max packet size to WTAP_MAX_PACKET_SIZE
-    
-    Change-Id: I73ab87032e4a0c0259227622412be36aaf66a9d6
-    Reviewed-on: https://code.wireshark.org/review/20758
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ed3b5e5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 28 03:21:18 2017 -0700
-
-    Get rid of blanks at the ends of lines.
-    
-    Change-Id: I10a756a4a42d4f27f59e12c11f12d71947191c92
-    Reviewed-on: https://code.wireshark.org/review/20760
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8f515b1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 28 03:17:48 2017 -0700
-
-    Fix up time encodings.
-    
-    Add some new encodings for absolute time stamps, and use them as
-    appropriate; this fixes some cases where the time stamps in question
-    were being dissected incorrectly.
-    
-    For the encodings with seconds and 1/2^32s of a second, don't
-    arbitrarily give only microsecond resolution; 2^32 is greater than 1
-    million, and, in fact, at least some NTP RFCs explicitly talk about time
-    resolution greater than 1 microsecond.
-    
-    Update references in the RELOAD dissector to reflect the documents in
-    question having been updated and published as RFCs.
-    
-    Change-Id: Icbe0b696d65eb622978eb71e99ddf699b84e4fca
-    Reviewed-on: https://code.wireshark.org/review/20759
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 721182b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Mar 13 13:47:34 2017 +0100
-
-    Qt: fix closing editor in capture interfaces dialog
-    
-    Whenever (every second) the points list is updated, a dataChanged signal
-    is emitted and Qt decides to close all editors. Workaround this issue by
-    disabling the dataChanged signal. (Alternatively, we could change the
-    list into a pointer-to-list again.)
-    
-    Change-Id: Ie06d118d011a72f5be5608c2324ca2715a3f97c7
-    Fixes: v2.3.0rc0-2014-gf8dc2346df ("Qt: fix memleak of PointList in interface statistics")
-    Reviewed-on: https://code.wireshark.org/review/20530
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e1b14fb
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Mar 27 16:15:41 2017 +0200
-
-    text_import: the maximum frame length should be WTAP_MAX_PACKET_SIZE
-    
-    Change-Id: I41989e8b5fd273c518f786ca74683b9284d9403e
-    Reviewed-on: https://code.wireshark.org/review/20747
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cabd7d8
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Mar 27 21:19:28 2017 +0200
-
-    wsutil: fix a NULL pointer dereference when there is a single plugin registered
-    
-    Rework loop to avoid dereferencing a NULL pointer. Bug introduced in g6d79055
-    
-    Change-Id: I88a9f2d045b633cc2365ff6ce939f3315e7d42cc
-    Reviewed-on: https://code.wireshark.org/review/20751
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2141eaf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Mar 27 16:16:48 2017 +0200
-
-    GTK: the maximum packet size is WTAP_MAX_PACKET_SIZE, not 65535
-    
-    Change-Id: I4b78a3bff7ed158eef2008e52ec8abc9f7a8d1d3
-    Reviewed-on: https://code.wireshark.org/review/20748
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3a3d6ed
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 27 16:12:10 2017 +0200
-
-    artnet : fix conflicting entry in its value_string
-    
-    Field 'ESTA Code' (artnet.poll_reply.esta_man) has a conflicting entry in its value_string: 19546 is at indices 386 (LightMinded Industries, Inc.) and 387 (Sumolight GmbH))
-    Matches http://tsp.esta.org/tsp/working_groups/CP/mfctrIDs.php
-    
-    Change-Id: I61044a3b9d7f7e3255fb9da1eceef79afa084003
-    Reviewed-on: https://code.wireshark.org/review/20742
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit e46cb2defc559a530d11689d50f0adf47513e8e5)
+    Reviewed-on: https://code.wireshark.org/review/22333
 
-commit 4cc0d1e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Mar 27 16:17:51 2017 +0200
+commit 1e7a921
+Author: Silvio Gissi <silvio.gissi@gmail.com>
+Date:   Wed Jun 21 15:46:45 2017 -0400
 
-    Qt: the maximum packet size is WTAP_MAX_PACKET_SIZE, not 65535
+    Lua: Add "tonumber" method to NSTime
     
-    Also ensure that the update of sparkline does not lose focus of the
-    spinbox currently edited.
+    Absolute and Relative time fields could not be converted to seconds
+    without converting to string and parsing to number.
     
-    Change-Id: Icf7dd180fe3cb1d8bfab9017f923bf38e6210554
-    Reviewed-on: https://code.wireshark.org/review/20749
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0c0f6a6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Mar 27 16:11:41 2017 +0200
-
-    reordercap: use the snaplen from the source file
-    
-    Change-Id: I61871fa10142e2e2fab5e0e579df7530b9e52eef
-    Reviewed-on: https://code.wireshark.org/review/20746
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4038b2d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Mar 27 18:54:49 2017 -0400
-
-    rawshark: Move large data (WTAP_MAX_PACKET_SIZE) to the heap.
-    
-    Change-Id: Ib525d35b6a0fa58602d30fda701b0cce5f05b322
-    Reviewed-on: https://code.wireshark.org/review/20756
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 915d340
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Mar 27 18:49:59 2017 -0400
-
-    dumpcap: Move large data (WTAP_MAX_PACKET_SIZE) to the heap.
-    
-    Change-Id: Id365b533812bd972a5e7732ad43b6b6e3221029b
-    Reviewed-on: https://code.wireshark.org/review/20755
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 60d2fda
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Mar 27 17:14:59 2017 -0400
-
-    k12text.l: Move large data (WTAP_MAX_PACKET_SIZE) to the heap.
-    
-    Change-Id: Ic291dbd5930978bbd0adc8b58d09b423de83b65b
-    Reviewed-on: https://code.wireshark.org/review/20754
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 26abd2a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Mar 27 17:02:05 2017 -0400
-
-    logcat_text.c: Move large data (WTAP_MAX_PACKET_SIZE) to the heap.
-    
-    Change-Id: I3a391079a28aae7e41d926268f9f60152871bfa5
-    Reviewed-on: https://code.wireshark.org/review/20753
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bd3196b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Mar 27 12:50:26 2017 -0700
-
-    Don't waste time trying to run non-plain file and non-executable files.
-    
-    Directories, and non-executable files, aren't going to be extcap
-    executables.
-    
-    This may not make much of a difference for an installed version of
-    Wireshark, but it makes a difference if you're running from the build
-    directory.
-    
-    Change-Id: Ib9953fa04392dc7a8420ddf28bab9726e6050c12
-    Reviewed-on: https://code.wireshark.org/review/20752
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cea97f2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Mar 27 20:36:23 2017 +0200
-
-    Qt: fix capture statistics display in status bar
-    
-    Broken in g414c132
-    
-    Bug: 13524
-    Change-Id: I4d579170f925749aa9e7a6015ff17dee08d6e445
-    Reviewed-on: https://code.wireshark.org/review/20750
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit db9db90
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 27 15:24:32 2017 +0200
-
-    btatt: fix conflicting entry in its value_string
+    Fixed conversion in generated code that was subject to precision loss
     
-    Field 'Response Value' (btatt.user_control_point.response_value) has a conflicting entry in its value_string: 4 is at indices 3 (Operation Failed) and 4 (User not Authorized))
+    Usage:
+    f=Field.new("frame.delta_time")
+    delta=f().value:tonumber()
     
-    Change-Id: Idb1f023c3dde00f7dcfc8b16e91d0a15a24072dd
-    Reviewed-on: https://code.wireshark.org/review/20740
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 67f8b95
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 27 15:27:25 2017 +0200
-
-    BGP: fix conflicting entry in its value_string
-    
-    Field 'Type Code' (bgp.update.path_attribute.type_code) has a conflicting entry in its value_string: 29 is at indices 19 (LINK_STATE) and 20 (Deprecated))
-    
-    Change-Id: Ifd0c7a2a095d2b216115b94ca0b71e0dca2213ee
-    Reviewed-on: https://code.wireshark.org/review/20741
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 45e0707
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 27 16:13:01 2017 +0200
-
-    bctp: fix conflicting entry in its value_string
-    
-    Field 'BVEI' (bctp.bvei) has a conflicting entry in its value_string: 0 is at indices 0 (No indication) and 1 (Version Error Indication, BCTP version not supported))
-    
-    Change-Id: I9071d3ab7aff6b2c3767f0a5596dad23f1ee4b42
-    Reviewed-on: https://code.wireshark.org/review/20743
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f5ed8a4
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Mar 27 09:40:56 2017 -0400
-
-    Fix "warning C6246: Local declaration hides declaration of the same name in outer scope" warnings
-    
-    Change-Id: I0dbf8d0236b163da568a173ccedc3072bd039caa
-    Reviewed-on: https://code.wireshark.org/review/20739
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9e9917b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Mar 27 16:09:06 2017 +0200
-
-    wslua: update a comment
-    
-    Change-Id: I8ccb3f00ab3ed2eea770acb7541b64ec07749d6b
-    Reviewed-on: https://code.wireshark.org/review/20745
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 96447e4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 29 09:24:19 2016 +0200
-
-    ISUP: use proto_append_item_text
-    
-    Change-Id: Ie17717cbc7d175c3515a155517225a9babb9b5bd
-    Reviewed-on: https://code.wireshark.org/review/17515
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3a21f67
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Sat Mar 25 01:18:02 2017 +0300
-
-    Added Heuristic dissectors for the following UMTS FP channels:
-    HS-DSCH Type 1, HS-DSCH Type 2
-    
-    Change-Id: Id4177d6ce6978b405aa213122f4629467cb249d8
-    Reviewed-on: https://code.wireshark.org/review/20701
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2a8126c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 26 19:25:49 2017 -0400
-
-    sharkd_session.c: warning C6031: Return value ignored: 'sscanf'
-    
-    Change-Id: I32f56b7b351d7096b4e97f7c61db1af8d0b3b6f0
-    Reviewed-on: https://code.wireshark.org/review/20729
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4764087
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 27 11:12:23 2017 +0200
-
-    netflow: Add Classification Engines types
-    
-    Change-Id: I880044c0a91e471c8eb6f98c9ee9aede6877bed2
-    Ping-Bug: 13497
-    Reviewed-on: https://code.wireshark.org/review/20734
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c5dd3a1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 27 11:13:47 2017 +0200
-
-    netflow fix conflict for hf field
-    
-    'cflow.transport_rtt' exists multiple times with NOT compatible types: FT_RELATIVE_TIME and FT_UINT32
-    'cflow.transport_jitter_mean' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME
-    'cflow.transport_jitter_min' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME
-    'cflow.transport_jitter_max' exists multiple times with NOT compatible types: FT_UINT32 and FT_RELATIVE_TIME
-    
-    Change-Id: I3ee220646412235eb3bce58ce3a7bc0547a5a90d
-    Reviewed-on: https://code.wireshark.org/review/20735
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ff60580
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 27 09:20:16 2017 +0200
-
-    udpdump: fix indent (use tab)
-    
-    Change-Id: Ibfe9ad19d12a84794f5e84ebaf3b9de5d4e419e8
-    Reviewed-on: https://code.wireshark.org/review/20733
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit ea0f093
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Sun Mar 26 00:37:41 2017 +0300
-
-    [UMTS RRC] Added dissection of "Cell Identity"
-    According to TS 25.401 / 6.1.5 Cell Identifier
-    
-    Change-Id: I74996e76328f536dec0d34aa8229a1074ed47187
-    Reviewed-on: https://code.wireshark.org/review/20709
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dc482dd
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Sun Mar 26 21:01:13 2017 -0400
-
-    packet-nvme: Corrected typo in keep alive string.
-    
-    This patch fixes typo in keep alive admin queue command string from
-    "kepp" to "keep".
-    
-    Change-Id: If4b01d9d78628978b8db2c39d203cf1e153bfdf2
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/20731
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 45df494
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 26 13:22:02 2017 -0400
-
-    netscreen.c: Suppress compiler warnings on Windows
-    
-    Change-Id: I6920b7ab5862db46c56a85198f97dced842f14d5
-    Reviewed-on: https://code.wireshark.org/review/20723
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 687f7f9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 26 13:50:23 2017 -0400
-
-    netscaler.c: use dynamic memory for temporary buffer in nstrace_read_v30.
-    
-    Makes Windows vscodeanalysis a little happier.
-    
-    Change-Id: Ie744e91ab3f2a9744ae21c932ab6ea25467ad2fa
-    Reviewed-on: https://code.wireshark.org/review/20724
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3b588df
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 26 18:46:13 2017 -0400
-
-    Check for return value of WSAStartup on all executables.
-    
-    Windows vscodeanalysis complains even though the event is probably
-    very unlikely.
-    
-    Change-Id: Iafe158eea5586908209d6bfe1e45540117558673
-    Reviewed-on: https://code.wireshark.org/review/20727
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 520cfcf
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 26 14:18:03 2017 -0400
-
-    bluetooth_device_dialog.cpp: warning C6246: Local declaration of 'item' hides declaration of the same name in outer scope
-    
-    Change-Id: If6d2cf5d193b45d972534a3064fea7d290eac7f4
-    Reviewed-on: https://code.wireshark.org/review/20726
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 505c0f3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 26 14:07:12 2017 -0400
-
-    packet-ieee80211.c: Use dynamic memory for AIRPDCAP_KEYS_COLLECTION
-    
-    Makes Windows vscodeanalysis a little happier.
-    
-    Change-Id: I4e49615bc8b1623f826e0f2b9319d71016454310
-    Reviewed-on: https://code.wireshark.org/review/20725
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ebc6dfa
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 26 19:23:08 2017 -0400
-
-    sharkd_session.c: Match printf argument with datatype
-    
-    Address complaints from vscodeanalysis.
-    
-    Change-Id: I0943a635eb0904a5ee392f772aa21cc3b56bc3de
-    Reviewed-on: https://code.wireshark.org/review/20728
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 677e103
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 26 19:31:03 2017 -0400
-
-    udpdump.c:  warning C6262: Function uses '65608' bytes of stack:  exceeds /analyze:stacksize '16384'
-    
-    Change-Id: I1d82c62dd30497db6a88ba3d3c973799ba7631ab
-    Reviewed-on: https://code.wireshark.org/review/20730
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6184560
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Mar 17 13:51:01 2017 +0100
-
-    LLRP: Remove PARAM_TREE_ADD* macros
-    
-    and make checkhf happy (no need to rewrite some wireshark function...)
-    
-    Change-Id: I0214e809229ac14d5ecf136f61db232c5dd50cdb
-    Reviewed-on: https://code.wireshark.org/review/20704
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 244b301
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Mar 26 18:36:44 2017 +0200
-
-    Move #if 0 up to include the now unused struct definition
-    
-    Change-Id: I5500a091608af61d7f8091ba133db558c148a853
-    Reviewed-on: https://code.wireshark.org/review/20719
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit be65846
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Sun Mar 26 10:02:59 2017 -0500
-
-    User Guide: Fix two trivial typos
-    
-    Change-Id: I25bab6eb1072bec102e00a76027c7742a0ea883b
-    Reviewed-on: https://code.wireshark.org/review/20714
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2d31c2a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Mar 26 08:12:24 2017 -0700
-
-    [Automatic update for 2017-03-26]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I284e7960d0ad30e715a9afc42e4248f2a19f8fa7
-    Reviewed-on: https://code.wireshark.org/review/20716
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 2affc00
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sun Mar 19 11:33:47 2017 +0100
-
-    sharkd: support for SRT and RTD taps.
-    
-    Change-Id: I60b9ece77f4795cd5208e53ccd18ab010646050f
-    Reviewed-on: https://code.wireshark.org/review/20614
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 457f4fb
-Author: Joakim Karlsson <oakimk@gmail.com>
-Date:   Sat Mar 25 16:48:48 2017 +0100
-
-    diameter: Improvement of AVP 8
-    
-    Will now show country and operator
-    Same as Ic16623c226228ab0c3e31d33cda81953c80551d6
-    
-    Change-Id: Iecae92d531b9d37254573894f0e7e7f2e2a970aa
-    Reviewed-on: https://code.wireshark.org/review/20708
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a5b6103
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 25 15:36:41 2017 +0100
-
-    BGP: Fix dissection of BGP ADD-PATH capability
-    
-    not limited to len = 4 (can be a multiple of 4)
-    
-    Bug: 13521
-    Change-Id: I668dbff6d8a7b0a4260da31393bb70d2c5431455
-    Reviewed-on: https://code.wireshark.org/review/20705
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bb2ab6a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Mar 25 21:58:47 2017 -0700
-
-    Don't speak of RTPS time_t as an "NTP" time.
-    
-    It's some weird hybrid of UN*X time and NTP time stamps, using UN*X's
-    epoch and NTP's seconds/fractions split.  I'm sure they had their
-    reasons for not using something like struct timespec or regular NTP
-    time, and instead inventing something that's halfway in between them.
-    
-    Change-Id: I1f39ec1368af52b82adfa2a22677dfa6e9341309
-    Reviewed-on: https://code.wireshark.org/review/20711
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a673056
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Mar 25 21:37:29 2017 -0700
-
-    Add ENC_TIME_TIMEVAL and use it for gsmtap.
-    
-    From a look at the libosmocom code, time stamps in
-    GSMTAP_TYPE_OSMOCORE_LOG messages appear to be UN*X struct timevals with
-    a 4-byte tv_sec, not anything NTP-like with the fraction-of-a-second
-    part in units of 1/2^32s of a second.
-    
-    Add ENC_TIME_TIMEVAL to handle time stamps like that, and use it rather
-    than ENC_TIME_NTP_BASE_ZERO.
-    
-    Change-Id: Ia1511527ee292fb7725b2a64c0af16d23ff10a6d
-    Reviewed-on: https://code.wireshark.org/review/20710
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6c374a2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 25 16:12:43 2017 +0100
-
-    profinet (pn-rt): fix 'pn_rt.ds_redundancy' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
-    
-    Change-Id: I5c74a34619ea66c3ac2a77d10b31a3f1256c6595
-    Reviewed-on: https://code.wireshark.org/review/20707
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8a5bce5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 25 16:12:13 2017 +0100
-
-    dvb (s2): fix 'dvb-s2_bb.reserved' exists multiple times with NOT compatible types: FT_NONE and FT_BYTES
-    
-    Change-Id: If8fee9f8c27d32acecec975c7107b6e8203480ed
-    Reviewed-on: https://code.wireshark.org/review/20706
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit be528f3
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Sat Mar 25 01:59:24 2017 +0300
-
-    Fixing TVB creation for PDUs in HS-DSCH Type 2 FP packets
-    
-    Bug: 13520
-    Change-Id: I3e95a33fa053637a3af0e74f6b010ba1eacdfde8
-    Reviewed-on: https://code.wireshark.org/review/20702
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 370f3b3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 00:51:08 2017 +0100
-
-    Qt: add cache proxy model for Voip Calls dialog
-    
-    When a capture file is reloaded, the information stored in
-    VoipCallsInfoModel is invalidated. Add another cache layer to fix this:
-    
-        VoipCallsInfoModel          wraps around raw data (invalid on close)
-        CacheProxyModel             NEW: use prev. data or cache on close
-        VoipCallsInfoSortedModel    provided sorting, etc.
-        VoipCallsDialog             actual user of model (callTreeView)
-    
-    This also fixes a UAF after a file was closed, and when a call is
-    selected (that got worse with the last model/view patch and is "fixed"
-    in this patch with the caching layer. Note that the Flow sequence and
-    Play Streams dialog are not that useful when the file is closed).
-    
-    Change-Id: Ib4daff9dc01a54863fe1d943bdbdb876418924ee
-    Reviewed-on: https://code.wireshark.org/review/20574
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit b4bc6c7
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Feb 13 01:36:58 2017 +0100
-
-    Qt: refactor Voip Calls Dialog into Model/View
-    
-    Functional improvements:
-    
-     - "Time of day" option is now propagated to the CSV/YAML export.
-     - The sorting order is preserved in the CSV/YAML export.
-    
-    Other changes:
-    
-     - Convert column name identifiers to enum.
-     - CSV output will now always be quoted (previously numbers like packet
-       count were not quoted, but since CSV has no numeric type it should
-       be OK to add quotes). Side-effect of model design decision.
-     - Instead of clearing the widgets and re-adding all calls, now it will
-       add new calls to the model. Not tested with a live capture, if the
-       column data can change, maybe a dataChanged signal is needed.
-    
-    Due to this patch, it should be easier to add a filter for finding calls
-    easier (e.g. by From, IP, etc.).
-    
-    Note: extra QList is used in the model to ensure a O(1) lookup of calls
-    (rather than O(n) for GQueue).
-    
-    Change-Id: Ie08462aae038d9c3daf1cc7a152b948724689017
-    Reviewed-on: https://code.wireshark.org/review/20084
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit bff7469
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Mar 24 19:48:15 2017 +0100
-
-    MAC LTE: upgrade dissector to v13.5.0
-    
-    Change-Id: Iffba7cc03f1326dfa9725ac6ed677173b932684a
-    Reviewed-on: https://code.wireshark.org/review/20700
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e8c7d53
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Fri Mar 24 11:24:43 2017 -0400
-
-    packet-nvme-rdma: Corrected NVMe Fabrics port number
-    
-    This patch fixes typo in the NVMe fabrics port number from 4220 to 4420.
-    
-    Ping-Bug: 13201
-    Change-Id: Ib0378b894c014ab91065f61c512c4d83fe7fcdb8
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/20699
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c78c8dc
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Mar 24 14:42:51 2017 +0100
-
-    Rename a few variables to look more similar to the qt implementation
-    Reset auth_str for each round of the loop.
-    
-    Change-Id: Ib5be6a3d172c28d7b1634fdba3e72c83622405dd
-    Reviewed-on: https://code.wireshark.org/review/20698
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit cf97b57
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Mar 24 12:52:18 2017 +0100
-
-    [RTP Analysis] Remove check for duplicated MAC (duplicated packet
-    detection)
-    
-    Bug: 11478
-    Change-Id: Ieff015e5bf55facc732beae6a40b76d2050a4aac
-    Reviewed-on: https://code.wireshark.org/review/20696
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ceeb757
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Mar 24 14:09:06 2017 +0100
-
-    Remove the last HAVE_PCAP_REMOTE inside HAVE_PCAP_REMOTE for this file.
-    
-    Change-Id: I8710c235ae5377c2064097b1d7163c4cb3544fd8
-    Reviewed-on: https://code.wireshark.org/review/20697
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 5e2f72a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 16 19:20:03 2017 +0100
-
-    ros (asn1): fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I2c7553bdf664ffaa53ba48195b9b7d234d53e839
-    Reviewed-on: https://code.wireshark.org/review/20581
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f9fe43d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 18 16:24:01 2017 +0100
-
-    proto: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: Ie8590d6c94b19697cff33874c5bc0b76024d337f
-    Reviewed-on: https://code.wireshark.org/review/20693
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e61189d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Mar 24 09:33:47 2017 +0100
-
-    coap: Add filterable payload length
-    
-    Also fix payload desc abbrev.
-    
-    Change-Id: I355658d7722383e5d1ef84efddf43e545bfda269
-    Reviewed-on: https://code.wireshark.org/review/20695
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 0b2eb9d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Mar 24 08:33:06 2017 +0100
-
-    coap: Put payload protocol in parent tree
-    
-    Change-Id: I15cc9df174a42d284c55306cd43f9a86eebd93a2
-    Reviewed-on: https://code.wireshark.org/review/20694
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 2ff5931
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Mar 24 01:39:37 2017 +0100
-
-    Clean up gtk/capture_dlg.c insert_new_rows a bit.
-    
-    Hopefully no semantic changes.
-    
-    Change-Id: I1e43a971851ad944aa1e18c42131b6e180017656
-    Reviewed-on: https://code.wireshark.org/review/20689
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2dbde83
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Wed Mar 22 14:57:02 2017 -0400
-
-    CIP Motion: Minor updates
-    
-    1. Change protocol name from "Motion" to "CIP Motion". This now matches "CIP Safety" I/O.
-    2. Print out unparsed data as bytes.
-    3. Remove if(tree) check
-    4. Clean up the parsing to be a little more consistent, and in packet byte order.
-    
-    Change-Id: I5c28522da7991852b708d825a349badc036b4b8d
-    Reviewed-on: https://code.wireshark.org/review/20673
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3ddaa5e
-Author: IWASE Yusuke <iwase.yusuke0@gmail.com>
-Date:   Tue Mar 21 13:09:21 2017 +0900
-
-    BGP: Decode Route Distinguisher in VPN Flow Specification
-    
-    RFC5575 says Route Distinguisher is inserted between "length" and "NLRI
-    value" fields when the BGP NLRI type is VPNv4 Flow Spec (AFI=1,
-    SAFI=134) and this is the same for VPNv6 and L2VPN.
-    
-    This patch fixes the BGP dissector to decode the missing Route
-    Distinguisher field in Flow Spec NLRI decoder.
-    
-    Change-Id: Ib45d96bb399b80be69ca70ea552d2c07b07a9782
-    Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/20653
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 383ba15
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Mar 24 00:26:53 2017 +0100
-
-    Clean up updateRemoteInterfaceList a bit more.
-    
-    Add an #if-0'ed add_interface_to_remote_list because it is present in its
-    gtk pendant insert_new_rows in capture_dlg.c
-    
-    Change-Id: I90e8f9eaafd3d3ca31140ec8bcd6a2eeb7c849ca
-    Reviewed-on: https://code.wireshark.org/review/20688
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit cbea4c0
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Mar 23 19:46:49 2017 +0100
-
-    Split interface update code into its own routine
-    
-    Change-Id: I568a0785978227924cc6c3b7e9f86f39fa777411
-    Reviewed-on: https://code.wireshark.org/review/20687
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit ff89c11
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Mar 23 14:58:11 2017 +0100
-
-    [GTPv2] Add dissection of Millisecond Time Stamp.
-    
-    Change-Id: Ic1f536c3fa786e118f1f20b983137ae5a91de271
-    Reviewed-on: https://code.wireshark.org/review/20686
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8db347b
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Mar 23 14:53:16 2017 +0100
-
-    [Diameter] Fix typos
-    
-    Change-Id: I535605f29ce052c7d86e1646797456d2c02a8643
-    Reviewed-on: https://code.wireshark.org/review/20685
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit da53525
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Thu Mar 23 08:37:25 2017 +0100
-
-    MACsec: Align dissector more with IEEE 802.1AE
-    
-    - Use more standard Wireshark APIs
-    - Align naming more with IEEE standard
-    
-    Change-Id: Id76e9693c5f59dbbd7864da8072e993ba60f71b9
-    Reviewed-on: https://code.wireshark.org/review/20677
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8826910
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 20 19:08:02 2017 +0100
-
-    netflow: fix dissection of Application ID
-    
-    Bug: 13497
-    Change-Id: Ifa1679c95893268a70f201626d4c534d9bb54bcd
-    Reviewed-on: https://code.wireshark.org/review/20648
-    Reviewed-by: Nick Brown <nickbroon@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 81ad4cd
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Sun Mar 19 21:07:53 2017 -0500
-
-    capinfos: Add -K option and report capture comments last
-    
-    This patch adds a capinfos -K option to suppess printing of capture
-    comments.  This patch also changes when capture comments are printed
-    relative to the other enabled infos. Because capture comments are
-    freeform we will now defer their printing until all but the interface
-    detail infos are printed.
-    
-    Change-Id: Ibb3df040c09e4c67d714c561869c00e08b83d6ed
-    Reviewed-on: https://code.wireshark.org/review/20643
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9e35c0b
-Author: Erik de Jong <erikdejong@gmail.com>
-Date:   Mon Mar 20 19:11:46 2017 +0100
-
-    Fix QT UI bugs in RTP dialogs
-    
-    - RTP analysis and player dialogs are modal whereas they were not modal in GTK
-    UI
-    Only fixed calling up the RTP analysis window being modal when called from the
-    RTP streams dialog as it is modeless when called from the menu in the main
-    window with a stream packet selected.
-    
-    - Action 'Next problem packet' triggers an infinite loop when there are no
-    'problem packets' and first packet is selected when calling the action.
-    
-    - Crosshairs not implemented in RTP player/crosshairs context menu item not
-    working.
-    Context menu item commented out.
-    
-    bug: 13500
-    Change-Id: I0ba954f895b85605462c316e4426280ec4d437b2
-    Reviewed-on: https://code.wireshark.org/review/20660
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 50a30c1
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Mar 23 12:45:49 2017 +0100
-
-    [Diameter] Update with AVPs from TS 29.273 V14.2.2
-    
-    Change-Id: I4095beebfd8f9bd0f5a74b338eff91722843ad8d
-    Reviewed-on: https://code.wireshark.org/review/20684
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d49e7d9
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Mar 23 08:48:39 2017 +0100
-
-    icmp: Fix name for addr_entry_size
-    
-    Use "Address entry size" as name for icmp.addr_entry_size
-    
-    Change-Id: Ibf118ef4e05e9bda4d90a4576dd844204c3ca5ed
-    Ping-Bug: 13515
-    Reviewed-on: https://code.wireshark.org/review/20678
+    Change-Id: I6ef91c6238a6c2ed9adf6cae03f8913f0a09332e
+    Reviewed-on: https://code.wireshark.org/review/22316
     Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 12241be
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Mar 22 10:52:16 2017 +0100
-
-    Qt: Register Qt dialog UAT files during startup
-    
-    All files which belongs in a configuration profile are registered
-    during startup because they affect copy existing profiles and
-    reset the default profile.
-    
-    UAT files used in Qt dialogs are not loaded during startup because
-    they only get loaded when the dialog is shown.  This files must be
-    manually registered.
-    
-    Change-Id: Ib43f5c46b0dbde6994d90512708488cc2bd92f04
-    Reviewed-on: https://code.wireshark.org/review/20665
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit bb017f3
-Author: Mikael Kanstrup <mikael.kanstrup@gmail.com>
-Date:   Wed Mar 22 11:43:43 2017 +0100
-
-    androiddump: Fix tcpdump op prec bug with used_buffer_length calc
-    
-    androiddump reads data from tcpdump in chunks that not necessarily
-    match packet sizes. Whenever a partly read packet is found in buffers
-    more data is read and the number of used bytes in buffer is updated.
-    The calculation of used_buffer_length is wrong though leading to most
-    packets are read and thrown away.
-    
-    Problem fixed by correcting an operator precedence mistake where
-    used_buffer_length would only be increaded with 0 or 1 insted of
-    actual number of read bytes.
-    
-    Change-Id: Ib5c4e1d96e7ba499f26796ffa5d7ce6a116b9a6e
-    Reviewed-on: https://code.wireshark.org/review/20666
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c9bf21c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 18 15:08:23 2017 +0100
-
-    umts_fp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I4dd45ebfb4e9a2c6d2537f9a3fa842bfc4414a08
-    Reviewed-on: https://code.wireshark.org/review/20604
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 559836a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Mar 22 18:35:28 2017 +0100
-
-    LTE RRC: upgrade dissector to v13.5.0
-    
-    Change-Id: Ic1c1b2cbf2a9213dbb6d6eadb41c15fcddb0d64a
-    Reviewed-on: https://code.wireshark.org/review/20672
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4f1df36
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Mar 22 21:12:37 2017 -0700
-
-    Update some Cisco URLs.
-    
-    Some pages moved, some pages went away and are archived on the Wayback
-    Machine, some pages went away and *weren't* archived on the Wayback
-    Machine but are stored on another site out there.
-    
-    Change-Id: I2f8d8b9ce569804b0e8424523d31168b47162506
-    Reviewed-on: https://code.wireshark.org/review/20676
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 59add43eecfbed3bae5d75dabe6e875b5adefe1b)
+    Reviewed-on: https://code.wireshark.org/review/22331
 
-commit 5f49829
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Mar 22 22:10:43 2017 +0100
-
-    ieee802154: Don't set COL_PACKET_LENGTH
-    
-    It's not needed for a dissector to set COL_PACKET_LENGTH.
-    
-    Change-Id: I536145d1ed3b98cbdc922d03a2dd2e26a8f99744
-    Reviewed-on: https://code.wireshark.org/review/20675
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fa25f19
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Wed Mar 22 20:05:51 2017 +0100
-
-    Thrift: Register for media-type application/x-thrift
-    
-    Thrift streams can be transported over http (or https).
-    
-    application/x-thrift is not official assigned but still in use
-    (s. https://issues.apache.org/jira/browse/THRIFT-3250).
-    
-    Change-Id: I42e34b55da023b09bfef4658c89b1941ef4e574b
-    Reviewed-on: https://code.wireshark.org/review/20674
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a834964
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Mar 22 14:55:53 2017 +0100
-
-    NBIFOM: fix a typo in a filter name
-    
-    Change-Id: I3e8880300e14630151c91cd4d0cf7311a3497fb1
-    Reviewed-on: https://code.wireshark.org/review/20669
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 74ac452
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Mar 22 14:50:24 2017 +0100
-
-    [BSSAP] Update comments from V 14.2.0
-    
-    Change-Id: I943550891ae25bedea969db57fe20167137e1feb
-    Reviewed-on: https://code.wireshark.org/review/20668
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e5c9440
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Mar 22 10:48:17 2017 +0100
-
-    [BSSGP] Dissect UTRA SI Container.
-    
-    Change-Id: I043061784cc3863cf6d67c42042a74dd80e9741a
-    Reviewed-on: https://code.wireshark.org/review/20664
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b2ee646
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Mar 22 08:51:46 2017 +0100
-
-    pcapng: Fix reading OPT_IDB_FCSLEN block
-    
-    Changed to use correct option_id when reading IDB.
-    
-    Change-Id: Id3a3b3cd95f9d7bcf51de001cfe246beb98590ad
-    Reviewed-on: https://code.wireshark.org/review/20663
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9477e47
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Wed Mar 22 00:32:14 2017 +0100
-
-    Netlink: update some values used in netlink
-    
-    Change-Id: Id12caf9d40b0f53880ea4cc9200c340086e0b39b
-    Reviewed-on: https://code.wireshark.org/review/20661
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit af79cf1
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Sun Mar 12 10:19:08 2017 -0400
-
-    BGP: Fix incorrect desegment_len value.
-    
-    Change-Id: I9a8f0b6877ce15f1e4672dd9dc884571de6f7f7e
-    Reviewed-on: https://code.wireshark.org/review/20510
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 40a5fb5
+commit 192ba64
 Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 10 03:46:53 2017 +0100
+Date:   Wed Jun 21 15:51:35 2017 -0400
 
-    Restore interface selection after interface refresh
-    
-    Remember which interfaces were selected for the next capture and restore
-    the selection (note that only active capture devices are stored in
-    "ifaces", so simply querying that list does not work).
+    Qt: fix sorting of custom columns with multiple fields
     
-    The original change tried to fix duplicate devices (which were added
-    from "ifaces" to "all_ifaces") by clearing "ifaces", this patch tries to
-    fix that by ignoring all non-PIPE devices while preserving "ifaces".
+    Fields like "dns.time || http.time || smb.time" were sorted by column
+    number before. Recognize when all fields are numeric values and then try
+    to sort by number and otherwise fallback to a value comparison.
     
-    Now after refreshing the interfaces list in Qt, the selection in the
-    Manage Interfaces dialog is preserved. Removal of the bluetooth0
-    interface+refresh does hide the interface. Read+refresh does add the
-    interface (and preserve the selected state).
+    In theory sorting should now also be a bit faster for custom columns
+    because the columnn type is looked up once.
     
-    Change-Id: I26a78982f0327c835dc96da9c813e38f31d6cd3d
-    Fixes: v1.99.0-rc1-879-g55733ea170 ("fix scan_local_interfaces()")
-    Reviewed-on: https://code.wireshark.org/review/20477
+    Change-Id: Id40d7cce8080d05823d74459fc493ec6ebf80956
+    Reported-by: Laura Chappell
+    Reviewed-on: https://code.wireshark.org/review/22317
     Petri-Dish: Peter Wu <peter@lekensteyn.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1f5c304
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 19 10:35:04 2017 -0400
-
-    Localize decimal point on time formatted columns.
-    
-    Have the decimal point for sub-second values be locale specific.
-    
-    Change-Id: I670471e8e5db6291e364d124eb48ddbaa6d8ff26
-    Ping-Bug: 12500
-    Reviewed-on: https://code.wireshark.org/review/20621
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d972ffc
-Author: Rémy Léone <remy.leone@gmail.com>
-Date:   Tue Mar 7 14:32:22 2017 +0100
-
-    ieee802154: Time correction IE: Fix and add micro-second value
-    
-    Change-Id: I52a22e7cfd8c0d5c054435678c891a3e1d0505b2
-    Reviewed-on: https://code.wireshark.org/review/20547
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 015217a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Mar 21 12:08:21 2017 -0400
-
-    packet-ieee802154.c: Bugfix handling Auxilary Security Header for v2003
-    
-    Bug: 4912
-    Change-Id: Ifc4922fecb1320d7992f8250a0fb2fa18723a514
-    Reviewed-on: https://code.wireshark.org/review/20659
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cfab7d5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 21 19:10:40 2017 -0700
-
-    Handle LINKTYPE_SDLC.
-    
-    Change-Id: I16a67f2d459cd6ebdbc7bdefd481fd95607af22a
-    Reviewed-on: https://code.wireshark.org/review/20662
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit eda05b5
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Mar 21 16:24:51 2017 +0100
-
-    [RANAP] Update to 3GPP TS 25.413 V13.2.0 (2016-06)
-    
-    Change-Id: I1f6cc99761e13cd09811a4cebca145c47d5b4eca
-    Reviewed-on: https://code.wireshark.org/review/20657
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d9a71c4
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Mar 21 14:36:38 2017 +0100
-
-    [RANAP] Dissect RIMInformation.
-    
-    Change-Id: I39281c36e55b09427b3022362964c934be433ef1
-    Reviewed-on: https://code.wireshark.org/review/20655
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 041cc88
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Mar 21 14:16:53 2017 +0100
-
-    [BSSGP] Set cur_offset after expert info,UTRA SI Container - not
-    dissected yet to continur dissection.
-    
-    Change-Id: Ibe3235b4238969e49915a6b9ecdd475f5a3cc620
-    Reviewed-on: https://code.wireshark.org/review/20654
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ca1f114
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Mar 20 19:32:00 2017 -0700
-
-    More URL updates and additions.
-    
-    Change-Id: Id7fbfc3bd0bf94163228ad4e6de87b70e886edb6
-    Reviewed-on: https://code.wireshark.org/review/20652
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7c2e0a2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Mar 20 19:27:06 2017 -0700
-
-    Update some URLs.
-    
-    Go to the Wayback Machine for now; give URLs for the specific documents
-    in that directory on the IBM FTP site, and indicate what documents they
-    are.
-    
-    Change-Id: Ica0378e8e8a29b9367a6ebd3ecb41a06d2e93a15
-    Reviewed-on: https://code.wireshark.org/review/20651
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f6e0468
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 16:56:38 2017 +0100
-
-    TLS13: add oid_filters(48) extension for draft -19
-    
-    Change-Id: I80b05bc81e77a70f2e0c8e1fe706ce5bd0a33981
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20593
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f033925
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 19:11:45 2017 +0100
-
-    TLS13: fix key expansion for AES256
-    
-    "key_len" refers to the key length of an algorithm, not the block size.
-    For AES128 both are the same, but for AES256 it is different.
-    
-    Change-Id: Ic657265d90323eb224b133b23232cb809264ab64
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20598
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c0d6b0e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 20 21:28:44 2017 +0100
-
-    LLRP: Fix LLRP Custom Parameter Decoding
-    
-    param_end is the offset+len... and also vendor unknown is not limited to uint32
-    
-    Bug: 13473
-    Change-Id: I68cf435f52f28a4a399812f715b38edeecd1e78c
-    Reviewed-on: https://code.wireshark.org/review/20650
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2d0ae39
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 19 21:16:03 2017 +0100
-
-    ftypes: move get_value_ptr into the union
-    
-    Delete get_value_ptr from struct _ftype_t, make it
-    part of the get_value union.
-    
-    Change-Id: I947331069662a7043bd838e622d286629cc7be9a
-    Reviewed-on: https://code.wireshark.org/review/20647
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 45b8a1e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Mar 20 10:24:37 2017 -0400
-
-    MIPv6: Bugfix proto_tree_add_item_ret_uint usage.
-    
-    hf_mip6_ipv4ha_ha field is an FT_IPv4 type, so proto_tree_add_item_ret_uint can't be used.
-    
-    Also correct option tree display noticed while debugging above issue.
-    
-    Bug: 13499
-    Change-Id: I6da281567f47d08864575e41fa2a29347d55613a
-    Reviewed-on: https://code.wireshark.org/review/20646
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e6525ab
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Mon Mar 20 00:40:59 2017 -0400
-
-    packet-nvme-rdma: Add support to dissect send with invalidate
-    
-    This patch adds support to dissect nvme fabric cqe which is sent using
-    rdma send_with_invalidate opcodes.
-    
-    Change-Id: I90d271526f04da047295f496e77b04f606a29ad4
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/20645
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2fd8c17
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 19 19:31:02 2017 +0100
-
-    Replace PARAM_TREE_ADD_SPEC_STAY macro by proto_tree_add...
-    
-    (Make checkhf more happy)
-    
-    Change-Id: I27ff7d9ba1351bdc7dc1b801950ffdfaf3266629
-    Reviewed-on: https://code.wireshark.org/review/20634
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 66dc0ae
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Sun Mar 19 22:17:30 2017 -0400
-
-    capinfos: Remove obsolete message from print_usage() report.
-    
-    Commit 6b84ddee83e70aff944da084129624226b7a32fa made libcrypt a
-    mandatory dependency. Remove overlooked help message claiming
-    that hashing support is not present.
-    
-    Change-Id: I908dbbf4d37253fe01513988a42f074322344c0f
-    Reviewed-on: https://code.wireshark.org/review/20644
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c258b6b
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 19 20:57:43 2017 +0100
-
-    ftypes: move get_value_uinteger into the union
-    
-    Delete get_value_uinteger from struct _ftype_t, make it
-    part of the get_value union.
-    
-    Change-Id: I4a6c8341676c442e2bf8ae3b8f771b72161d133c
-    Reviewed-on: https://code.wireshark.org/review/20640
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 01b460f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 18 16:26:05 2017 +0100
-
-    proto(.c): remove unused check and fix indent..
-    
-    Change-Id: I30b44cb0145f76c3929cac92337756a4164df1d2
-    Reviewed-on: https://code.wireshark.org/review/20609
-    Reviewed-by: Juan Jose Martin Carrascosa <juanjo@rti.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e94bd9b
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 19 20:32:20 2017 +0100
-
-    ftypes: move get_value_sinteger into the union
-    
-    Delete get_value_sinteger from struct _ftype_t, make it
-    part of the get_value union.
-    
-    Change-Id: I3127252cafc62389ce426639992f1d59f7ac9731
-    Reviewed-on: https://code.wireshark.org/review/20637
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2a34738
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 19 20:45:20 2017 +0100
-
-    eth: remove unnecessary NULL checks
-    
-    We may safely call proto_item_add_subtree() when the item is NULL.
-    Make sure that expert info are not filtered out by a NULL check.
-    
-    Change-Id: I4516cd750c9b0b568c8de9adaad757d0ea769ad6
-    Reviewed-on: https://code.wireshark.org/review/20639
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 401f901
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 15:51:17 2017 +0100
-
-    TLS13: update pre_shared_key lengths for draft -19
-    
-    Change-Id: Idb9741fba0a2dfcad503e7bd033311bffd54a022
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20592
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 18c4d1b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 13:53:40 2017 +0100
-
-    TLS13: update HRR for draft -19
-    
-    Change-Id: I4b229350fbc6740b307e52086cc0529a888c8eb4
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20587
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2d6e634
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 19 20:42:07 2017 +0100
-
-    dissectors (and tools): fix typo dependant -> dependent
-    
-    found by lintian
-    
-    Change-Id: I50907b9721f3941c291cf322916f553ab3b4b168
-    Reviewed-on: https://code.wireshark.org/review/20638
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 784169b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 19 19:33:21 2017 +0100
-
-    h245 (asn1): fix typo identifer -> identifier
-    
-    found by lintian
-    
-    Change-Id: I15f734e1d2218756867cefbd311b620c8a84e9ac
-    Reviewed-on: https://code.wireshark.org/review/20635
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ca13359
-Author: Apeksha Singhal <apeksha.singhal@gmail.com>
-Date:   Wed Mar 8 22:15:22 2017 +0530
-
-    nstrace: Updating Additional TCP debugrec labels according to tracedebug option
-    
-    Change-Id: I4fc9efba068078f9ae6be4d74fb6fbcb9a6545c3
-    Reviewed-on: https://code.wireshark.org/review/20450
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9a81d2e
-Author: erikdejong <erikdejong@gmail.com>
-Date:   Sun Mar 19 19:19:11 2017 +0100
-
-    Fix: UA3G read past end of tvb + NOE key descriptions
-    
-    packet-ua3g.c:
-    Start tone device routing packet causes exception because it adds a subtree with
-    length 6 where it should be 3. Changed 6 to 3.
-    
-    packet-noe.c:
-    Key description is incomplete because buffer reserved is only 10 bytes long and
-    key descriptions are up to 23 bytes long. Changed buffer length to 24.
-    
-    Bug: 13502
-    Change-Id: I8212d23c650efd341e87f766a80a887ef82f4b0b
-    Reviewed-on: https://code.wireshark.org/review/20633
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0fdbaa4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Mar 19 11:01:04 2017 -0700
-
-    Make GTK compile with HAVE_PCAP_REMOTE on macOS with clang-800.0.42.1.
-    
-    Change-Id: I36bf1e39541fc55bc315f12f56dfd7ed7e0cc207
-    Reviewed-on: https://code.wireshark.org/review/20632
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c87cf1a
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Mar 19 18:44:38 2017 +0100
-
-    Remove a reference to deleted doc/README.epan_child
-    
-    Change-Id: I521674267873fe32c3ff5b53c9fb6a9e971d8772
-    Reviewed-on: https://code.wireshark.org/review/20631
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit ea5b19a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 19 11:27:03 2017 -0400
-
-    SMB2: Remove useless blurbs
-    
-    Spacing differences or just providing name of dissector + field name is
-    not a useful use of the blurb field.
-    
-    Change-Id: Ie30e53733977715cdcb0030c064afe897e6766eb
-    Reviewed-on: https://code.wireshark.org/review/20624
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b6e3713
-Author: Jeremy Hitt <jeremy.hitt@isilon.com>
-Date:   Sat Mar 18 23:40:18 2017 -0400
-
-    Enhance SMB2 dissector to include negotiate contexts in negotiate requests and responses
-    
-    Add session setup flag for encryption
-    
-    Change-Id: Iff85751ae635d92cf752426f4ceb7398b99b4799
-    Reviewed-on: https://code.wireshark.org/review/20612
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 78634bb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 19 16:59:58 2017 +0100
-
-    ciscodump (man): fix typo dependant -> dependent
-    
-    found by lintian
-    
-    Change-Id: I5ce951fca2213d3d18807cde061dea201a36999f
-    Reviewed-on: https://code.wireshark.org/review/20628
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4db2d40
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 19 16:55:49 2017 +0100
-
-    response_time_delay_dialog (Qt): fix typo reponse -> response
-    
-    Change-Id: Ib29cca71a4ffe4e44f341d9de5e3da603c7b3f15
-    Reviewed-on: https://code.wireshark.org/review/20627
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9a8d906
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 19 16:54:49 2017 +0100
-
-    dissector: fix typo reponse -> response
-    
-    Change-Id: I5d12b7038c0ed602cd5b3b416c35893986018f85
-    Reviewed-on: https://code.wireshark.org/review/20626
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b157a5d
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Sun Mar 19 00:37:30 2017 -0500
-
-    capinfos: Ensure empty columns are written in -T reports.
-    
-    When using capinfo's -T report insure that proper placeholders are written
-    to the records if any of the optional pcapng SHB block values are missing
-    so as to maintain column alignment with the header record.
-    
-    Augment the comments about the potential silliness regarding the dumping
-    of pcapng comments in capinfos -T reports.
-    
-    Change-Id: I43df4aeed2235f7ed9c67519c249361ab00680f1
-    Reviewed-on: https://code.wireshark.org/review/20613
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dfed842
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 19 17:07:55 2017 +0100
-
-    dissector: fix typo identifer -> identifier
-    
-    Change-Id: Id23d219f06c2c504b9e4c845a1bf9d4c2531bc93
-    Reviewed-on: https://code.wireshark.org/review/20629
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ed234da
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Mar 19 15:33:28 2017 +0100
-
-    Make GTK compile with HAVE_PCAP_REMOTE on Linux with gcc6
-    
-    Change-Id: I87cbe47d34b768cb50be6580f85e8175103686c0
-    Reviewed-on: https://code.wireshark.org/review/20620
-    Petri-Dish: Jörg Mayer <jmayer@loplof.de>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 1dde988
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Mar 16 20:45:34 2017 +0100
-
-    Lua: Add some ProtoField tests
-    
-    Add tests for abbrev and name validation.
-    Add tests for signed integer base values.
-    
-    Change-Id: I0bd65c6633b44ae998880f528c22afc22c87529d
-    Reviewed-on: https://code.wireshark.org/review/20568
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0b6b152
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Mar 19 13:47:11 2017 +0100
-
-    Remove echld/.
-    
-    It has been unsupported for some years and when talking about removing it
-    in the past I received some positive and no negative feedback.
-    
-    There is one instance of echld left:
-    capchild/capture_sync.c:                 * echld might have already reaped the child.
-    
-    Can that case be removed or should be comment be updated to something more
-    accurate? (left for a separate patch)
-    
-    Change-Id: Idac397158dd86fd0728eb95379449ee4a463fc28
-    Reviewed-on: https://code.wireshark.org/review/20619
-    Petri-Dish: Jörg Mayer <jmayer@loplof.de>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a65c0c4
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Mar 17 14:37:25 2017 -0400
-
-    MySQL: Bugfix state handling
-    
-    A "conversation" is created for MySQL to store "conversation data" including
-    current state.  The problem is that it's updated every time a packet is dissected
-    so depending on how packets are viewed, dissection may change.
-    Fix that by only allowing conversation state to be set on first pass and have
-    the state cached with each individual pdu, keyed by tvb_raw_offset() (the key
-    when you have multiple pdus in a TCP packet).
-    
-    Change-Id: I2c7e38be63501360d709210a509aa0dfa482bfd4
-    Reviewed-on: https://code.wireshark.org/review/20600
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0bcd255
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Mar 19 08:09:10 2017 -0700
-
-    [Automatic update for 2017-03-19]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I5d2807ce653df495722663def31164e2342b0d89
-    Reviewed-on: https://code.wireshark.org/review/20622
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 5d9cfea
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 19 13:31:53 2017 +0100
-
-    ftypes: move get_value_uinteger64 into the union
-    
-    Delete get_value_uinteger64 from struct _ftype_t, make it
-    part of the get_value union.
-    
-    Change-Id: I2b06efb7691c1bd4089994849373ab8b5ff0bcc7
-    Reviewed-on: https://code.wireshark.org/review/20618
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5bb8f1a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 19 13:08:06 2017 +0100
-
-    ftypes: move get_value_sinteger64 into the union
-    
-    Delete get_value_sinteger64 from struct _ftype_t, make it
-    part of the get_value union.
-    
-    Change-Id: I0113f70ab0aadd1aa655466e896e3acce6c8faeb
-    Reviewed-on: https://code.wireshark.org/review/20617
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e66b05f
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Mon Mar 13 21:04:24 2017 -0500
-
-    tshark:  Optionally delimit packet summary columns with tabs
-    
-    This patch augments tshark's -T report with a "tabs" option.
-    When the -T tabs option is enabled an ASCII horizontal tab character
-    is inserted between each column of the human-readable one-line
-    packet summary record.
-    
-    Change-Id: Id10a6e21e231eb2e52b6342ed05399db1a5fcfdf
-    Reviewed-on: https://code.wireshark.org/review/20537
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2890e41
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Mar 19 12:26:28 2017 +0100
-
-    Fix various compile warnings turning error on Linux with gcc6 when
-    compiling with HAVE_PCAP_REMOTE (and ENABLE_ECHLD)
-    
-    Change-Id: If5524f2d3dcacca9c82a46167480c8436dd8b1b2
-    Reviewed-on: https://code.wireshark.org/review/20615
-    Petri-Dish: Jörg Mayer <jmayer@loplof.de>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 74e793e
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Mar 16 22:34:49 2017 +0100
-
-    ftypes: create a get_value union, move get_value_floating into the union
-    
-    Change-Id: I6bbaf6a7c8a3124e5eab7a7b97c6be082fe8beff
-    Reviewed-on: https://code.wireshark.org/review/20611
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fd9a595
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 16 19:28:50 2017 +0100
-
-    ICMP: display C-Type when unknown object in extension
-    
-    Change-Id: I465341919675783999f4b131a7485ef2f6b8059f
-    Reviewed-on: https://code.wireshark.org/review/20583
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8271aa8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 16 20:31:24 2017 +0100
-
-    LLRP: Display unknown data when vendor is unknown...
-    
-    Bug:13473
-    Change-Id: Ia8ba177489be72c76b8b1168098de329ffcb8356
-    Reviewed-on: https://code.wireshark.org/review/20580
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2e76b58
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Mar 19 12:40:04 2017 +0100
-
-    Fix warning turning error:
-    /home/jmayer/work/wireshark/git/ui/qt/manage_interfaces_dialog.cpp:273:33: error: variable ‘link_type_name’ set but not used [-Werror=unused-but-set-variable]
-    By commenting out all lines using this variable for now.
-    
-    Change-Id: I8f074b24f86ee2063fc545cabd99d446b31a06ec
-    Reviewed-on: https://code.wireshark.org/review/20616
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 0297e37
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Fri Mar 17 07:59:05 2017 +0100
-
-    sharkd: support for expert tap.
-    
-    Change-Id: I7e5b27b5c25c01f015dd8b33c541cbda2c426726
-    Reviewed-on: https://code.wireshark.org/review/20578
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 0e244e0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 14:44:18 2017 +0100
-
-    TLS13: update CertificateRequest dissection for draft -19
-    
-    Removed supported_signature_algorithms and certificate_authorities
-    dissection for TLS 1.3. In preparation for certificate_authorities,
-    extract the certificate_authorities dissection.
-    
-    Change-Id: I58884b02744ac53f226d3a3e6c491219f58facc0
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20588
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a5bb470
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 13:39:13 2017 +0100
-
-    TLS13: update end_of_early_data to draft -19
-    
-    It changed from an alert to a handshake message.
-    
-    Change-Id: Ic24776e612a291153290543ba1ec8680d9d74264
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20586
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a16771f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 18 15:10:33 2017 +0100
-
-    umts_fp: Fix Dereference of null pointer found by Clang analyzer
-    
-    Access to field 'paging_indications' results in a dereference of a null pointer (loaded from variable 'umts_fp_conversation_info')
-    
-    Change-Id: Iacddb9b2e9b49f50178e82f48273757885331c2f
-    Reviewed-on: https://code.wireshark.org/review/20605
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a8e7e3c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 14:48:15 2017 +0100
-
-    TLS13: add certificate_authorities (47) dissection for draft -19
-    
-    Ping-Bug: 12779
-    Change-Id: Ic21869f73ffa1ac29b6a50102030eca85f533d37
-    Reviewed-on: https://code.wireshark.org/review/20589
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 870a8c4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 14:55:32 2017 +0100
-
-    TLS13: update pre_shared_key references to draft -19
-    
-    Also rename the fields for consistency.
-    
-    Change-Id: I49f4c9b1d308264e7849df92e1b1ac4a93a94766
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20590
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2337b7b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 15:46:14 2017 +0100
-
-    TLS13: update early_data for draft -19
-    
-    Added new max_early_data_size for NewSessionTicket.
-    
-    Change-Id: I6886415d03ffdce983b49649ad52ff0f897f2f77
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20591
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a126c80
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Mar 16 22:09:44 2017 +0100
-
-    ftypes: rename get_value to get_value_ptr
-    
-    This is in preparation for introducing a get_value union, similar to
-    set_value.
-    
-    Change-Id: Id0cf913a616e0314638f1531836c3136ed02631d
-    Reviewed-on: https://code.wireshark.org/review/20610
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 33cbeb6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 18 15:15:29 2017 +0100
-
-    CIP: Fix Assigned value is garbage or undefined found by Clang Analyzer
-    
-    Change-Id: Ie3d97ef22c6c8f69855f747f78b86d94f1091fa9
-    Reviewed-on: https://code.wireshark.org/review/20606
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2868b4a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 18 15:19:40 2017 +0100
-
-    cipsafety: Fix Dereference of null pointer found by Clang Analyzer
-    
-    Change-Id: Id5d9972f527e94164b61bf420ddf9c444d90235b
-    Reviewed-on: https://code.wireshark.org/review/20607
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a20fd0a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 18 14:52:15 2017 +0100
-
-    Makefile.am (dissectors): fix indent (use tabs)
-    
-    Change-Id: I2706f9d26731006216f111b65b718061503bd75e
-    Reviewed-on: https://code.wireshark.org/review/20603
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 88c0f52
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Mar 18 09:25:43 2017 -0400
-
-    MySQL: Make value_string_ext variables static
-    
-    Change-Id: I83322dc432e2f8acbaccdfca600ec891106ae815
-    Reviewed-on: https://code.wireshark.org/review/20602
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 68136e7
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Fri Mar 17 19:44:30 2017 +0200
-
-    FP/MAC: Cosmetic fixes
-    
-    Changing 2 things shown in the dissection tree:
-    1. For FP's E-DCH CRC: separating the bit string into nibbles.
-    2. For MAC: Adding a missing ')' in one of the strings
-    
-    Change-Id: Id13fa3676cc77c890cba4191c77fdbb5f9cb1c5e
-    Reviewed-on: https://code.wireshark.org/review/20597
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cea4115
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Thu Mar 16 13:55:17 2017 +0300
-
-    PROFINET: Support the new BlockVersion 1.1 of the record PDPortStatistic.
-    
-    PDPortStatistic with BlockVersionLow = 1 has 2 bytes CounterStatus while
-    PDPortStatistic with BlockVersionLow = 0 has 2 bytes Padding.
-    
-    Change-Id: I39783ad29993501249bfa7875760b505ded6a8e9
-    Reviewed-on: https://code.wireshark.org/review/20563
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c9efc5d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Mar 16 22:34:49 2017 -0400
-
-    packet-mysql.c: Some minor improvements
-    
-    1. Created a few value_string_ext.
-    2. Removed tree check for an expert info.
-    
-    Change-Id: Iadf55ecad1b1ddf249bfccff0d232883313fab83
-    Reviewed-on: https://code.wireshark.org/review/20599
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 693a61e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Mar 17 18:10:59 2017 +0100
-
-    S1AP: fix dissection of Reroute NAS Request message
-    
-    The S1 Message information element contains a full S1AP PDU, not
-    only the Initial UE Message payload
-    
-    Change-Id: Ibf416ea45efbd65b341ba3ce1cc5b02b0747f46b
-    Reviewed-on: https://code.wireshark.org/review/20595
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 1e40b65
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 17 18:02:15 2017 +0100
-
-    TLS13: add new supported_versions value for draft -19
-    
-    Change-Id: I2e5fd001bb8d4312c6267f530b66d6687865112e
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20596
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit c811288
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Wed Mar 15 21:09:16 2017 +0200
-
-    RNSAP: Call right RRC dissectors for payload.
-    
-    According to TS 25.423 both 'Uplink Signaling Transfer' and 'Downlink Signalling Transfer' carry CCCH messages.
-    Hence the RRC-UL-CCCH and RRC-DL-CCCH dissectors should be called for the 'L3 Information' fields in these messages (respectively)
-    
-    Change-Id: Ief2aab77d2851746e6374729eaf8a0a5b115d7d7
-    Reviewed-on: https://code.wireshark.org/review/20560
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0d5d859
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Mar 17 09:45:10 2017 +0100
-
-    [proto.h] Make proto_tree_add_split_bits_item_ret_val() usable from
-    plugins.
-    
-    Change-Id: Ibcfdb9a3a33b0f12bf1f4752654bde279776768a
-    Reviewed-on: https://code.wireshark.org/review/20579
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 795b459
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Mar 16 19:46:28 2017 +0100
-
-    Qt: Pluralize packet count in Size string
-    
-    Change-Id: Ifb23f4d558aa30df4ec436e42a4e23b23c2af110
-    Reviewed-on: https://code.wireshark.org/review/20566
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 144a4ac
-Author: Éric Piel <piel@delmic.com>
-Date:   Thu Mar 16 21:00:40 2017 -0400
-
-    Bugfix GIOP LocateRequest v1.0
-    
-    Bug: 13488
-    Change-Id: If4717dee805fdb3e910e2ea8ef16352294b305c6
-    Reviewed-on: https://code.wireshark.org/review/20575
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 77ee625
-Author: Philipp Hancke <fippo@andyet.net>
-Date:   Thu Mar 16 22:25:50 2017 +0100
-
-    packet-rtcp: enable REMB support
-    
-    enables support for the REMB dissector. This looks for the
-    magic string REMB (0x52454d42) before falling back to the current
-    behaviour.
-    
-    This is consistent with the guidance in
-      https://tools.ietf.org/html/draft-alvestrand-rmcat-remb-03#section-2.2
-    
-    Kudos to whoever wrote this, it just works.
-    
-    Change-Id: I8b7420d8cfdb1cfe1bed8c23d5103a2f5bac1937
-    Reviewed-on: https://code.wireshark.org/review/20573
-    Reviewed-by: Nils Ohlmeier <github@ohlmeier.org>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 663a360
-Author: Kenneth Soerensen <knnthsrnsn@gmail.com>
-Date:   Mon Feb 27 20:42:06 2017 +0100
-
-    ZigBee: Add attribute and command names from Prepayment used with GBCS
-    
-    The Great Britain Companion Specification specifies how energy meters
-    will communicate in the UK. This patch adds names for attributes and
-    commands from the Smart Energy Prepayment cluster that are used within
-    that specification.
-    
-    Bug: 13360
-    Change-Id: Iaf93dd5ef6769abba72c67d498c244ba0e15d1d6
-    Reviewed-on: https://code.wireshark.org/review/20552
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3eb7115
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Mar 16 21:24:27 2017 +0100
-
-    ZigBee ZCL IAS: fix dissection of ZoneStatus bitmask
-    
-    Bug: 13493
-    Change-Id: Ide076bce8032767477df804a97981009a0f64828
-    Reviewed-on: https://code.wireshark.org/review/20569
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c616675
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Mar 16 21:25:33 2017 +0100
-
-    ZigBee ZCL General: fix a typo
-    
-    ZigBee is a little endian protocol. Let's not use ENC_BIG_ENDIAN (even if for a 1 byte field it is harmless)
-    
-    Change-Id: I83f9d0e6c22af83ca0417afeb0244113b009abfe
-    Reviewed-on: https://code.wireshark.org/review/20570
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ea63360
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Mar 16 15:09:20 2017 +0100
-
-    [H248 3GPP] Add dissection of IP transport package.
-    
-    Change-Id: If0b7d4a46dd251816d9a093c394743838112824d
-    Reviewed-on: https://code.wireshark.org/review/20565
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a847884
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Mar 16 14:36:19 2017 +0100
-
-    Lua: Run protofield test with tree
-    
-    Only perform the protofield with a tree.
-    
-    Change-Id: I93caeb505d1138a57c846ea6c295e5a44d72023c
-    Reviewed-on: https://code.wireshark.org/review/20564
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-
-commit f7b784c
-Author: Robert Cragie <Robert.Cragie@arm.com>
-Date:   Wed Mar 15 08:28:15 2017 +0000
-
-    CoAP: Enhancements to improve conversation recording.
-    
-    Conversation recording now uses a hash map instead of a tree. URI
-    reconstruction for responses has also been added to assist Thread CoAP
-    decoding.
-    
-    Change-Id: I83dc0dc48534d5182cf37ba50dad67e1b095188a
-    Reviewed-on: https://code.wireshark.org/review/20553
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5e934d5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Feb 9 14:58:25 2017 -0500
-
-    proto_dlg.c: Convert GSList into wmem_tree
-    
-    Change-Id: Ice643361e91bded91547428d7fbb7cdff969664f
-    Reviewed-on: https://code.wireshark.org/review/20383
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c7f554c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Mar 16 09:02:27 2017 +0100
-
-    TGPP.xml: add a new enum value for Specific-Action AVP
-    
-    Change-Id: If45c6b196fc55ff7452f83e022b585cb9a816d53
-    Reviewed-on: https://code.wireshark.org/review/20562
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c10788c
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Mar 16 07:34:28 2017 +0100
-
-    g_assert on device.if_info.name to prevent undefined behaviour.
-    
-    Change-Id: Id730eb0e846e557c2f5a47139b480362a0b2a777
-    Reviewed-on: https://code.wireshark.org/review/20561
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 618ca46
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Mar 13 15:20:49 2017 -0400
-
-    Add support for verifying CIP Safety CRC values.
-    
-    Change-Id: I44f7ff6980f27b1a0d4199a91f9b217aec7e4652
-    Reviewed-on: https://code.wireshark.org/review/20557
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 05b61a2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Mar 15 10:30:41 2017 +0100
-
-    QUIC: Add TBKP (Token Binding Key Params) tag
-    
-    Change-Id: Ie7be38fc605d4c93f4e5488c9472909f6644e8c5
-    Reviewed-on: https://code.wireshark.org/review/20559
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 72e7482
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Mar 15 09:27:55 2017 +0100
-
-    dhcpv6: Add Captive Portal option (103)
-    
-    Change-Id: Ib56a1e9d1353d3245715bb0b5ba20672548bb9c1
-    Ping-Bug: 13483
-    Reviewed-on: https://code.wireshark.org/review/20555
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2210ef1
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Tue Mar 14 17:42:15 2017 +0300
-
-    PROFINET: Remove AMFilterData Block
-    
-    Since AMFilterData block is removed from PROFINET specification,
-    related parts are removed from dissector.
-    
-    Change-Id: I0f9f346fd409fc0cb78f4d7a8ca5869229d68bed
-    Reviewed-on: https://code.wireshark.org/review/20546
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4f8a0f2
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Mar 15 18:11:51 2017 +0100
-
-    [GTPv2] Don't try to dissect Target to Source Transparent Container it's
-    not so easy to determine it's content.
-    
-    Change-Id: I58d5caeb5b7264afa1ed28e84c0207610d5c13d2
-    Reviewed-on: https://code.wireshark.org/review/20558
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0837dd2
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Mar 15 09:21:18 2017 +0100
-
-    Lua: Add absolute time base values
-    
-    Add ABSOLUTE_TIME_* defines to the base table in init.lua for use
-    in ProtoField.absolute_time.
-    
-    Change-Id: I5c99eafdac97655d71fd4f3374294cd587afaf0a
-    Reviewed-on: https://code.wireshark.org/review/20543
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 0156f22
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Mar 15 09:30:37 2017 +0100
-
-    Lua: Merge sep and str tables into base
-    
-    Also add documentation strings to the base values.
-    
-    Change-Id: I00ac8f154fdd0382106ed27d740e16956520be97
-    Reviewed-on: https://code.wireshark.org/review/20554
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    (cherry picked from commit 16f70b9bb1faf48d985e21fcfa92d1934c2b50f5)
+    Reviewed-on: https://code.wireshark.org/review/22326
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit b8ede14
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Mar 15 09:37:03 2017 +0100
-
-    ftypes: move set_value_floating into the union
-    
-    Delete set_value_floating from struct _ftype_t, make it
-    part of the set_value union.
-    
-    Change-Id: Ic00e1c70488ddc4422c34657c62af7dc07db02d9
-    Reviewed-on: https://code.wireshark.org/review/20556
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f190a92
+commit 7e124c9
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Mar 13 11:10:08 2017 +0100
+Date:   Wed Jun 21 16:09:15 2017 -0400
 
-    Qt: Disable "Show hidden interfaces"
-    
-    Disable the "Show hidden interface" option until bug 13354 is fixed
-    because it's not possible to capture from hidden interfaces yet.
+    wsutil: Check return from ws_write
     
-    Ping-Bug: 13354
-    Change-Id: I428c2698485f0c7c2d9a8ab8408d7129af5fecf1
-    Reviewed-on: https://code.wireshark.org/review/20528
+    Change-Id: I73f65222dc23ebcb484f2598a12f43b284654420
+    Reviewed-on: https://code.wireshark.org/review/22321
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 6117ff496becee208336847a0cf460c15751ef6d)
+    Reviewed-on: https://code.wireshark.org/review/22322
 
-commit a75a21f
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Tue Mar 7 23:23:52 2017 +0200
-
-    Added Heuristic dissectors for the following UMTS FP channels:
-    DCH (Downlink and Uplink), FACH, RACH and PCH
-    Note that the existing heuristic dissection function does not correctly dissect any of the above and, frankly, I'm not sure which cases it covers.
-    
-    Change-Id: I832bfdccc9ae760a42a4c6537052ee2fee9262b4
-    Reviewed-on: https://code.wireshark.org/review/20439
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d448d77
-Author: Robert Cragie <Robert.Cragie@arm.com>
-Date:   Tue Mar 14 16:56:47 2017 +0000
-
-    ZigBee NWK: Add zero length beacon checks to avoid assert.
-    
-    Add a zero length check on beacon to avoid assert when beacon payload is
-    non existent.
-    
-    Change-Id: I016a97bda1590b8edc68db4f47e5c814e4eb8e0a
-    Reviewed-on: https://code.wireshark.org/review/20550
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5f4f62b
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Mar 14 23:00:36 2017 +0100
-
-    ftypes: move set_value_sinteger64 into the union
-    
-    Delete set_value_sinteger64 from struct _ftype_t, make it
-    part of the set_value union.
-    
-    Change-Id: I76668f0a6455c5d75c703cd4f440757601246bdb
-    Reviewed-on: https://code.wireshark.org/review/20551
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 42d410b
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Tue Mar 14 12:57:12 2017 -0400
-
-    CIP: Log more errors when expected data is missing
-    
-    1. CIP: Instead of exiting early in dissect_cip_generic_service_req/rsp when there is no data, keep processing so that a malformed packet warning will be displayed when there should be data.
-    2. CIP Safety: Remove copy-paste. Use load_cip_request_data
-    3. CIP Safety: Use more constants.
-    
-    Change-Id: Ic364201f1e587b43cf2bda407fb77b50032974ae
-    Reviewed-on: https://code.wireshark.org/review/20549
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 17953ce
+commit bd1dbaf
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Mar 14 10:30:20 2017 +0100
+Date:   Wed Jun 21 16:04:14 2017 -0400
 
-    Lua: Check for no table in ProtoField unit string
-    
-    When using base.UNIT_STRING in a ProtoField the table must be given.
+    wsutil: Ignore return from ws_write
     
-    Change-Id: Ie4beb93b5597a97a99939ef2c60a1ee7ece328f2
-    Reviewed-on: https://code.wireshark.org/review/20542
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: Idad4dd84538e3ccb7b258775704db8b6bd6c301e
+    Reviewed-on: https://code.wireshark.org/review/22319
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 6e0bc30a95ae7759c45ce1f39360259570087b5d)
+    Reviewed-on: https://code.wireshark.org/review/22320
 
-commit b72d866
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Mar 14 17:43:20 2017 +0100
+commit 4138697
+Author: Anders <anders.broman@ericsson.com>
+Date:   Wed Jun 21 18:37:25 2017 +0200
 
-    [GSM-A-BSSMAP] Update MSG content according to 3GPP TS 48.008 V13.3.0
-    (2016-09)
-    All IEs are not dissected.
+    [sipstat] Update the Response Codes table.
     
-    Change-Id: If215b85ba1f786d9b4cb518c7525aec58d000f8e
-    Reviewed-on: https://code.wireshark.org/review/20548
+    Change-Id: Iae6e49963ea94ba8a174342e25d2ca5494001e28
+    Reviewed-on: https://code.wireshark.org/review/22310
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 536451a8dea2655a1d31006125cb283f49cfb859)
+    Reviewed-on: https://code.wireshark.org/review/22318
 
-commit da786c2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 9 19:10:39 2017 +0100
-
-    ieee80211-radio: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I7f5f25b0afd30612d9e20e52585c7cad70bc1f59
-    Reviewed-on: https://code.wireshark.org/review/20468
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 43a08c9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 9 19:24:09 2017 +0100
-
-    v150fw: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I04e781b12a2b89999bf628ceaa66b8527dd591aa
-    Reviewed-on: https://code.wireshark.org/review/20471
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 096dd79
-Author: Robert Cragie <Robert.Cragie@arm.com>
-Date:   Tue Mar 14 11:27:04 2017 +0000
-
-    DTLS: Cookie formatting fix for HVR
-    
-    Cookie format for HelloVerifyRequest inconsistent with that in
-    ClientHello. Changed to be consistent.
-    
-    Change-Id: I79809ebc4bd4a1c5b43b44a21f58ad5b5d5a1bcf
-    Reviewed-on: https://code.wireshark.org/review/20544
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c899dd5
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Mar 14 10:33:29 2017 +0100
-
-    Lua: Improve base checking for signed integer
-    
-    Check base value for signed integer before unsigned to avoid a case
-    where the valid bases for a unsigned integer is presented in a error
-    message when a signed type is used.
-    
-    Change-Id: Idfb87597779652e32adceacad220d748afda5e85
-    Reviewed-on: https://code.wireshark.org/review/20541
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d89bb12
+commit 3178664
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Mar 14 10:17:09 2017 +0100
+Date:   Wed Jun 21 10:43:21 2017 -0400
 
-    Lua: Layout cleanup in init.lua
+    Qt: Write a list of profile files at startup
     
-    Remove double start-of-comments and some leading spaces.
+    This file will contain all personal config files which will be
+    fetched from a profile.
     
-    Change-Id: I1c5ba49990076cc2d32da2d0a3bb0f54ec31e823
-    Reviewed-on: https://code.wireshark.org/review/20540
+    Change-Id: I430ca84ccefc17f0e21c8efb93a92602ab8d5661
+    Reviewed-on: https://code.wireshark.org/review/22303
     Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 472e519
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Mar 14 13:57:46 2017 +0100
-
-    [GSM-A-BSSMAP] Correct and enhance dissection of HANDOVER COMPLETE
-    
-    Change-Id: Ie65fc6c9f0cd2291d7e1421fbbedff097c7e09df
-    Reviewed-on: https://code.wireshark.org/review/20545
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ba49a85
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Dec 20 09:44:16 2016 +0100
-
-    Lua: Add some ProtoField tests.
-    
-    Test usage of base.UNIT_STRING.
-    
-    Change-Id: I9c97b58b3cc6db65713e83609900880e157237f2
-    Reviewed-on: https://code.wireshark.org/review/19357
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    (cherry picked from commit a14ef98540af979f0dbc39c728f9fc31a687a16f)
+    Reviewed-on: https://code.wireshark.org/review/22313
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 20d7669
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Mon Mar 13 13:53:30 2017 +0300
-
-    PROFINET: Fix the Asset Management Record Dissection
-    
-    Dissecting AMR doesn't work properly when AM_Location.Structure don't equal to 2.
-    
-    Bug: 13480
-    Change-Id: Ie116e10f6e88e240b2f1ae4e1eab27b24350e55a
-    Reviewed-on: https://code.wireshark.org/review/20529
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Birol Capa <birol.capa@siemens.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b11d4e7
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Mar 13 18:46:48 2017 +0100
-
-    ftypes: move set_value_uinteger64 into the union
-    
-    Delete set_value_uinteger64 from struct _ftype_t, make it
-    part of the set_value union.
-    
-    Change-Id: I12407b7336282daa60fe6e0e742d65e205dc84fd
-    Reviewed-on: https://code.wireshark.org/review/20539
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f94509c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 13 15:12:50 2017 +0100
-
-    bootp: Add Captive-Portal option (160)
-    
-    Thanks to David Bird for pcap
-    
-    Bug: 13483
-    Change-Id: Id53eadd5faa7599c3864840aa80a8770099baac3
-    Reviewed-on: https://code.wireshark.org/review/20531
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a6f7e16
-Author: Jakub Pawlowski <jpawlowski@google.com>
-Date:   Mon Mar 13 13:20:23 2017 -0700
-
-    Bluetooth: "dublicates" -> "duplicates"
-    
-    Change-Id: Ie52c6ef60c911d1e119c5b69de6f64a88b3433f3
-    Reviewed-on: https://code.wireshark.org/review/20534
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 98558fd
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Mar 13 17:02:23 2017 +0100
-
-    Fix buffer overrun in try_bytesprefix_to_str
-    
-    bytes_string list contains a list of prefixes to match, not the other
-    way round (matching prefixes in the list).
-    
-    Bug: 13479
-    Change-Id: Ie625dc5db30bd55158d688a0101f35d0bf6906af
-    Fixes: v2.3.0rc0-2644-g540b555729 ("Introduce "bytes_string" type, similar to "value_string"")
-    Reviewed-on: https://code.wireshark.org/review/20532
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f1d0533
+commit 7740d1d
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Mar 13 19:10:51 2017 +0100
+Date:   Wed Jun 21 10:48:22 2017 -0400
 
-    Lua: Base must be base.DEC or base.UNIT_STRING for signed integer
+    wsutil: Free files in reset_default_profile
     
-    Reject ProtoField signed integer types with base other than base.DEC
-    and base.UNIT_STRING.  Update documentation for this.
+    This plugs a memory leak.
     
-    Bug: 13484
-    Change-Id: I55a636c89704e96a598f1f185faabd8ad13d96f1
-    Reviewed-on: https://code.wireshark.org/review/20533
+    Change-Id: Ic989a89353d10de6f8f07df6a734d2b912facb7e
+    Reviewed-on: https://code.wireshark.org/review/22305
     Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 39fd595
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 11 16:33:58 2017 +0100
-
-    tap-iostat (cli): fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7
-    
-    Change-Id: Idd8f4e2175d6575beecaccf2ee018457a25fd225
-    Reviewed-on: https://code.wireshark.org/review/20493
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a6d6908
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 12 19:49:42 2017 +0100
-
-    ftypes: move set_value_sinteger into the union
-    
-    Delete set_value_sinteger from struct _ftype_t, make it part of the
-    set_value union.
-    
-    Change-Id: I084c4c9beba9978b538d359ebaac21391ebd7f82
-    Reviewed-on: https://code.wireshark.org/review/20523
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5d21753
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Mar 13 08:24:35 2017 +0100
-
-    Qt: Use em dash when hide the "Show" checkbox
-    
-    Match the style used in "Capture Interfaces" table when elements
-    are N/A by using the em dash.  This item should also be disabled
-    using QPalette::Disabled to get a even better match.
-    
-    Change-Id: I127ce309318df2c36515996df8584d1e4ce690c0
-    Reviewed-on: https://code.wireshark.org/review/20527
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    (cherry picked from commit 99c3c6d9086a49bd88f8b99db641a4ba2b5d4c0a)
+    Reviewed-on: https://code.wireshark.org/review/22312
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 9e82cff
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 12 19:15:19 2017 +0100
-
-    ftypes: move set_value_uinteger into the union
-    
-    Delete set_value_uinteger from struct _ftype_t, make it part of the
-    set_value union.
-    
-    Change-Id: I26de15be8ea0ede76236a8f8a4958bfd97ad9d52
-    Reviewed-on: https://code.wireshark.org/review/20521
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c70927c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 11 15:19:16 2017 +0100
-
-    erf: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I1634b0a7b0fa35ea59ef2fc7fbe0b81f77aad978
-    Reviewed-on: https://code.wireshark.org/review/20508
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit eab8050
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 9 18:53:27 2017 +0100
-
-    dis: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I8d28637d5262fd0e06d80607adb6f88b3d909a9e
-    Reviewed-on: https://code.wireshark.org/review/20465
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 75cbd38
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 20:54:18 2017 +0100
-
-    cigi: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I1f755c876150f204cce95932698c3f4e96fd465d
-    Reviewed-on: https://code.wireshark.org/review/20426
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7197e9c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 9 19:06:27 2017 +0100
-
-    ieee80211-prism: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: Ic3c4a4347ab501c1ee22a25dd3dd41609d28418f
-    Reviewed-on: https://code.wireshark.org/review/20467
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7f2a39f
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Mar 12 23:10:41 2017 +0100
-
-    rpcap URLs *require* the :<port> argument for remote capture - update manpage.
-    
-    Change-Id: Iabae39347bc0058d106a9b00d81629899bc93249
-    Reviewed-on: https://code.wireshark.org/review/20526
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 16c8bff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Mar 12 11:47:44 2017 -0700
-
-    Catch read errors and zero-length records, as opposed to short reads/EOF.
-    
-    Also, if we return WTAP_OPEN_ERROR from an open routine after we've set
-    our close routine, that routine is called, which frees up our private
-    data structures; don't free them ourselves before returning
-    WTAP_OPEN_ERROR.
-    
-    Change-Id: I03eebe1a1677e2161fdacec8de14668093cf03a3
-    Reviewed-on: https://code.wireshark.org/review/20522
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 10798ef
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 12 19:21:24 2017 +0100
-
-    ftypes (trivial): fix two comments
-    
-    The comments give the name of the struct _ftype_t component that is
-    initialized. They are wrong in two places. This confuses my script that
-    deletes the initializers for the components which were moved into the
-    union.
-    
-    Change-Id: I876fb29305a94b241df07c97064f31378752b559
-    Reviewed-on: https://code.wireshark.org/review/20520
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 41b4f0b
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Mon Mar 6 14:39:53 2017 +0300
-
-    PROFINET: Extend System Redundancy Support
-    
-    A special ARType for System redundancy IOCARSR (0x0020) used to indicate
-    SR during the IODConnectReq for Advanced Startup ARs (StartupMode:=1).
-    With this change, the ARUUID is subdivided into several parts.
-    APDUStatus dissection is affected by Primary/Backup switchover.
-    
-    Bug: 13456
-    Change-Id: I0504ad2f4d15c491b0142c6d24bb8b849a929ba2
-    Reviewed-on: https://code.wireshark.org/review/20422
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit e1d5147
+commit 5503bc6
 Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 10 04:25:43 2017 +0100
-
-    Qt: hide the "Show" checkbox for default devices
-    
-    When marking a previously hidden device as default (e.g. via wireshark
-    -ocapture.device:eth0), an unchecked checkbox is visible. This is just
-    confusing, just hide the checkbox completely.
-    
-    Change-Id: I3f85cfcb659c351c72237dced52f0684733188c4
-    Reviewed-on: https://code.wireshark.org/review/20478
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 845f82e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 12 11:58:54 2017 -0400
-
-    netscaler: Sanity check record size
-    
-    Bug: 13478
-    Change-Id: I6be2972979ff7cabf27e70d236c581d539d6ddac
-    Reviewed-on: https://code.wireshark.org/review/20515
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8e1befc
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 12 11:26:54 2017 -0400
-
-    packet-wbxml.c: Fix potential infinite loops
-    
-    Bug: 13477
-    Change-Id: Ib6c440bbcbb5011e8f23fb87418acd87bb38c272
-    Reviewed-on: https://code.wireshark.org/review/20513
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5f789e3
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Mar 12 08:11:50 2017 -0700
-
-    [Automatic update for 2017-03-12]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I5718e7c7df8061f81eb01973f504ebbb0cfe1e44
-    Reviewed-on: https://code.wireshark.org/review/20511
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 0332328
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 9 19:14:39 2017 +0100
-
-    llrp: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I2bc9b5b50b8698c27f2a56b869de318fa98bf7b1
-    Reviewed-on: https://code.wireshark.org/review/20469
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 39f6687
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 12 10:58:08 2017 +0100
-
-    ieee80211: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I53bca9bc50d18a88cc6c5c5a7ae93bdd1b772903
-    Reviewed-on: https://code.wireshark.org/review/20504
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a8b6284
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 11 16:44:20 2017 +0100
-
-    tfshark: fix this ‘if’ clause does not guard... [-Wmisleading-indentation]
-    
-    Change-Id: If66223021d074e6cb3c7bde2af7cca9c72acb8c6
-    Reviewed-on: https://code.wireshark.org/review/20507
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0501699
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sun Mar 12 09:23:17 2017 +0100
-
-    sharkd: fix tap memleaks & support for links to frame, url & cleanup
-    
-    Change-Id: I08af04c7882802035344d0051055be05967fb089
-    Reviewed-on: https://code.wireshark.org/review/20502
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c80bfec
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 12 10:54:57 2017 +0100
-
-    ieee80211: fix declaration of 'ieee80211_tag_...' shadows a global declaration
-    
-    Make OSX buildbot happy
-    
-    Change-Id: I1a376fba3d7f4b24741839697ed0f6c55c9ac77d
-    Reviewed-on: https://code.wireshark.org/review/20503
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e4b90a9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 9 19:20:37 2017 +0100
-
-    radius: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I654ead4d834af90e14568a54c7a914a3774c05bc
-    Reviewed-on: https://code.wireshark.org/review/20470
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 6d584aa
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 9 18:55:59 2017 +0100
-
-    gmr_rach: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I3313ea62fd86b0a7a3ae6dfbc40bd6e0841316a2
-    Reviewed-on: https://code.wireshark.org/review/20466
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 3baae12
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 9 18:49:25 2017 +0100
-
-    dcerpc (netlogon): fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: I96b8a8c5157dc89785421282f2c509c100fb0504
-    Reviewed-on: https://code.wireshark.org/review/20464
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 135557f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 20:52:16 2017 +0100
-
-    catapult-dct2000: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    Change-Id: If3afda940b40500e067467b341f192bbaef173bc
-    Reviewed-on: https://code.wireshark.org/review/20425
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c8020c7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 6 21:05:06 2017 +0100
-
-    ansi_a: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
-    
-    All users of the ELEM_OPT_TLV and ELEM_MAND_TV macros pass an empty string ("")
-    for the elem_name_addition parameter, so it can never be NULL. The Coverity
-    warning was about a superfluous check (elem_name_addition[0]=='\0'). All of
-    these checks are superfluous anyway since both branches yield an empty string.
-    
-    Change-Id: I28c994fd5e10c04f99c8d77e9aee18afd4a26412
-    Reviewed-on: https://code.wireshark.org/review/20427
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ae39d9a
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Mar 12 12:20:23 2017 +0100
-
-    tshark and tfshark require -2 when using -R. Document this.
-    
-    Change-Id: I3ef802ed1163512e20da10eaa8da3239107b6fae
-    Reviewed-on: https://code.wireshark.org/review/20509
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 3d4822d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 12 11:04:49 2017 +0100
-
-    afn(.h) fix indent
-    
-    use 4 spaces like afn.c
-    
-    Change-Id: Iadc6d6e3b2919c7014eccc2890966eadd7d7bee7
-    Reviewed-on: https://code.wireshark.org/review/20506
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0d918f2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 12 11:01:27 2017 +0100
-
-    afn(.c): fix indent (align field)
-    
-    Change-Id: Ie2cc66b8ba26278490134974662acd554b8931f9
-    Reviewed-on: https://code.wireshark.org/review/20505
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9ea5b08
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Sat Mar 11 22:16:53 2017 -0500
-
-    BGP: Update Transitive Four-Octet AS-Specific Extended Community Sub-Types and remove duplicate marcos.
-    
-    Change-Id: I87454ea95bc64a39e4e60ba374e9cafb574e744c
-    Reviewed-on: https://code.wireshark.org/review/20501
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3c42737
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 6 08:16:24 2017 +0100
-
-    802.11: Use proto_tree_add_bitmask
-    
-    Change-Id: If46ccea1c58448d2dacad07fb3171e423babe59f
-    Reviewed-on: https://code.wireshark.org/review/19562
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b033535
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Mar 10 13:03:02 2017 +0100
-
-    Qt: Give discard button focus (but not as default)
-    
-    Set focus to the discard button in the "Unsaved packet" and
-    "Unsaved comments" dialogs to enable spacebar for discard and
-    enter for save.
-    
-    Bug: 13363
-    Change-Id: I576b02c4e3f0964aef56a0f1c06ed57c6ba683bf
-    Reviewed-on: https://code.wireshark.org/review/20485
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit f8abec1
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Mar 11 23:16:11 2017 +0100
-
-    bgp: Avoid divide by zero
-    
-    Bug: 13476
-    Change-Id: I399df46c9d5f6d0d464ecc9cf8d44eddf709f7dc
-    Reviewed-on: https://code.wireshark.org/review/20499
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c624970
-Author: Michal Kubecek <mkubecek@suse.cz>
-Date:   Fri Mar 10 08:59:02 2017 +0100
-
-    netlink: support legacy dump request messages
-    
-    Some legacy tools, including iproute2 < 3.9, issue shorter RTM_GETLINK
-    and RTM_GETADDR dump queries which only contain struct rtgenmsg rather
-    than struct ifinfomsg. As noted in kernel comment in rtnl_dump_ifinfo(),
-    these legacy requests will be (even with attributes) always shorter than
-    struct ifinfomsg so that they are easy to detect.
-    
-    Similar problem can be observed with tools using nl_rtgen_request()
-    function from libnl3; this also affects other RTM_GET* types.
-    
-    If such legacy message is detected by length shorter than expected data
-    structure, parse it as this legacy version with (1-byte) struct
-    rtgenmsg so that it's shown as intended rather than as malformed.
-    
-    Change-Id: I53b6bff9e44cd2359d7cd313b6f0724f63f0e74d
-    Reviewed-on: https://code.wireshark.org/review/20461
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michal Kubeček <mkubecek@suse.cz>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 21 10:58:28 2017 -0400
 
-commit bccc200
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Mar 11 12:27:14 2017 +0100
-
-    sharkd: support for export objects, following stream.
+    Qt: display newlines in capture file comments
     
-    Change-Id: I364cb200e537ae07cbe831d8be1f217c5a15ee09
-    Reviewed-on: https://code.wireshark.org/review/20492
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 7d28e99
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Fri Mar 10 14:11:23 2017 -0500
-
-    Updated Address Family Numbers with latest (Last Updated 2016-08-26) IANA table.
+    Due to the use of HTML, whitespace (including newline) are shown as
+    single horizontal space. Add a special case for newlines.
     
-    Change-Id: I4286a249ca9603732f06e2715c1804a201c105e9
-    Reviewed-on: https://code.wireshark.org/review/20489
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ef05fa5
-Author: Martin Vit <martin@voipmonitor.org>
-Date:   Mon Mar 6 17:14:18 2017 +0100
-
-    T30: fix parsing broken since ge063924
-    
-    Bug: 1918
-    Change-Id: I276e5ad74caaf509d220f97e111d2aedc7caef17
-    Reviewed-on: https://code.wireshark.org/review/20423
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ecd598a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 11 16:38:46 2017 +0100
-
-    unistim (plugin): fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7
-    
-    Change-Id: Id928c9f4506b3f88016d77e3e79a4ecf78d52e93
-    Reviewed-on: https://code.wireshark.org/review/20494
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 77aa674
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 11 16:40:33 2017 +0100
-
-    oids: fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7
-    
-    Change-Id: I8f84414be693ea8ebcfef003480e9ee05de94ea0
-    Reviewed-on: https://code.wireshark.org/review/20495
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 02ea90f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 11 16:41:00 2017 +0100
-
-    stats_tree: fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7
-    
-    Change-Id: Idd5ab938b95d515cdf8b2a8568456f44b3dd85ac
-    Reviewed-on: https://code.wireshark.org/review/20496
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5b98798
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Fri Mar 10 13:49:29 2017 -0500
-
-    BGP: Fix the issue that SAFI 72 (BGP-LS-VPN) was not decoded.
-    
-    Change-Id: I2aef41458c89975dddea4d8bb6355bb7aabd1cad
-    Reviewed-on: https://code.wireshark.org/review/20488
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7119b66
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Mar 10 12:49:54 2017 +0100
-
-    [LDAP] Add a couple of OID translations.
-    
-    Change-Id: I3d3435a9ac5d2a177b0ced6085eabe4feb67ba7b
-    Reviewed-on: https://code.wireshark.org/review/20484
+    Bug: 13819
+    Change-Id: Iefa2af7d2948ed18a3b7f8f4ee8cb90100bf3460
+    Reviewed-on: https://code.wireshark.org/review/22306
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit eb19d35
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Mar 10 14:54:21 2017 +0100
-
-    Add decoding of EDCA IE
-    
-    Bug: 13472
-    Change-Id: Iff8b3e532680ada668581263476b6557518acc50
-    Reviewed-on: https://code.wireshark.org/review/20486
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit d91cd68
-Author: Volodymyr Khomenko <Volodymyr_Khomenko@DellTeam.com>
-Date:   Thu Mar 9 22:52:48 2017 +0200
-
-    SMB3 SVHDX_OPEN_DEVICE_CONTEXT_V2 implementation
-    
-    1. Extended SMB3 dissector of OPEN_DEVICE_CONTEXT to hanlde V2 structure
-    See https://msdn.microsoft.com/en-us/library/mt240852.aspx
-    
-    2. Rejected restriction for request-only processing
-    (now this context MUST be handled in response packets too, both V1 and v2).
-    See https://msdn.microsoft.com/en-us/library/dn366831.aspx
-    and https://msdn.microsoft.com/en-us/library/dn409028.aspx#Appendix_A_10
-    
-    Change-Id: I7f200932d07eb61c6465d5792a550332ac769be5
-    Reviewed-on: https://code.wireshark.org/review/20473
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c2e74c5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 9 20:20:20 2017 -0800
-
-    Don't cast to a too-large size.
-    
-    The maximum record length is 255*128 + 127 = 32767; that fits in a
-    guint32, which is large enough to support the biggest packet we'd ever
-    support without stretching several size values to 64 bits.
-    
-    It's not a size of an object in memory, so it doesn't have to be a
-    size_t, and a size_t could be too large to fit in the record sizes we're
-    using.
-    
-    Just cast to guint32.
-    
-    Change-Id: Ie664fda3ce9945893fd992bbb9a81a5d632a3fcb
-    Reviewed-on: https://code.wireshark.org/review/20479
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fe285c6
-Author: erikdejong <erikdejong@gmail.com>
-Date:   Mon Mar 6 22:01:39 2017 +0100
-
-    Replace aes.c and des.c by Libgcrypt
-    
-    Follow-up of https://code.wireshark.org/review/20095
-    
-    Rewritten functions:
-    - crypt_des_ecb
-    
-    crypt_des_ecb verified against previous crypt_des_ecb implementation with
-    4294967295 random keys and input buffers from /dev/random as I cannot find a
-    suitable pcap which uses DES
-    
-    Change-Id: I21ec2572451e0ded4299ffadd8dd687817bc6318
-    Reviewed-on: https://code.wireshark.org/review/20429
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 9e0251f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Mar 8 23:05:14 2017 +0100
-
-    io_graph_item: fix false positive array subscript is above array bounds [-Werror=array-bounds]
-    
-    Change-Id: I14fc19f131782a9c85104ca2189b9452079d0013
-    Reviewed-on: https://code.wireshark.org/review/20454
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3a63f8d
-Author: Anil Kumar <anilkumar911@gmail.com>
-Date:   Wed Mar 8 12:15:22 2017 +0530
-
-    nstrace: fix size of vmnames
-    
-    When vmnames are included in the header of a netscaler packet trace,
-    number of bytes equal to the size of vmnames is omitted from the packet,
-    by the dissector.
-    
-    
-    Bug: 13459
-    Change-Id: I0f907e9c2e08c1cbebd47f7e50d8284a6aaade59
-    Reviewed-on: https://code.wireshark.org/review/20446
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ee7296d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Mar 5 01:56:17 2017 +0100
-
-    TLS: append Log name for CT Log IDs
-    
-    Show something like "Signed Certificate Timestamp (Google 'Pilot' Log)"
-    if the Log ID is recognized, or "... (Unknown Log)" otherwise.
-    
-    Bug: 13372
-    Change-Id: I1cd373f110d5beb63ee89fb85831ab72cafe03d0
-    Reviewed-on: https://code.wireshark.org/review/20387
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 8b11bc7
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Mar 9 23:05:18 2017 +0100
-
-    ftypes: move set_value_protocol into the union
-    
-    Delete set_value_protocol from struct _ftype_t, make it part of the
-    set_value union.
-    
-    Change-Id: Iae55388b8a2c965944028499619282c3232c31f3
-    Reviewed-on: https://code.wireshark.org/review/20475
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3bcda66
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Mar 9 22:56:07 2017 +0100
-
-    ftypes: move set_value_string into the union
-    
-    Delete set_value_string from struct _ftype_t, make it part of the
-    set_value union.
-    
-    Change-Id: Ia3a57245330ed0d158c8c3e4552ec5d80752fe0f
-    Reviewed-on: https://code.wireshark.org/review/20474
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e003908
-Author: Erik de Jong <erikdejong@gmail.com>
-Date:   Thu Mar 9 14:33:29 2017 +0100
-
-    RTP streams dialog: Fix find reverse button
-    
-    Fix find reverse button
-    
-    Bug: 13462
-    Change-Id: I6e19fa38cd333285c9ca3cf01e4c06ff8de56b2a
-    Reviewed-on: https://code.wireshark.org/review/20462
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit abcaf3e
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Mar 7 22:43:04 2017 +0100
-
-    ftypes: move set_value_time into the union
-    
-    Delete set_value_time from struct _ftype_t, make it part of the
-    set_value union.
-    
-    Change-Id: Ieee3b083d52afdd608e31e8ca75b50016fec8a69
-    Reviewed-on: https://code.wireshark.org/review/20442
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ae9ccbe
-Author: Radhashyam Behera <radhashyambehera@gmail.com>
-Date:   Tue Feb 21 19:06:48 2017 +0530
-
-    IEEE80211: Support of MU Exclusive Beamforming Report decoding under VHT Compressed Beamforming.
-    
-    Bug: 13343
-    Change-Id: Ia69b2c074adb1c269c93db40ad5004a261560c88
-    Reviewed-on: https://code.wireshark.org/review/20224
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6c00eba
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Mar 9 19:48:48 2017 +0100
-
-    Add another instance of capture_opts_log when more information is known.
-    
-    Make a url in a comment more readable.
-    
-    Change-Id: I9a34e442434cc50c6d631622d680c12049c7dbf8
-    Reviewed-on: https://code.wireshark.org/review/20472
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 0ac07be
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Mar 8 06:00:51 2017 +0100
-
-    snort-config: fix comparison between pointer and zero character constant [-Werror=pointer-compare]
-    
-    Change-Id: I6afeac8606fda59c833933628f53d2eb73e2909c
-    Reviewed-on: https://code.wireshark.org/review/20445
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit e781fdd
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Mar 9 09:46:08 2017 +0100
-
-    Qt: Fix heap-use-after-free when deleting IO graph
-    
-    Deleting a IO graph item while editing a field will use the IOGraph
-    object so ensure we delete in correct order to avoid heap-use-after-free.
-    
-    Bug: 13234
-    Change-Id: I6d0de21684f842fbd67c9b38fc6b75b81aec5518
-    Reviewed-on: https://code.wireshark.org/review/20456
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit eb04606
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Mar 8 21:01:12 2017 +0100
-
-    imap: Give correct lineend to get_token_len()
-    
-    The return value from get_token_len() is the token length, but the
-    returned next_token can have a offset more than token length because
-    it also skip trailing blanks.  Ensure we always give correct lineend.
-    
-    Bug: 13466
-    Change-Id: I88a11b9bce02999fcf87c0d7542e56fa90aae5a0
-    Reviewed-on: https://code.wireshark.org/review/20451
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 528a3d3
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Mar 9 08:34:54 2017 +0100
-
-    proto: Check for empty protocol->fields
-    
-    In proto_get_first_protocol_field() we must check for an empty
-    protocol->fields because Lua scripts may have protocols without
-    fields and g_ptr_array_index() does not perform bounds checking
-    on the given index.
-    
-    Bug: 13223
-    Change-Id: Ib2f6286d0799541243450348dcf345a965b2825c
-    Reviewed-on: https://code.wireshark.org/review/20455
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 540b555
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Mar 4 01:40:51 2017 +0100
-
-    Introduce "bytes_string" type, similar to "value_string"
-    
-    In order to map arbitrary byte buffers to strings, introduce a new
-    "bytes_string" type. Since "bytes_to_str" is already used for other
-    purposes, name the generic function "bytesval_to_str" instead similar to
-    the name( "val_to_str").
-    
-    Accept "size_t" as length parameter since this is what is returned by
-    the "sizeof" operator. Do not add a "try_bytesval_to_str_idx" variant
-    since this pattern is not needed for now. Add a variant to match the
-    prefix since this is currently expected by the ISAKMP dissector.
-    
-    Change-Id: I6d790325e85d9fb1384330f28a8c36e2057fdf30
-    Reviewed-on: https://code.wireshark.org/review/20386
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    (cherry picked from commit b44ad2a0fa58e4a5acb4293d047993b3aea1f532)
+    Reviewed-on: https://code.wireshark.org/review/22311
     Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 2b06c17
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 17:54:22 2017 +0100
-
-    ubertooth: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: Iec4253ad488f51169ce4cc295b5f084ba4aa4122
-    Reviewed-on: https://code.wireshark.org/review/20412
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-
-commit d7fc8ab
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Mar 7 22:35:45 2017 +0100
-
-    ftypes: move set_value_guid into the union
-    
-    Delete set_value_guid from struct _ftype_t, make it part of the
-    set_value union.
-    
-    Change-Id: I3a04ff6b1ab179063ef77a3c475809df0bde5c68
-    Reviewed-on: https://code.wireshark.org/review/20441
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit da78a59
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Mar 7 22:16:02 2017 +0100
-
-    ftypes: move set_value_bytes into the union
-    
-    Delete set_value_bytes from struct _ftype_t, make it part of the
-    set_value union.
-    
-    Change-Id: I3ee6a9f68b269ee083794947816e13ea6c1b9d29
-    Reviewed-on: https://code.wireshark.org/review/20440
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit af8361a
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Mar 7 22:06:13 2017 +0100
-
-    http: Check for valid tcpinfo pointer
-    
-    In dissect_http_tcp() the data pointer may be NULL so ensure
-    we check for this before dereferencing it.
-    
-    Bug: 13457
-    Change-Id: I84f4a0e3b416a2829998f20fe59da8770a34e564
-    Reviewed-on: https://code.wireshark.org/review/20438
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit c293842
-Author: Gabriel Ganne <gabriel.ganne@enea.com>
-Date:   Wed Mar 8 08:40:30 2017 +0100
-
-    nsh: remove duplicate ethertype entry
-    
-    Change-Id: I3b177eb86a4058a437f9fb0617b5ae5b3a513af2
-    Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
-    Reviewed-on: https://code.wireshark.org/review/20447
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f4c71c3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Mar 8 09:16:16 2017 +0100
-
-    [SIP] Start dissecting generic parameters.
-    
-    Change-Id: I545f8646e6e4cba74c48b58e0fb6ea6ea5338625
-    Reviewed-on: https://code.wireshark.org/review/20448
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ca4f37d
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Mar 7 16:57:12 2017 +0100
-
-    [SIP] Start dissecting generic parameters.
-    
-    Change-Id: I5d5c2f8cfc78c4557a9fcd61a47b39e7c8b50cad
-    Reviewed-on: https://code.wireshark.org/review/20437
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1ac358c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 7 14:08:53 2017 -0800
-
-    Don't close the pcap_t in get_data_link_types().
-    
-    1) Its caller closes it, and closing a closed pcap_t can cause Bad
-    Things to happen.
-    
-    2) We're trying to get an error string from it after we're closing it,
-    which won't work well, either.
-    
-    While we're at it, don't use pcap_statustostr() if we don't have it (we
-    have it iff we have pcap_create()).
-    
-    Change-Id: Ieded1e3ae78aea4e0970cf582e780c2846fe9dd5
-    Reviewed-on: https://code.wireshark.org/review/20443
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 25015a0
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Mar 4 16:15:54 2017 +0100
-
-    ftypes: create a set_value union
-    
-    struct _ftype_t contains a number of pointers to set_value_...()
-    functions. For each pre-defined ftype_t, only one of these pointers
-    is != NULL.
-    
-    As the comment already says, we should move these functions into a
-    union. ftenum_t ftype will be used for selecting the correct function
-    pointer from the union.
-    
-    Create a set_value union and move the FvalueSetByteArrayFunc pointer
-    into the union. Update fvalue_set_byte_array() accordingly. Check
-    that the fvalue_t parameter is of the correct type.
-    
-    Change-Id: I6568d8f47108311289c0cd425f28ea8b38046141
-    Reviewed-on: https://code.wireshark.org/review/20433
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 4caa64f
-Author: Gabriel Ganne <gabriel.ganne@qosmos.com>
-Date:   Fri Jul 8 14:11:21 2016 +0200
-
-    nsh: add protocol dissection over ethernet
-    
-    Change-Id: I4cbfb5d4371fa4401f591d5e52a603ae1256c23c
-    Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
-    Reviewed-on: https://code.wireshark.org/review/20435
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+commit 6001fc1
+Author: Vasil Velichkov <vvvelichkov@gmail.com>
+Date:   Tue Jun 20 21:30:42 2017 +0300
 
-commit 8a33207
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Mar 7 14:30:06 2017 +0100
-
-    [SIP] Handle P-Access-Network-Info Headers parameter without '='.
+    packet-xml: Add 3GPP, ETSI, GSMA and OMA media types
     
-    Change-Id: I6cb5bc6c3cd612b4770d578edaf1c9a877659d8e
-    Reviewed-on: https://code.wireshark.org/review/20436
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5dcd112
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 17:31:59 2017 +0100
-
-    rtpproxy: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
+    Not all media types are IANA registered
+    https://www.iana.org/assignments/media-types/media-types.xhtml
+    http://www.gsma.com/newsroom/wp-content/uploads/IR.95-v2.0-3.docx
+    http://www.openmobilealliance.org/release/XDM/V2_2_1-20170124-A/OMA-ERELD-XDM-V2_2_1-20170124-A.pdf
     
-    Change-Id: Ide19cb51d5ce0a9d0a0634ad492c9e81cbc2c810
-    Reviewed-on: https://code.wireshark.org/review/20411
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Lemenkov <lemenkov@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit b56afb1
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Mar 7 07:35:33 2017 +0100
-
-    androiddump: Fix a type
-    
-    Change-Id: I839e7e7300af9b90e91548fa29157143ae00adee
-    Reviewed-on: https://code.wireshark.org/review/20434
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 44e270c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Dec 21 02:31:35 2016 +0100
-
-    lua: improve FileHandler:[seek_]read behavior and documentation
-    
-    WSLUA documents FileHandler:read as returning a boolean or integer.
-    Ignore strings, do not treat strings as number even if it is possible.
-    
-    Remove undocumented feature of FileHandler:seek_read that used returned
-    strings as the frame data. Use FrameInfo:read_data instead. This avoids
-    interpreting numbers as data which caused surprising behavior when
-    combining with FileHandler:read.
-    
-    Documentation has been improved to document the return value, this is
-    consistent with the documentation in the WSLUA tests.
-    
-    Change-Id: I31f74ec33ff0e43c90d83c1904af43801886cfa1
-    Reviewed-on: https://code.wireshark.org/review/19366
+    Change-Id: I7e2e1ef5ddcff91f04655d84836e10b9bf20d765
+    Reviewed-on: https://code.wireshark.org/review/22273
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 3b7440996b2f3637656575ad121fa6edfa03cfcb)
+    Reviewed-on: https://code.wireshark.org/review/22304
 
-commit cec782c
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Jan 28 19:16:15 2017 +0100
-
-    androiddump: Add ignore log-buffer and custom-options for logcat-text
-    
-    Logcat Text interfaces have now two new options:
-    1. Ignore log-buffer - this means you start capturing immediately
-       and there will no logs from buffer
-    2. Custom-options - pass command line parameters to logcat, like tags
-    For example:
-    adb logcat -v threadtime -b main #now custom parameters starts# -T 20 -s Ads Wireshark
-    
-    Please note that some custom options are banned to avoid unexpected
-    behaviour (like "not working")
-    
-    Change-Id: I015d1aeae35cfed712de59138288d82d3a491c38
-    Reviewed-on: https://code.wireshark.org/review/20358
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 77d5a42
-Author: Boazi <ronen.boazi@intel.com>
-Date:   Thu Feb 23 18:52:52 2017 +0200
-
-    RadioTap TimeStamp field added.
-    
-    Timestamp was added according to radiotap spec.
-    Original changes provided by Johannes Berg from Intel
-    
-    Change-Id: I72cb315626787d85b2bfb676c8ea7c73130f5a69
-    Reviewed-on: https://code.wireshark.org/review/20282
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d87a54c
+commit 9277e96
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 17:22:37 2017 +0100
-
-    opa: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I1edb5a3f7c9ac94c2a922058ca54d4b3e9218b0e
-    Reviewed-on: https://code.wireshark.org/review/20408
-    Reviewed-by: Adam Goldman <adam.goldman@intel.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 56aaa5b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 7 17:05:17 2017 -0500
-
-    Switch conversations to use wmem_tree_t instead of (sorted) GSList.
-    
-    Change-Id: Ifaf25ca5a7974f1d398ceebbb4c6733d4d3e001a
-    Reviewed-on: https://code.wireshark.org/review/20006
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cfa5001
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 5 13:10:16 2017 -0500
+Date:   Wed Jun 21 14:43:04 2017 +0200
 
-    gsm_rr_csn_flag -> proto_tree_add_bits_item when not using return value (CID-281350).
+    ISIS LSP: fix wrong bitmask for SPVID
     
-    When flags aren't used in flow control decisions, the function is
-    effectively proto_tree_add_bits_item, so make it so.
+    Issue reported by Bo-Han Liao
     
-    Change-Id: Ic82e734ddd24d41fe7c36e435cc941ed872c3b03
-    Reviewed-on: https://code.wireshark.org/review/14773
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit daefa86
-Author: Rustam Safargalin <rustam.safargalin@sifox.ru>
-Date:   Wed Nov 2 11:36:09 2016 +0300
-
-    Fix issue with dissecting multiple DT1 packets in the frame
-    
-    When parameter 'Reassemble SCCP messages' enabled in case there
-    are more than one complete DT1 in the frame they had not been
-    dissected.
-    
-    Bug: 11130
-    Bug: 3360
-    Change-Id: Iba9093105fcd95dc398607c950129ed1db866c85
-    Reviewed-on: https://code.wireshark.org/review/18615
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5760439
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 16:20:15 2017 +0100
-
-    bluetooth: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I4d8e6f32b08991f49ee22b320f02c1f65e22b6a0
-    Reviewed-on: https://code.wireshark.org/review/20400
-    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 13821
+    Change-Id: I74641bef723e747bfe5fa87e946b7f4f74b94bf6
+    Reviewed-on: https://code.wireshark.org/review/22299
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e9f6174
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Mar 5 18:30:43 2017 -0800
-
-    Clean up indentation.
-    
-    Consistently use 4-space indentation.
-    
-    Change-Id: I8418241924a5b77a9e223869ff707335b8a52b75
-    Reviewed-on: https://code.wireshark.org/review/20419
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 27db39e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Mar 5 18:11:22 2017 -0800
-
-    Rename a data structure to reflect what it represents.
-    
-    The structure called a pcap_options structure doesn't (only) hold
-    options for a packet capture; it holds all information about a
-    particular device, pipe, or socket from which we're capturing.  Rename
-    it capture_src - and rename all the pointer variables that point to
-    something of that type to pcap_src from pcap_opts.
-    
-    Change-Id: I8476146f174c82f331227528381defcc2828d822
-    Reviewed-on: https://code.wireshark.org/review/20416
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 579a86f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 17:56:35 2017 +0100
-
-    vrrp: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I45748459e4024d918ef9b146e8a62f54e2d91b65
-    Reviewed-on: https://code.wireshark.org/review/20413
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 855484fbd98c8c01f5a84902243389e07e32b6e9)
+    Reviewed-on: https://code.wireshark.org/review/22300
 
-commit bd9b2b7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 16:35:02 2017 +0100
+commit c71a7c7
+Author: Robert Sauter <sauter@locoslab.com>
+Date:   Mon Jun 12 01:22:44 2017 +0200
 
-    ieee80211: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
+    IEEE 802.15.4: Fix double offset increment for Time Correction Header IE
     
-    Change-Id: I294e0f426d760d0ccb59ebd8ea509245af1293a5
-    Reviewed-on: https://code.wireshark.org/review/20405
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 43f2177
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 16:13:45 2017 +0100
-
-    BGP: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
+    Regression by https://code.wireshark.org/review/21890/
     
-    Change-Id: I7cb6f73efb1e37eba977dc6912041d5969989696
-    Reviewed-on: https://code.wireshark.org/review/20399
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ieb90672dc2181f5951a8a4165e2676b7882282e5
+    Reviewed-on: https://code.wireshark.org/review/22087
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a9c2a97
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 16:32:19 2017 +0100
-
-    enip: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I134262482c259a9f30bfeec7bf28441d0d37d499
-    Reviewed-on: https://code.wireshark.org/review/20404
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c1e6724
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 19:38:59 2017 +0100
-
-    dissectors: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: Iba6238988ded675cba328ab512232d1919d93b4a
-    Reviewed-on: https://code.wireshark.org/review/20415
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 70e04f3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 19:38:07 2017 +0100
-
-    dumpcap: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I46bf9ae4150d9bd7efe5387919091ac49143232d
-    Reviewed-on: https://code.wireshark.org/review/20414
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8b017dc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 17:28:37 2017 +0100
-
-    rsvp: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I6e9d15ef9306433b982d6aff670c38ca8a0b4e85
-    Reviewed-on: https://code.wireshark.org/review/20410
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7491498
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 17:23:33 2017 +0100
-
-    packetbb: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: Id1fb00f95608e7ad09f9eb48f1d98f5849ae575b
-    Reviewed-on: https://code.wireshark.org/review/20409
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5e507ca
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 17:15:51 2017 +0100
-
-    nstrace: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I1943798d8dc7449e962856fef6286b9d74be0d34
-    Reviewed-on: https://code.wireshark.org/review/20407
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 53cc592
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 17:13:33 2017 +0100
-
-    nasdap-itch: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I1a0038219271c9346c0c66738b75ab087b78be82
-    Reviewed-on: https://code.wireshark.org/review/20406
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 89ea1ad
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 16:31:22 2017 +0100
-
-    erf: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I377a62a2702b89242a0abfb51f5617f265f698f3
-    Reviewed-on: https://code.wireshark.org/review/20403
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 232dbe6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 16:27:13 2017 +0100
-
-    gsm_a_bssmap: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: Ic45f7e7bbeb73e0a222d4837694bb781157ae042
-    Reviewed-on: https://code.wireshark.org/review/20402
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fd68c7d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 16:21:44 2017 +0100
-
-    csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I11b943736a4f0835e8432db95b7d471244b08a16
-    Reviewed-on: https://code.wireshark.org/review/20401
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c4245d8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 16:08:21 2017 +0100
-
-    bacapp: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I35174c0a94f4fc36435541b136f4f899e24e6867
-    Reviewed-on: https://code.wireshark.org/review/20398
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d557643
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 15:46:07 2017 +0000
-
-    ieee802154: add modelines info
-    
-    Change-Id: Ieaa9b9db97cd1753e3c395f19ae005c4df1bee3a
-    Reviewed-on: https://code.wireshark.org/review/20394
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bda3704
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 15:42:48 2017 +0000
-
-    ieee80211: fix indent (missing spaces)
-    
-    Change-Id: Ic10c9aff5058f75d31029f5d4ac7b0ce38dcc8c7
-    Reviewed-on: https://code.wireshark.org/review/20393
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 509488b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Mar 5 09:02:43 2017 -0800
-
-    [Automatic update for 2017-03-05]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I074b964d75082adc6ab216514c36abf3d54c6a0a
-    Reviewed-on: https://code.wireshark.org/review/20395
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 867d5cd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Mar 5 15:34:39 2017 +0100
-
-    lemon: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: If52bc0092f1baa833e35a9f4c107faf72c3b64d1
-    Reviewed-on: https://code.wireshark.org/review/20392
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e325391
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 22 10:41:38 2017 +0100
-
-    tools: add more entries to valgrind suppression file (libc).
-    
-    Remove leak from dl_init.
-    
-    Change-Id: Iaefc20bd0c71157d604f8f0b2538dc2481fc56db
-    Reviewed-on: https://code.wireshark.org/review/20248
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit a819806
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 22 10:40:29 2017 +0100
-
-    tools: add more entries to valgrind suppression file (glib).
-    
-    Remove leaks coming from glib.
-    
-    Change-Id: I05fc6b1143e2d20c953a2c602989cec0cc786f27
-    Reviewed-on: https://code.wireshark.org/review/20247
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 78d168f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Mar 5 12:11:37 2017 +0100
-
-    DOF: ensure to return a value different from 0 when asking for more data
-    
-    Bug: 13453
-    Change-Id: I331fb5f662f152c9c16b0d8ccbe228cded8ca85d
-    Reviewed-on: https://code.wireshark.org/review/20389
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c3dde59
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Mar 5 11:29:04 2017 +0100
-
-    DOF: fix an infinite loop in sid_buffer_hash_fn()
-    
-    The sid buffer can contain up to 255 bytes of data, so the loop counter must
-    be a guint16 at least.
-    
-    Bug: 13453
-    Change-Id: I997ce1a737532d94796586d7e109d89b2dc1911b
-    Reviewed-on: https://code.wireshark.org/review/20388
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit b8e660edc66d7f40545868a377b3385b4c9a54cb)
+    Reviewed-on: https://code.wireshark.org/review/22298
 
-commit e23676c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Mar 4 18:33:33 2017 -0500
-
-    wmem: Ensure callbacks are initialized and not accidentally unregistered
-    
-    Start the "callback register ID" at 1, so that zeroed out callback IDs
-    are not found during unregister.
-    
-    Change-Id: I1d7d70f53d89c40e07d1637e1e195dd027855ed3
-    Reviewed-on: https://code.wireshark.org/review/20385
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-
-commit b7d6cca
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Mar 4 08:26:22 2017 -0500
-
-    Add wmem_tree_destroy
-    
-    Allows the cleanup of NULL scoped wmem trees
-    
-    Change-Id: I7c49a224ca7e2f7ddfe0e38d3ea0e79aa2cb057c
-    Reviewed-on: https://code.wireshark.org/review/20382
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 9b4f325
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 7 16:52:42 2017 -0500
-
-    Add wmem_tree_count.
-    
-    There are cases where wmem_tree needs to know its number of nodes.
-    
-    Change-Id: I6411cf4275fd4d85a1d76382e1922d236be3b176
-    Reviewed-on: https://code.wireshark.org/review/20005
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3cc1d1c
-Author: Gene Cumm <gene.cumm@gmail.com>
-Date:   Sun Feb 26 13:06:39 2017 -0500
-
-    packet-hp-erm.c: Add is_tagged flag
-    
-    Remove the high bit from hp_erm.unknown3 for hp_erm.is_tagged flag.
-    This value was found by observation.
-    
-    Also realign the static value declarations and some other cleanup
-    
-    Change-Id: I8ca701cad0456c1af561fe4238e4686dc9c83c40
-    Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/20288
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d452a0c
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Jan 29 19:03:51 2017 +0100
-
-    Logcat-text: use GRegex optimizations
-    
-    "G_REGEX_OPTIMIZE - Optimize the regular expression. If the pattern
-    will be used many times, then it may be worth the effort to optimize
-    it to improve the speed of matches." - Glib documentation.
-    
-    It is possible to capture a lot of Logcat logs or these log may
-    flooding us. Optimizations are welcome.
-    
-    Change-Id: If753e795efe30b014a5fad11c8ebbcd4da3824a6
-    Reviewed-on: https://code.wireshark.org/review/20357
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3f23838
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Mar 4 15:29:39 2017 +0100
-
-    RPKI-RTR: Add new error code
-    
-    From RFC-ietf-sidr-rpki-rtr-rfc6810-bis-09
-    
-    Change-Id: Ice24416515448c633eb436f5f08320561c2a6a6a
-    Reviewed-on: https://code.wireshark.org/review/20384
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ee9b998
-Author: Roland Knall <rknall@gmail.com>
-Date:   Fri Mar 3 22:04:18 2017 +0100
-
-    extcap: Minor improvements
-    
-    Add method for searching for tools by ifname and minor improvements
-    in the interface callback to save time and space
-    
-    Change-Id: I0073c96fbee846cc5ff6304823fa14564ff36c22
-    Reviewed-on: https://code.wireshark.org/review/20376
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit b7e9582
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Mar 3 20:34:59 2017 -0800
-
-    Fix the calculation of the number of levels in the radix tree.
-    
-    The algorithm being used calculated the number of levels in a
-    1024-leaf-node tree as being 2, but it's 1 - 0 elements means 0 levels,
-    1 through 1024 elements means 1 level, 1025 through 1024^2 elements
-    means 2 levels, etc..  With a count of 1024, the loop would bump the
-    level count from 0 to 1, and divide the element count by 1024, yielding
-    1, so the loop would not terminate, and the level count would them go
-    from 1 to 2 and the element count would go to 0.
-    
-    This could cause problems if exactly 1024 packets were seen.
-    
-    Just use an if chain, similar to the one used when adding elements to
-    the tree.
-    
-    Bug: 13433
-    Change-Id: I3eaeaf374bb65b37b38a59e95f77cac6690614ed
-    Reviewed-on: https://code.wireshark.org/review/20379
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 59bbe6b
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Nov 23 13:26:17 2016 +0100
-
-    Bluetooth: HCI: A few minor improvements
-    
-    1. According to ESR05 there is no event called "Bluetooth Logo Testing".
-    2. According to ESR09 error code 0x23 is also "LL Procedure Collision"
-    3. Add some HCI status for event for HCI Summary
-    
-    bthci_evt is now up-to-date with Bluetooth Core 4 + CSA4 + CSS6 and ERS09
-    - nothing to implementing...
-    
-    Change-Id: Ief9e2de61be91942ab2211de6bc44a8f15d12426
-    Reviewed-on: https://code.wireshark.org/review/20355
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cf1d07c
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Mar 1 10:11:27 2017 +0100
-
-    Qt: Apply selected bookmark display filter
-    
-    When selecting a display filter from the bookmark list this filter
-    should be applied, because that's the most common action for a user.
-    
-    Holding down the the Alt key will only prepare the filter.
-    
-    Change-Id: I567ee8a2a70a3de07fea33fa5763d9efba591de3
-    Reviewed-on: https://code.wireshark.org/review/20317
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 807fe8e
+commit 0ca55e7
 Author: Roland Knall <rknall@gmail.com>
-Date:   Fri Mar 3 20:55:13 2017 +0100
+Date:   Tue Jun 20 15:56:31 2017 -0400
 
-    pluginIF: Allow en-/disable of elements
+    Fix Toggle indicator for search
     
-    Allow the enable/disable of an element
+    Removing the toggle indicator. Search behaves now the same as it
+    does for e.g. in SublimeText
     
-    Change-Id: I9652e8d74b261ba259cebfba53e7bc7ef560d347
-    Reviewed-on: https://code.wireshark.org/review/20370
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I4523001b536caa116bcb989f0850aa769c6220f8
+    Reviewed-on: https://code.wireshark.org/review/22280
     Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 4a703e0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 22 22:51:54 2017 -0500
-
-    Check profile directory before personal directory for services and subnets file
-    
-    Bug: 11228
-    Change-Id: Id8bcc51ff694ef9f2019bc7509e440021d049d22
-    Reviewed-on: https://code.wireshark.org/review/19735
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit fdfa24d
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Mar 3 21:58:48 2017 +0100
-
-    Fix compile error about missing intializer.
-    
-    Change-Id: I5ff757c199df5cf78d9c625bf2f69e9c62dc3f61
-    Reviewed-on: https://code.wireshark.org/review/20375
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit f5ed7a5
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Nov 22 13:35:21 2016 +0100
-
-    Bluetooth: HCI_EVT: Implement all remaining events/commands
-    
-    Event:
-      Authenticated Payload Timeout Expired
-    Commands:
-      Set Connectionless Slave Broadcast
-      Set Connectionless Slave Broadcast Receive
-      Set MWS Signaling
-      Read Synchronization Train Parameters
-      Write Synchronization Train Parameters
-      Read Secure Connections Host Support
-      Read Authenticated Payload Timeout
-      Read Local OOB Extended Data
-      Read Extended Page Timeout
-      Read Extended Inquiry Length
-      LE Read Suggested Default Data Length
-      LE Write Suggested Default Data Length
-      LE Read Resolving List Size
-      LE Read Peer Resolvable Address
-      LE Read Local Resolvable Address
-      LE Read Maximum Data Length
-    
-    Change-Id: Id57693b284151b054b7e06237744629a6af98057
-    Reviewed-on: https://code.wireshark.org/review/20354
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f22964d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Mar 3 08:52:29 2017 +0100
-
-    Qt: Fix goto next/prev packet toolbar buttons
-    
-    Use bitwise AND to check if a modifier bit is set.
-    
-    Also changed from MetaModifier to AltModifier to match the comment
-    and the modifier key used in "Next/Previous Packet in History".
-    
-    Change-Id: I89072a1dfdd14a2beb7344a672cbc18a3ace8924
-    Reviewed-on: https://code.wireshark.org/review/20359
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit c79b5e0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 3 12:31:14 2017 +0100
-
-    Update documentation with reference to $XDG_CONFIG_HOME
-    
-    Since v2.1.0rc0-184-gb0b53fa593, $XDG_CONFIG_HOME/wireshark (instead of
-    $HOME/.wireshark) is used, clarify this in the WSUG and manuals.
-    
-    Change-Id: I74a6f9b86bd8d54ee326ca83d7536e091d6da08a
-    Reviewed-on: https://code.wireshark.org/review/20364
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bc94ffc
-Author: erikdejong <erikdejong@gmail.com>
-Date:   Tue Feb 28 20:24:41 2017 +0100
-
-    SIP: Add digest verification functionality
-    
-    Added functionality to verify SIP authorization lines. With this functionality
-    it's possible to find faulty passwords that were added to configuration by
-    automatic processes (eg having unescaped '&' characters in XML config
-    files) resulting in authorization failures that cannot be diagnosed
-    otherwise.
-    Other uses include bug hunting in SIP stacks.
-    
-    Bug: 13444
-    Change-Id: I5abecd048480c8f5130a5112c531587c5993f12f
-    Reviewed-on: https://code.wireshark.org/review/20314
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    (cherry picked from commit 6b9b4bd96833e31f659118b5e34f1393cb95b247)
+    Reviewed-on: https://code.wireshark.org/review/22282
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ca68749
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Mar 3 10:04:58 2017 -0800
-
-    IAX2: Add a timestamp check.
-    
-    Don't try to process timestamps that are more than 60 seconds apart.
-    Avoids the infinite loop in bug 13432.
-    
-    Bug: 13432
-    Change-Id: I05aea4c733c94cbfe832f03ba826c74a41e6bb2f
-    Reviewed-on: https://code.wireshark.org/review/20366
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a539036
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Mar 2 22:19:19 2017 +0100
-
-    Qt: reduce minimum window size requirement
-    
-    Strip some padding from the main welcome screen and lower the minimum
-    width to allow the window to be shrinked. Even when a capture file was
-    open, the minimum dimensions from the main welcome screen would apply.
-    
-    The minimum dimensions on Arch Linux with Qt 5.8.0-5 and Plasma 5.9.2
-    (with the default Breeze theme) for a window have changes as follows:
-     - main screen/pcap loaded: 746x626 -> 702x590
-     - with search bar opened:  826x658 -> 826x622
-    (These numbers exclude 35x10 window decoration.)
-    
-    Change-Id: Iccc43ee55803abb8105c0d9664368aab09e8cfcf
-    Reviewed-on: https://code.wireshark.org/review/20343
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 85aa48c
+commit 5138182
 Author: Roland Knall <rknall@gmail.com>
-Date:   Fri Mar 3 11:53:39 2017 +0100
+Date:   Mon Jun 19 15:57:04 2017 +0200
 
-    pluginIf: Add/Remove single entries from selector
+    SearchBar - Focus on shortcut instead of closing
     
-    Allow to add and remove single items from a selector list and also
-    fixing the selection of items in a selector list
+    If the searchbar is already open focus on the bar and highlight
+    existing test, instead of closing an already open bar
     
-    Change-Id: I0c69ea97db6ca1a6932939f0df9049c6fb720f77
-    Reviewed-on: https://code.wireshark.org/review/20363
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I4f8ae2e903cb65c0ebca238f3bcc1c62b63b5c3b
+    Reviewed-on: https://code.wireshark.org/review/22223
     Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 9eca039
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Mar 3 12:39:14 2017 +0100
-
-    WSDG: update for $XDG_CONFIG_HOME
-    
-    Since v2.1.0rc0-184-gb0b53fa593, the config directory has changed.
-    
-    Change-Id: Idbeb62f2393d1a4ec192da2d85e6bfb76782aeb8
-    Reviewed-on: https://code.wireshark.org/review/20365
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit cde5483
-Author: Marcin Rokicki <marcin.rokicki@gmail.com>
-Date:   Fri Mar 3 11:08:08 2017 +0100
-
-    ieee80211: fix minimum TCLAS length
-    
-    TCLAS IE contains a set of parameters to identify incoming
-    frames with a TS.
-    During verification with various types of classifier types
-    Wireshark prints Error/Malformed message for type 2 (IEEE802.1Q)
-    
-    IEEE802.11e defines that for classifier type 2 frame length is
-    5 not 6.
-    
-    Change-Id: Icf61f7fb65e5b119aedbb664b4adaee1f1e9fde8
-    Signed-off-by: Marcin Rokicki <marcin.rokicki@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/20361
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit aa02f57
-Author: Martin Peylo <wireshark@izac.de>
-Date:   Thu Mar 2 18:07:40 2017 +0200
-
-    Having business-as-usually unused words for specific "users" in TIPC not shown
-    as needlessly highlighted expert info but as normal text in the protocol tree.
-    
-    Change-Id: I41028b00c6c5cdb85e399c959df721d768f674e1
-    Reviewed-on: https://code.wireshark.org/review/20360
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4796f79
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Mar 3 11:13:44 2017 +0100
-
-    Diameter 3GPP: update Rx Feature-List AVP
-    
-    Change-Id: Ia4fa3687173f8642f80e650df3e713a26e9a17b5
-    Reviewed-on: https://code.wireshark.org/review/20362
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 88fbd72
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Nov 22 13:30:18 2016 +0100
-
-    Bluetooth: HCI_EVT: Implement "Read Local Supported Codecs"
-    
-    Implement event reponse for command "Read Local Supported Codecs".
-    
-    Change-Id: I38946f4744b2d2d586384125700e937db698038c
-    Reviewed-on: https://code.wireshark.org/review/20353
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 35592f9
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Mar 2 16:04:48 2017 +0100
-
-    Bluetooth: HCI_EVT: Add missing unit for generated field
-    
-    Add missing unit [ms] for "Command-Response Delta"
-    
-    Change-Id: I7ba31fc6bf3baae161608432ea5fcd1015414604
-    Reviewed-on: https://code.wireshark.org/review/20356
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8e76cfb
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Mar 1 10:03:17 2017 -0600
-
-    Qt: Add selection history navigation.
-    
-    Add the ability to move back and forth in the packet selection history
-    similar to GTK+. Update the documentation accordingly.
-    
-    Change-Id: If1fdc1e59b240c0588c292dc0f7f0a5f083c30e1
-    Reviewed-on: https://code.wireshark.org/review/20320
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bc56801
-Author: Florian Adamsky <fa-git@haktar.org>
-Date:   Tue Feb 28 21:19:48 2017 +0100
-
-    BT-DHT: add IPv6 support for find_node responses
-    
-    Change-Id: I4ce38892b6c287c2dc51f438a12a5be5920197b6
-    Reviewed-on: https://code.wireshark.org/review/20323
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8f35d6f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Mar 2 22:10:36 2017 +0100
-
-    Qt: allow Packet Bytes view to be shrinked
-    
-    Even if a packet has only one or two lines for the byte view, Qt
-    autoresizing insists to require a minimum of 5.5 lines (or 7.5 lines for
-    packets without multiple data sources). Remove this artificial
-    requirement and allow the packet bytes view to be resized to show
-    nothing (except for possible data sources tabs).
-    
-    This makes it easier to fit more packets and details for screenshots.
-    
-    Change-Id: I3ea997b9effa8292b396dc2ceb2ab1c35cead410
-    Reviewed-on: https://code.wireshark.org/review/20342
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a9ec1e4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 2 18:54:26 2017 -0800
-
-    Squelch a warning from VS Code Analysis.
-    
-    It warns that a 32-bit value is being shifted left and then converted to
-    a 64-bit type; presumably it means "this might overflow and not give you
-    the result you expect".  That's unlikely to be the case here, as few
-    UN*X file systems have a recommended I/O block size > 2^30, but we might
-    as well throw in a cast so the convert-to-a-64-bit-type is done first.
-    
-    Change-Id: Id6ab11d750d5cf4cc03d060d63edc01b66cd179d
-    Reviewed-on: https://code.wireshark.org/review/20352
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 300f474
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 2 18:04:41 2017 -0800
-
-    Fix compilation with old libcrypt versions.
-    
-    Change-Id: If9c0631435e5380d3f158ebe6578adaf65a429bb
-    Reviewed-on: https://code.wireshark.org/review/20351
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ead24d2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 2 22:37:48 2017 +0100
-
-    erf: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I7214adc58362902790c006e1e22f77104be5df2e
-    Reviewed-on: https://code.wireshark.org/review/20341
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f1c75cf
-Author: Erik de Jong <erikdejong@gmail.com>
-Date:   Mon Feb 13 19:31:26 2017 +0100
-
-    Rewrite dissectors to use Libgcrypt functions.
-    
-    As discussed on the mailinglist, rewriting dissectors to use Libgcrypt
-    functions as Libgcrypt will be mandatory after change 20030.
-    Removal of following functions:
-    - crypt_md4
-    - crypt_rc4*
-    - aes_cmac_encrypt_*
-    - md5_*
-    - sha1_*
-    - sha256_*
-    
-    Further candidates:
-    - aes_*
-    - rijndael_*
-    - ...
-    
-    Added functions:
-    - ws_hmac_buffer
-    
-    Added const macros:
-    - HASH_MD5_LENGTH
-    - HASH_SHA1_LENGTH
-    
-    Changes on epan/crypt/* verified with captures from
-    https://wiki.wireshark.org/HowToDecrypt802.11
-    Changes on packet-snmp.c and packet-radius.c verified with captures from
-    https://wiki.wireshark.org/SampleCapture
-    Changes on packet-tacacs.c verified with capture from
-    http://ccie-in-3-months.blogspot.nl/2009/04/decoding-login-credentials-regardless.html
-    
-    Change-Id: Iea6ba2bf207cf0f1bf2117068fb1abcfeaafaa46
-    Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html
-    Reviewed-on: https://code.wireshark.org/review/20095
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 4bd3c4d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 2 15:02:14 2017 -0800
-
-    Remove a cast that now causes rather than squelching warnings.
-    
-    We're now comparing an unsigned with an expression made mostly of
-    unsigned, so there's no need to cast the expression to long to squelch
-    signed vs. unsigned warnings.
-    
-    Change-Id: I3b8c6f6faf26a9c252eb55d9e69fb298a3ad4c3b
-    Reviewed-on: https://code.wireshark.org/review/20347
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b98bb51
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 2 14:51:43 2017 -0800
-
-    Make sure nspr_getv20recordsize() returns an unsigned value.
-    
-    The record size fields are guint8, but NSPR_V20RECORDSIZE_2BYTES was
-    0x80, which has type int, promoting the result to int.  Make it 0x80U,
-    which means everything is unsigned.
-    
-    This squelches a compiler warning.
-    
-    Change-Id: I1c63e485352a90c7f675ab0dacaaeba794235b35
-    Reviewed-on: https://code.wireshark.org/review/20344
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b019c59
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 2 13:03:09 2017 -0800
-
-    Add more sanity checks.
-    
-    Bug: 13431
-    Change-Id: I330cb087c6e89277120057019cb5155f005ed269
-    Reviewed-on: https://code.wireshark.org/review/20337
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2f6ba75
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Mar 2 16:17:56 2017 +0100
-
-    Use glib-compat
-    
-    Change-Id: I510af18d433c4db360243dda72260e59eb84355f
-    Reviewed-on: https://code.wireshark.org/review/20336
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bf28bd4
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Mar 2 14:01:21 2017 +0100
-
-    [packet snort] Fix build on SuSE 11.4
-    packet-snort.c: In function snort_dissector:
-    packet-snort.c:882: error: converted_content_length may be used
-    uninitialized in this function
-    packet-snort.c:882: note: converted_content_length was declared here
-    packet-snort.c:880: error: content_offset may be used uninitialized in
-    this function
-    packet-snort.c:880: note: content_offset was declared here
-    
-    Change-Id: I8fb990492f31fc4ce942244005f547f3b3c9bba3
-    Reviewed-on: https://code.wireshark.org/review/20335
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4fdc16d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Mar 1 15:58:16 2017 -0600
-
-    Docbook: Replace "OS X" with "macOS".
-    
-    Change-Id: Ic2ab4f9050c9c76349d8d872b8fc2bf9feb7827d
-    Reviewed-on: https://code.wireshark.org/review/20325
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2d0e4c3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Mar 2 12:34:35 2017 +0100
-
-    include <wsutil/glib-compat.h> to allow use of g_list_free_full() with
-    older glibs.
-    
-    Change-Id: I3eb7e178dcb844ddbac47f53f221a98e2d32f413
-    Reviewed-on: https://code.wireshark.org/review/20334
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e4dfeed
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Mar 2 01:00:25 2017 -0800
-
-    Do more record length checks.
-    
-    Do the check early in the process of processing the record, and do it
-    for all record types.
-    
-    Bug: 13429
-    Change-Id: Id7f4d12415c6740241850d8f873cff52909e7110
-    Reviewed-on: https://code.wireshark.org/review/20330
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 19c51d2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Mar 1 19:53:29 2017 -0800
-
-    Don't go past the end of a page in a NetScaler file.
-    
-    Records in a properly formatted NetScaler file shouldn't go past the end
-    of a page, but nothing guarantees that a NetScaler file will be properly
-    formatted.
-    
-    NetScaler 3.x files allow record bodies to go past the end of a page,
-    but 1.x and 2.x files don't, so treat record headers that go past the
-    end of a page, and record bodies in 1.x and 2.x files that go past the
-    end of a page, as errors.
-    
-    Clean up some stuff while we're at it.
-    
-    Bug: 13430
-    Change-Id: I3b1d56086e3bb14b246406f306e3d730df337561
-    Reviewed-on: https://code.wireshark.org/review/20326
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 929e0e8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Mar 1 11:32:24 2017 +0100
-
-    udpdump: fix recvfrom error on windows.
-    
-    Change-Id: Ia88d00593163b1c1e9a0e120aeff5e36f0135474
-    Reviewed-on: https://code.wireshark.org/review/20319
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 9157e40
-Author: Rémy Léone <remy.leone@gmail.com>
-Date:   Wed Mar 1 17:04:14 2017 +0100
-
-    Fix spelling mistake
-    
-    Change-Id: I21ef4e5b19299f843a6f2a644bfa7068abd90fc4
-    Reviewed-on: https://code.wireshark.org/review/20321
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1d31986
-Author: Roland Knall <rknall@gmail.com>
-Date:   Wed Mar 1 10:04:59 2017 +0100
-
-    extcap: Create callback structure
-    
-    To ease development of callbacks and new parameters,
-    move all parameters for the callback methods to a
-    struct
-    
-    Change-Id: I160277acf4d0473897172124f7c7aa744718da9c
-    Reviewed-on: https://code.wireshark.org/review/20316
     Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 17dd9d0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 28 17:19:55 2017 +0100
-
-    radius: remove unused rule, add clarifying comment
-    
-    Since commit fdb5257f7cc8e19e6f8bcd35edee225cf44438a2 the ATTR_W_VENDOR
-    symbol was never matched, so remove it.
-    
-    Change-Id: I5a56f48ce1995c23f9eca518308d3543a15ad049
-    Reviewed-on: https://code.wireshark.org/review/20313
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 82b2d8b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 28 11:34:50 2017 -0800
-
-    Expand a comment.
-    
-    Change-Id: I4b040665582ec1fd3f97b915b3819ff2d8850a6f
-    Reviewed-on: https://code.wireshark.org/review/20315
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3c6900f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Feb 27 23:47:11 2017 +0100
-
-    radius: fix use-after-free after recent memleak fixes
-    
-    The same data is referenced by the ID-to-name and name-to-ID mapping, so
-    be make sure that the ID mapping is responsible (as the name mapping is
-    just used for duplicate detection and while parsing dictionary files).
-    
-    Still to be done is fixing duplicate attribute numbers (by adding
-    support for OIDs and changing TLV attribute type IDs to OIDs) and fixing
-    duplicate attribute names (by prefixing the Vendor Names to them).
-    Also not handled is fixing Value memleaks.
-    
-    Reproducers of the crash under ASAN:
-    
-        tshark -G fields >/dev/null
-        tshark -r radius-ms-mppe-etrl-bug.cap   (from bug 796)
-    
-    Change-Id: Ifa4055901072bc830e19fe06937af67ce524a3be
-    Fixes: v2.3.0rc0-2536-gd4cf57100c ("Free radius dissector memory on shutdown")
-    Reviewed-on: https://code.wireshark.org/review/20307
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 87b7242
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 28 17:05:10 2017 +0100
-
-    radius: fix memleaks of value_string
-    
-    The value_string was taken from the GArray and added to
-    radius_attr_info_t, but these were not properly freed.
-    
-    Change-Id: I8de2b84760887c41229a57881ff46cedcef1d22f
-    Reviewed-on: https://code.wireshark.org/review/20311
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 77d309c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 28 17:16:54 2017 +0100
-
-    radius: fix final memleak due to malformed dictionary
-    
-    The VENDOR line did not have a proper ID, so scanning the full line
-    failed and the "yyextra->vendor_name" was not freed. Import the current
-    version from FreeRadius to fix this problem.
-    
-    (Since the attributes are now grouped by the vendor, the conflict
-    comment no longer applies.)
-    
-    Change-Id: Id6020c0a5f34c624aedbb0acebe70dc643402e41
-    Reviewed-on: https://code.wireshark.org/review/20312
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 146b6b8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Feb 21 14:28:57 2017 +0100
-
-    text2pcap: free memory on exit.
-    
-    Make also text2pcap_lex_destroy() public to be called from main.
-    
-    Change-Id: I360c3dd3991d027afe6e4542ea5f9680e92f92cf
-    Reviewed-on: https://code.wireshark.org/review/20226
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 26e62df
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Feb 28 10:19:28 2017 +0100
-
-    Qt: Fix -Wshorten-64-to-32 warnings
-    
-    Fix some warnings when building with -Wshorten-64-to-32 flag for
-    C++ code.
-    
-    Fixes for warnings from QList, QTimer and QVector has been pushed
-    upstream, so some time we may be able to enable this flag for C++.
-    
-    Change-Id: Iae7457f9afc469c63f3edbe23dbf272b5c6c9e5e
-    Reviewed-on: https://code.wireshark.org/review/20310
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 311b1ee
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Wed Feb 15 22:25:58 2017 +0100
-
-    IEEE 802.11: Handle Atheros padding
-    
-    For some unknown reason between 802.11 protocol fields end and LLC
-    protocol field start two octets of padding may appear. These octets
-    (value 0x00) were observed on the OLPC laptop, heuristically detected
-    and marked as OLPC mysterious stuff.
-    
-    It seems that Atheros chipset drivers also show this behaviour,
-    although the padding is not 0x0000, but seem to be a duplicate of the
-    sequence control field. This is now also heuristically detected and
-    marked more generically as payload padding.
-    
-    Bug: 13411
-    Change-Id: I1e817e07dc19be8b3917ff302ede3328ca6a4938
-    Reviewed-on: https://code.wireshark.org/review/20284
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 2534ec4
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Feb 25 12:45:33 2017 +0100
-
-    sharkd: support for rtp tap.
-    
-    Change-Id: I84b542f8ace1e53f41be0b73a24aeb720c3c904a
-    Reviewed-on: https://code.wireshark.org/review/20271
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 5c6f633
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Feb 27 07:44:39 2017 +0100
-
-    androiddump: Use only non-blocking connect() instead of the socket
-    
-    Architecture of androiddump based on "blocking" sockets,
-    however for start-up it is better to use non-bloking connect()
-    to avoid long waiting time then fail.
-    
-    Change-Id: I2bb8ea51e24db4dd1f5a6b97e1d2bc0156342d97
-    Reviewed-on: https://code.wireshark.org/review/20293
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 606f941
-Author: Volodymyr Khomenko <Volodymyr_Khomenko@DellTeam.com>
-Date:   Mon Feb 27 15:06:23 2017 +0200
-
-    RSVDv2 support - 2nd stage
-    
-    Improved META_OPERATION_START (CreateSnapshot, ApplySnapshot)
-    Added VHDSET_QUERY_INFORMATION (SnapshotEntry)
-    Added DELETE_SNAPSHOT
-    
-    Minor fixes:
-    RSVD Status field of RSVD header shown as NT_STATUS
-    Using more structural names for RSVDv2 hf_
-    
-    Change-Id: I0199527a2de819796c7b34b663df73547f32d2fd
-    Ping-Bug: 11232
-    Reviewed-on: https://code.wireshark.org/review/20300
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4ef0fa2
-Author: sfd <stephen.donnelly@endace.com>
-Date:   Tue Feb 28 10:13:42 2017 +1300
-
-    Some ERF pseudo-headers have color instead of lctr value
-    
-    Don't report expert-info warnings for lctr when it is actually color.
-    
-    Change-Id: I689ec84dd8f1cafa1ec7e8740f9bc4091339929a
-    Reviewed-on: https://code.wireshark.org/review/20306
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 841531b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 27 21:10:33 2017 +0100
-
-    wiretap (nettl/pppdump): fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
-    
-    Change-Id: I8c339e7484d410460d499dd2923641630b482ebe
-    Reviewed-on: https://code.wireshark.org/review/20303
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 59b672e
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sun Feb 26 11:49:32 2017 +0100
-
-    Return correct filter for get_hostlist_filter()
-    
-    It was returning (ip.src == ... && <protocol>.port == ...).
-    
-    Now, I think correctly returns (ip.addr == ... && <protocol>.port == ...)
-    
-    Change-Id: I242e13c0c79c2222e2b27fc2f9ee348b89d21ec1
-    Reviewed-on: https://code.wireshark.org/review/20281
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8b8a3b8
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Feb 27 19:25:20 2017 +0100
-
-    Qt: Avoid null pointer dereference (CID 1401573)
-    
-    Change-Id: I638174a05c6275baf54e000d941f47f8ba572169
-    Reviewed-on: https://code.wireshark.org/review/20302
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8851c1c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 27 12:32:16 2017 +0100
-
-    extcap: remove leak in interface lists.
-    
-    Change-Id: Ib57292afc88cd32736b78a901385cfdde84c46c9
-    Reviewed-on: https://code.wireshark.org/review/20297
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit a29fe9d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Feb 9 18:06:45 2017 +0100
-
-    print_stream: free memory on exit.
-    
-    Change-Id: I6c4acaa9026cfdf1d4230c28c30bccfb6c025cef
-    Reviewed-on: https://code.wireshark.org/review/19920
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit d4cf571
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Feb 26 22:18:11 2017 -0500
-
-    Free radius dissector memory on shutdown
-    
-    Change-Id: I19eef65e8144d7cb6d5c9eea454581a532420c75
-    Reviewed-on: https://code.wireshark.org/review/20292
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 220772d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Feb 27 10:52:08 2017 +0100
-
-    text2pcap: fix -Wmacro-redefined warning
-    
-    With flex 2.6.3, this warning is observed (which causes a build failure
-    when -Werror is not disabled:
-    
-        text2pcap-scanner.c:398:9: warning: 'yywrap' macro redefined [-Wmacro-redefined]
-        #define yywrap() (/*CONSTCOND*/1)
-                ^
-        text2pcap-scanner.c:76:13: note: previous definition is here
-            #define yywrap yywrap
-    
-    Issue is specific to flex 2.6.3 and resolved upstream at
-    https://github.com/westes/flex/issues/162
-    
-    Change-Id: I861565f5080f87a9457427e7a63b5d9256c49e85
-    Reviewed-on: https://code.wireshark.org/review/20294
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit d83176ed2edffe59badd75d8ee98c77227fd357f)
+    Reviewed-on: https://code.wireshark.org/review/22281
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 4b2a2eb
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Feb 27 11:30:07 2017 +0100
-
-    wslua: fix documentation of Struct.fromhex
-    
-    The default separator is really an empty string, not a single space.
-    This has been wrongly documented since the beginning.
-    
-    Change-Id: I5598daec1486ce17cfeeaf5697f9759172db9cf5
-    Fixes: v1.11.3-rc1-1760-g860747e1e7 ("Adds some Lua helper functions: some commonly used functions, and to help troubleshooting Lua scripts")
-    Reviewed-on: https://code.wireshark.org/review/20296
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e8ff9f5
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Feb 27 10:53:25 2017 +0100
-
-    pluginifdemo: Adjust title texts
-    
-    Small improvement in the title texts.
-    
-    Change-Id: Ia413577386dab11f78fd141d6333944beefb5b33
-    Reviewed-on: https://code.wireshark.org/review/20295
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 513eed68
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Feb 21 14:08:27 2017 +0100
-
-    text2pcap: check return values of functions and use a single exit point.
-    
-    This is going to check every function for success and following patches
-    will free allocated memory in clean_exit.
-    
-    Change-Id: I7ba7a53eae8a37a4c25e56369af20e575c3489fb
-    Reviewed-on: https://code.wireshark.org/review/20225
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a08177b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Feb 26 20:30:54 2017 +0100
-
-    HTTP: do not call g_path_get_basename with a NULL pointer
-    
-    If the HTTP request was not found / captured, the request_uri pointer in
-    conversation data is set to NULL. Do not call g_path_get_basename in that case.
-    
-    Bug: 13441
-    Change-Id: I86eef2072ad4932e8e415580e3144d1d95796c4f
-    Reviewed-on: https://code.wireshark.org/review/20289
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fd4d009
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 26 21:09:41 2017 +0100
-
-    ppp: fix conflict for hf field
-    
-    ccp.opt.oui' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT24
-    
-    Change-Id: If6a3bbaf0012ab41722648a950f7b7007cf9a3b3
-    Reviewed-on: https://code.wireshark.org/review/20291
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2573598
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Feb 26 20:35:36 2017 +0100
-
-    Fix error: extra ';' after member function definition [-Werror,-Wextra-semi]
-    
-    Change-Id: I53aee8f259c3e855bf71160bbfd1d79254a5cdf4
-    Reviewed-on: https://code.wireshark.org/review/20290
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 53fb7e4
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 20 14:06:16 2017 +0100
-
-    capinfos: use single exit point.
-    
-    Change-Id: Ib1b556c07ec3e1f788c48038ed6bb0ae6af5cb7d
-    Reviewed-on: https://code.wireshark.org/review/20196
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2de30dd
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 20 14:05:15 2017 +0100
-
-    wsutil: fix bugs in plugins_cleanup().
-    
-    If plugin_list was NULL, plugin_types didn't get cleaned.
-    Add test and set of open_info_arr.
-    
-    Change-Id: I7669e3ba86039fb2b26ff2da64f51896053c5e68
-    Reviewed-on: https://code.wireshark.org/review/20195
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dcfc288
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 24 09:26:40 2017 -0800
-
-    Qt: Enable/disable Capture Interfaces buttons consistently.
-    
-    The "Compile BPFs" and "Start" buttons need to be enabled and disabled
-    at the same time and according to the same criteria. Make sure we do so.
-    
-    Change-Id: I708886564dcf569cd71f936119195209ef6dcbd5
-    Reviewed-on: https://code.wireshark.org/review/20265
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 74f4664
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Feb 25 20:00:40 2017 +0100
-
-    Remove executable bit, from not executable files.
-    
-    Change-Id: I8afa246172cd8d5a86513ade2f482566e3f9957a
-    Reviewed-on: https://code.wireshark.org/review/20272
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit d8e16b7
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Feb 26 08:11:41 2017 -0800
-
-    [Automatic update for 2017-02-26]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I3094033ff26c1d8da5abcc22a25e4075f6bc087f
-    Reviewed-on: https://code.wireshark.org/review/20285
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit b3539fd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 26 09:42:40 2017 +0100
-
-    apply_line_edit(.h): fix extra ';' inside a class [-Wextra-semi] (clang) / extra ‘;’ [-Wpedantic] (gcc)
-    
-    Change-Id: Ie75da8de308a5fe3a063cf929d0bb2ab739ad96f
-    Reviewed-on: https://code.wireshark.org/review/20276
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8202dd3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 26 10:12:56 2017 +0100
-
-     plugin_if: fix no previous prototype for ‘ext_toolbar_find_item’ [-Wmissing-prototypes]
-    
-    Change-Id: Ie11bc347b609bce754b85516601b57f6b0174f7b
-    Reviewed-on: https://code.wireshark.org/review/20279
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit eff4173
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 26 10:03:14 2017 +0100
-
-    preferences_dialog (Qt): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]
-    
-    Change-Id: I9781fea02e7578f7d940c050a6f405bfe4b347dd
-    Reviewed-on: https://code.wireshark.org/review/20278
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2cfac2c
+commit 4dbcea0
 Author: Roland Knall <rknall@gmail.com>
-Date:   Sun Feb 26 10:41:50 2017 +0100
-
-    pluginif: Adapt code for Qt4.8
-    
-    Change-Id: I663bb39cc6b186228bee01946c705eb6e12a8a0a
-    Reviewed-on: https://code.wireshark.org/review/20280
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit f3d52cb
-Author: Kim Bäckström <kim.backstrom@gmail.com>
-Date:   Sat Feb 25 23:44:15 2017 +0100
-
-    Bugfix for extcap fileselect functionality, start button in extcap options dialog wouldn't
-    get enabled if the user had selected a file (and mustexist=true wasn't specified).
-    
-    This commit also contains minor fixes to doc/README.extcap, it's now more aligned to the
-    actual implementation.
-    
-    Added example usage of fileselect, radio and multiselect to doc/extcap_example.py.
-    
-    Change-Id: Ibfe40a35a26f49322fbe64c0594506a2163f7e20
-    Reviewed-on: https://code.wireshark.org/review/20274
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 9782d55
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 26 10:01:53 2017 +0100
-
-    plugin_if(.h): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]
-    
-    Change-Id: I09fa357dbf9fee44a83ae9e9d78d8512b1aa9ee8
-    Reviewed-on: https://code.wireshark.org/review/20277
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 043ed1f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Feb 25 20:49:43 2017 -0500
-
-    androiddump: Set connect socket to non-blocking on Windows
-    
-    Bug: 13104
-    Change-Id: I05248dad8e72272cf0933c766ec0bf5160075e1e
-    Reviewed-on: https://code.wireshark.org/review/20275
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3cc899a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Feb 22 07:14:05 2017 +0100
-
-    smb2: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Ib1a74394195a945c8c723299f08dc9709233a5af
-    Reviewed-on: https://code.wireshark.org/review/20245
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b912070
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 20 14:01:18 2017 +0000
-
-    RADIUS: add cnergee dictionary (from FreeRADIUS)
-    
-    commit e37987492b0d575a8ef41900ef916244112b2468
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Sat Feb 18 12:11:05 2017 -0500
-    
-        Dictionary from cnergee.
-    
-        Which modifications so that the names don't conflict with
-        existing ones.
-    
-    Change-Id: I4fed7f38300dd8bcf526e5a07eec6c7812991d95
-    Reviewed-on: https://code.wireshark.org/review/20258
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d464d9c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Feb 25 19:23:39 2017 +0000
-
-    Revert "Qt: call cleanup from destructor in WiresharkApplication."
-    
-    Calling cleanup() twice (via exit signal and via destructor) results in a
-    use-after-free on exit via write_profile_recent.
-    
-    This reverts commit e47f9fbeb090a68f9229b0f03c3f76a6285d2dff.
-    
-    Change-Id: Ic3ca0742c03a345fd8cb7f3f782942872a3057f5
-    Reviewed-on: https://code.wireshark.org/review/20273
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit cd7d159
-Author: Martin Kacer <kacer.martin@gmail.com>
-Date:   Mon Feb 13 09:36:02 2017 +0100
-
-    json2pcap support added
-    
-    Modified tshark -T json -x output
-    Added tshark -T jsonraw output
-    json2pcap.py (can be used for basic packet editing by modifying json)
-    
-    The modification in tshark -T json -x and new tshark -T jsonraw output
-    add into  hex-data output in JSON also information on which position
-    each field is dissected in the original frame, what is the field length,
-    bitmask (for not byte aligned fields) and type. This information can be
-    used for latter processing. One use-case is json2pcap script which
-    assembles the protocol layers back together from upper to lowers layers,
-    which allows the basic packet modification/editing/rewriting.
-    
-    Change-Id: Ibf948eb8fc7e3b0b51c12df6c3855f705a9c7925
-    Reviewed-on: https://code.wireshark.org/review/19990
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d00dae7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Feb 24 08:24:25 2017 +0000
-
-    RADIUS: update nomadix dictionary (from FreeRADIUS)
-    
-    commit ade4a571ad959d54faa4844df2305e5d5ccbb86
-    Author: Mark Johnson <mark@sunray.net>
-    Date:   Thu Feb 9 12:15:37 2017 -0800
-    
-        Updating Nomadix dictionary with missing attributes.
-    
-    commit 4400bf37add2e1fb29a9dcf18ad76d2b8001db7b
-    Author: Ethan Hayon <ehayon@gmail.com>
-    Date:   Tue Jun 4 13:27:58 2013 -0400
-    
-        Updated VSAs for Nomadix Access Gateway
-    
-    Change-Id: I015418dc1ac808a128f12146ff8468a5eb8b6c5f
-    Reviewed-on: https://code.wireshark.org/review/20259
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dfc26ac
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Feb 25 12:00:26 2017 +0100
-
-    Fix compilation without plugins:
-    
-    filesystem.c: In function ‘free_progdirs’:
-    filesystem.c:2209:12: error: ‘plugin_dir’ undeclared (first use in this function)
-         g_free(plugin_dir);
-    
-    Change-Id: Ib52b86d41be79b8ed7e42f5fdfaddcae6b0ca5c8
-    Reviewed-on: https://code.wireshark.org/review/20270
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7227728
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Feb 24 19:46:49 2017 -0500
-
-    Convert a few more dissectors to use wmem_hash instead of GHashtable.
-    
-    Change-Id: I86c9e485b447b380f00195bf407ce28c05bb1822
-    Reviewed-on: https://code.wireshark.org/review/20268
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 924e6d2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Feb 24 22:11:22 2017 -0500
-
-    packet-fw1.c: header should be packet scoped, not epan scoped
-    
-    Subtle memory leak
-    
-    Change-Id: I39e3f2d35de5a8c48469f3e0992cdfec09ff0755
-    Reviewed-on: https://code.wireshark.org/review/20269
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 762bf10
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Mon Feb 13 00:09:16 2017 +0100
-
-    Configuration dump for webshark.
-    
-    Change-Id: Ideaedaaa7bf5f1244d7f6845a08e4dc36a2c798f
-    Reviewed-on: https://code.wireshark.org/review/20083
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit faaff7d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 24 12:20:51 2017 -0800
-
-    Replace "n/a" with an em dash.
-    
-    Replace occurrences of "n/a" with an em dash. It matches what we do
-    elsewhere and reduces the need for translation.
-    
-    Change-Id: Ib5b63be765b7da9ae3e66ab19bd25cb497fd722d
-    Reviewed-on: https://code.wireshark.org/review/20267
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 42cf565
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 24 18:56:52 2017 +0100
-
-    dtd: fix build due to -Wtypedef-redefinition
-    
-    dtd.h defines the type, so avoid redefining to avoid this warning:
-    
-        epan/dtd_preparse.l:113:3: warning: redefinition of typedef 'Dtd_PreParse_scanner_state_t' is a C11 feature [-Wtypedef-redefinition]
-    
-    Change-Id: Id6dddb8fe082717b483a6eeae08dfde468c19c89
-    Fixes: v2.3.0rc0-2505-ge1282f2875 ("dtd: free memory on shutdown.")
-    Reviewed-on: https://code.wireshark.org/review/20266
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit e1282f2
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Feb 21 16:37:29 2017 +0100
-
-    dtd: free memory on shutdown.
-    
-    Change-Id: I502e505730b9310066563bfd9c8df9fceddd0301
-    Reviewed-on: https://code.wireshark.org/review/20229
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 43487d8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Feb 24 16:38:08 2017 +0100
-
-    udpdump: fix help.
-    
-    Change-Id: Iad0e802f8c5d3920104751fab5135d71f02b29b8
-    Reviewed-on: https://code.wireshark.org/review/20264
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 147d0c2
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jan 23 15:51:58 2017 +0100
-
-    androiddump: Use nonblocking connect
-    
-    Release as version 1.0.5:
-    All connects to ADB are now non-blocking.
-    Try to connect up to 10 times with 1ms delays,
-    so in worst-case it takes ~10ms (for example 14ms)
-    
-    Bug: 13104
-    Change-Id: I791909c9c951b62195b48acd82490e1b9ebf2be0
-    Reviewed-on: https://code.wireshark.org/review/19968
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-
-commit f22c713
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 20 16:35:32 2017 +0100
+Date:   Tue Jun 20 16:10:42 2017 -0400
 
-    tools: add options validation.
+    tcp: Change the wording to include (s)
     
-    This prevents to call the apps with incongruent options.
+    More than one packet could be meant by that
     
-    Change-Id: I76919a2da141bd277c06e708548c971c19dd7af7
-    Reviewed-on: https://code.wireshark.org/review/20211
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 8e6b5c1
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Fri Feb 24 10:50:39 2017 +0000
-
-    Developers Guide typo
-    
-    Change-Id: I125f8d9171ebdfaf7528d784e69d9768e6b1b8b7
-    Reviewed-on: https://code.wireshark.org/review/20262
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit beea673
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Feb 24 09:49:11 2017 +0100
-
-    Qt: Code cleanup
-    
-    Remove whitespace to match coding style used in file.
-    
-    Change-Id: I4c1649aa02087cd39b2f516db6e40749899c5125
-    Reviewed-on: https://code.wireshark.org/review/20260
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 3697192
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Fri Feb 24 09:58:49 2017 +0100
-
-    pluginif: Add documentation for toolbar interface
-    
-    Add the documentation for the new toolbar interface
-    to the README file
-    
-    Change-Id: I9dd37dc4f31760ccd1c9a3e6ae379cd6f9ca1db9
-    Reviewed-on: https://code.wireshark.org/review/20261
+    Change-Id: Ie751a282c927608414673c2cd48b11dc5e6d5ea6
+    Reviewed-on: https://code.wireshark.org/review/22283
     Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 321386e
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Tue Jan 24 17:34:07 2017 +0100
-
-    PluginIF: AdditionalToolbar
-    
-    Creates an interface for plugins and other parts of the code, to
-    add a new toolbar to the system and have various widget types interact
-    with this toolbar.
-    
-    All toolbars added via this interface, will be added to an additional
-    submenu called "Additional Toolbars" within Wireshark.
-    
-    Also a demo plugin is being provided, demonstrating various features
-    of the toolbar, including updating the gui elements. It also demonstrates
-    how to update toolbar items.
-    
-    Change-Id: I8d0351224b3d7f4b90220d58970b51695551d7e3
-    Reviewed-on: https://code.wireshark.org/review/19803
     Petri-Dish: Roland Knall <rknall@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit bd9afdd
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Feb 23 09:27:50 2017 +0100
-
-    Reduce number of fwrite when writing pcap-ng EPB.
-    
-    According to callgrind with the patch dumping 3000 pakets the number of
-    calls to write_to_file is reduced from 11541 to 9000 reducing the number
-    of lr from 4 681 518 to 4 314 101.
-    
-    If the buffer holding the packet was guaranteed to be padded to 32 bit
-    boundary the code could be simplified and if there was space "in front"
-    for the packet header it would be even better.
-    
-    Change-Id: Ie991c05fa9d831ee4d703bd47b8123f2b1f83277
-    Reviewed-on: https://code.wireshark.org/review/20256
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d347a60
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 22 17:41:36 2017 -0500
-
-    Make MIPv6 options into a dissector table.
-    
-    This provides external access for dissectors and plugins to provide their
-    own implementation of MIPv6 options.
-    Also cleaned up some of the "offset defines" and just went with relative
-    increments for the option functions.
-    
-    Change-Id: I40db0b316eec37ee2045e6d663829ce69e3dac37
-    Reviewed-on: https://code.wireshark.org/review/20257
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit eef1555
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Wed Feb 22 01:12:16 2017 +0100
-
-    Fix sharkd compilation on some <glibc-2.16 or <gcc-4.8
-    
-    - use printf() instead of fwrite().
-    - don't shadow stat()
-    
-    Bug: 13424
-    Change-Id: Idc8931bcc5b1387f0ce3a3bfa146ffeb5b4edc82
-    Reviewed-on: https://code.wireshark.org/review/20234
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: John Thacker <johnthacker@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 050da447424223d39d1e494b8daab840a100d05e)
+    Reviewed-on: https://code.wireshark.org/review/22295
 
-commit 99929f7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 19 17:01:51 2017 +0100
-
-    sharkd: fix redundant redeclaration of ‘cfile’ [-Wredundant-decls]
-    
-    Change-Id: I6ffe2d21cabfe326568b5f090c322d4dafd92d9d
-    Reviewed-on: https://code.wireshark.org/review/20181
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 453cccd
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Feb 22 21:41:13 2017 +0100
-
-    USB COM: highlight the bytes of the communications descriptor
-    
-    Change-Id: Ia3aa1f5e35945ff8bf500508a67731b6ad3e28e3
-    Reviewed-on: https://code.wireshark.org/review/20252
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2651232
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 15 07:17:56 2017 -0500
-
-    Make IP options into a dissector table.
-    
-    This provides external access for dissectors and plugins to provide their
-    own implementation of IP options.
-    
-    Change-Id: I40ce17ce408217769e3b86e364f372a5181888e1
-    Reviewed-on: https://code.wireshark.org/review/20163
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 67f4673
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 22 09:54:53 2017 +0100
-
-    geoip_db: replace g_free with free.
-    
-    Fix also a const cast by using the proper constness.
-    
-    Change-Id: Ifcf1854051c7f5dec911331d9cfc809e6b2dd42e
-    Reviewed-on: https://code.wireshark.org/review/20246
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 785a0d8
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Feb 22 19:04:07 2017 +0100
-
-    g_malloc -> g_malloc0 where not all struct elements are initialized or
-    when combined with memset.
-    
-    Change-Id: I5148a65bee6d4d00c140113ffb1e228adefae93f
-    Reviewed-on: https://code.wireshark.org/review/20251
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 936a4c1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Feb 22 17:39:26 2017 +0100
-
-    GPRS-NS: display nsip.cause and nsip.pdu_type as BASE_HEX
-    
-    Bug: 13428
-    Change-Id: I82ffab61cd59bbd39d82b92c6eebf8800dc2f5be
-    Reviewed-on: https://code.wireshark.org/review/20250
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 68f94bd
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 20 14:42:42 2017 +0100
-
-    mergecap: free memory on shutdown.
-    
-    Change-Id: I65445cca6b16f750bf3a98fdfea228a51b46106c
-    Reviewed-on: https://code.wireshark.org/review/20203
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 955cf0b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 20 15:30:27 2017 +0100
-
-    editcap: use single exit point.
-    
-    Change-Id: I9ed9a7effdcfdb660616f5199a8227b466e91ad4
-    Reviewed-on: https://code.wireshark.org/review/20204
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 23c8335
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 20 15:36:54 2017 +0100
-
-    reordercap: free memory on exit
-    
-    Change-Id: Ie81de7c185589fa7ba4c25cada5ef0e1435ef0e0
-    Reviewed-on: https://code.wireshark.org/review/20208
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit e47f9fb
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 20 16:18:14 2017 +0100
-
-    Qt: call cleanup from destructor in WiresharkApplication.
-    
-    This allow the correct cleanup routine to be called both when user
-    exits and when application exits by itself (like in WIRESHARK_QUIT_AFTER_CAPTURE=1).
-    
-    Change-Id: I88e468bde029b4247ac90616f3aba0065a2b8e00
-    Reviewed-on: https://code.wireshark.org/review/20210
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit f977ddd
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 20 16:16:26 2017 +0100
-
-    Qt: free memory used by rtd_tables.
-    
-    Change-Id: Ibb6e3327127840fd01c5410c145ccec07efa4c73
-    Reviewed-on: https://code.wireshark.org/review/20209
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 6dce310
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Tue Feb 21 17:28:32 2017 +0100
-
-    extcap: Reduce number of scans and storage
-    
-    Reduce the number of storage arrays and the number
-    of necessary loads. Also include cleaner methods for
-    reloading the interfaces and cleanly reload if asked by
-    the overall system
-    
-    Change-Id: I529465ec2593d40c955c6cdeaf3a85e3021c0596
-    Reviewed-on: https://code.wireshark.org/review/20230
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 73ac697
-Author: Diederik de Groot <dkgroot@talon.nl>
-Date:   Sun Feb 19 18:05:20 2017 +0100
-
-    [skinny]: Fix tvb struct size guard value
-    
-    The struct size guard value was used incorrectly, causing message with short
-    content to be only partially dissected.
-    
-    Minor:
-    - Renamed OffHookWithCgpn to OffHookWithCalingPartyNumber
-    - Added SetHookFlashDetect Message
-    - Removed some of the debug logging when parse_xml2skinny_dissector.py:debug=0
-    
-    Change-Id: If4f20d2412f8775fac3d0a2979200e8369cea6f2
-    Reviewed-on: https://code.wireshark.org/review/20186
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a4d7793
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Feb 21 12:38:28 2017 +0100
-
-    Qt: Avoid flicker in filter expressions toolbar
-    
-    Calling adjustSize() on the display filter toolbar causes flicker
-    in the filter expression toolbar when switching between profiles
-    without buttons and in some cases changing to a profile without buttons.
-    
-    Only calling adjustSize() if adding buttons should be fine to avoid
-    this issues, even if they may be caused by something else.
-    
-    Change-Id: I8cca84a51dbbc8244dc4342ac0466e35884c294d
-    Reviewed-on: https://code.wireshark.org/review/20222
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e88d445
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Tue Feb 21 20:54:01 2017 +0200
-
-    Faking different U-RNTIs for different CCCH streams.
-    
-    Change is in the FP dissector but it's effect is in the RLC dissector's
-    conversation finding logic (which uses the U-RNTI).
-    
-    Bug: 13423
-    Change-Id: Ice2302a07e644d0cc744e9925df03acb722d3184
-    Reviewed-on: https://code.wireshark.org/review/20232
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 882fa72
-Author: Chris Bontje <cbontje@gmail.com>
-Date:   Tue Feb 21 12:54:58 2017 -0700
-
-    L&G 8979 - Fix 'flags' display and RTU->master echoed responses from SBO commands
-    
-    Change-Id: I7bf8ce24ded164d547c739b00299f292bc4237cf
-    Reviewed-on: https://code.wireshark.org/review/20233
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c1ab23d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 21 20:05:29 2017 -0800
-
-    Clean up the get_if_capabilities_ routines a bit.
-    
-    Allocate the interface capabilities structure only if we succeed in
-    getting a pcap_t handle for it.
-    
-    For remote devices, explicitly set caps->can_set_rfmon and
-    caps->data_link_types, to be a little bit more like what we do for local
-    devices.
-    
-    Change-Id: I985c05f85f165fce4dfe0392569ec51ed1eeb91e
-    Reviewed-on: https://code.wireshark.org/review/20242
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0327078
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 21 17:41:55 2017 -0800
-
-    Only do save_errno = errno and errno = save_errno around g_free();
-    
-    There is *no* need to do it around an assignment statement.  (We
-    *probably* don't need to do it around g_free(), but better safe than
-    sorry - maybe some memory allocator makes system calls to hand regions
-    of the address space back.)
-    
-    Change-Id: Ib57540cc36b505aadf4a5e8885b9a744a35b1f75
-    Reviewed-on: https://code.wireshark.org/review/20236
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 50dff6e
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Feb 22 01:25:53 2017 +0100
-
-    Make sure we zero out the newly allocated list, otherwise g_list append may
-    dereference ->next containing an arbitrary value.
-    
-    Bug: 13418
-    Change-Id: I240bc03e652ede557083379cc81b81ae83d720e5
-    Reviewed-on: https://code.wireshark.org/review/20235
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit b9851c7
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Feb 19 02:32:04 2017 -0800
-
-    Snort: use GRegex to find pcre matches
-    
-    Change-Id: Ie08bc1f3139ebe5564365e662f89257ad8d5b129
-    Reviewed-on: https://code.wireshark.org/review/20177
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 012a179
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 21 09:57:16 2017 -0800
-
-    Fix a double free.
-    
-    In create_persconffile_profile, pf_dir_path_copy needs to be allocated
-    separately since the subsequent call to get_dirname is destructive. Add
-    back a call to g_strdup. This should hopefully fix a crash in the Win32
-    buildbot.
-    
-    Change-Id: I591b5845032c9b8a5324bf6ac60fc43d1e92ac2e
-    Reviewed-on: https://code.wireshark.org/review/20231
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f04e770
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Feb 21 15:21:20 2017 +0100
-
-    [GSM A BSSMAP] Correct a cause value according to TS 48.008 V13.2.0
-    
-    Change-Id: Ie1983530ed7e3606aa7b21ea91fb1c0867c50759
-    Reviewed-on: https://code.wireshark.org/review/20228
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6814cf4
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Feb 21 13:18:55 2017 +0100
-
-    Qt: Handle cancel in import coloring rules
-    
-    Change-Id: I450cfc41d19c0dcb4aa59c0515d8d0834cfee60b
-    Reviewed-on: https://code.wireshark.org/review/20223
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 4b722f2
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Feb 21 10:07:03 2017 +0100
-
-    [GSM RLCMAC] Fix column info.
-    
-    Change-Id: Ib9dc9de7da088ab14e5f52b706e0c367c576b978
-    Reviewed-on: https://code.wireshark.org/review/20221
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c258989
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 19 16:53:20 2017 +0100
-
-    DNS: Add Edwards-Curve Digital Security Algorithm (EdDSA) for DNSSEC (RFC 8080)
-    
-    Change-Id: I39a8c6639174e73f90bc4c3d8bccf628c3a477c3
-    Reviewed-on: https://code.wireshark.org/review/20179
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c5ce5a8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 19 19:04:54 2017 +0100
-
-    couchbase: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I9f5f91925607582f40855ca1a08875e83d62f4eb
-    Reviewed-on: https://code.wireshark.org/review/20205
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ed8b549
-Author: olivermd <oliver.downard@couchbase.com>
-Date:   Tue Feb 14 15:07:46 2017 +0000
-
-    Couchbase: Add SSL support
-    
-    Change-Id: I468f92c20184a6e5f5bd1f07d94c0b605c0593dc
-    Reviewed-on: https://code.wireshark.org/review/20149
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fdecfa6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 20 14:54:16 2017 +0100
-
-    cmake: Add some missing SET_FEATURE_INFO
-    
-    for nghttp2, lz4, snappy
-    
-    Change-Id: I0788c2105b69ba2ae781709fb5e16e13b5ca1533
-    Reviewed-on: https://code.wireshark.org/review/20200
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 66e4541
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 20 14:47:20 2017 +0100
-
-    cmake: SET_FEATURE_INFO don't need to add www: for URL
-    
-    Change-Id: If01c008690dc1956b42d63d67942414063f3e76c
-    Reviewed-on: https://code.wireshark.org/review/20199
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 86cc732
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 20 15:48:19 2017 +0100
-
-    tns(.h): Remove unneeded h file
-    
-    Change-Id: I11ccaa73e2ea58ffbfb897ee54bbdf89068e36dc
-    Reviewed-on: https://code.wireshark.org/review/20207
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c46f8b6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 20 19:21:28 2017 -0800
-
-    Get rid of unused variable.
-    
-    Change-Id: I684ce34b33e8abc596b9109068e302db57f85115
-    Reviewed-on: https://code.wireshark.org/review/20220
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 987244e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 20 18:58:03 2017 -0800
-
-    New/updated reference URLs.
-    
-    Add an IBM link for SNA, they being its creators.
-    
-    Point to Wayback Machine archives for the protocols.com page, as that
-    doesn't seem to be available on protocols.com any more.
-    
-    Change-Id: I33633c838707f13afacde7a207a06f87b9f99bbb
-    Reviewed-on: https://code.wireshark.org/review/20219
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2798f7c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 20 18:46:08 2017 -0800
-
-    Have all the remote host list routines' names begin with recent_.
-    
-    Some did, some didn't - make it consistent.
-    
-    Clean up some header comments while we're at it.
-    
-    Change-Id: I978c84167cce3c8f1c0280898aa4d0b60958325b
-    Reviewed-on: https://code.wireshark.org/review/20218
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 72e2c3a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 20 18:31:15 2017 -0800
-
-    Have a routine to iterate over the remote host list.
-    
-    Have a routine that iterates over the remote host list if it exists.
-    
-    Remove the routine to get the remote host list; all accesses should be
-    through functions in ui/remote.c.
-    
-    Change-Id: Idddceba76b50ce85ef8557e132d7552191c2fddc
-    Reviewed-on: https://code.wireshark.org/review/20217
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e18ad46
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Tue Feb 21 00:03:54 2017 +0100
-
-    Don't use identical log messages for non-identical error cases.
-    
-    Change-Id: Ia80f112bef5f0c10e54223d3b57570fa53f7e867
-    Reviewed-on: https://code.wireshark.org/review/20216
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit b82f7c5
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Feb 20 21:44:27 2017 +0100
-
-    Calling g_hash_table_size with a NULL argument causes a GLib-CRITICAL.
-    
-    This fixes the first issue appearing in the log of
-    
-    Bug: 13418
-    Change-Id: I2fe68a06dd4a19be8300ec34be65a8dc47d0f8b3
-    Reviewed-on: https://code.wireshark.org/review/20214
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 124807e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 20 13:26:04 2017 -0800
-
-    Fix a typo and a copy-and-pasteo.
-    
-    Change-Id: I6688658698efb2588520f0ef3ffbe8e6e38aedec
-    Reviewed-on: https://code.wireshark.org/review/20215
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3aa8887
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Feb 20 16:49:10 2017 +0100
-
-    [GTP] Make flag fields boolean.
-    
-    Change-Id: I491a2f03babfae34750efa2a57a64392b4558f13
-    Reviewed-on: https://code.wireshark.org/review/20213
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 05cda40
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Feb 20 16:41:54 2017 +0100
-
-    [BSSGP] Dissect new Extended Feature Bitmap fields.
-    
-    Change-Id: I6993a1b0d0a5056c3c2a3af0f5bc5eef6a36cde1
-    Reviewed-on: https://code.wireshark.org/review/20212
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit dfb05b9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 20 14:24:30 2017 +0100
-
-    wtap_opttypes(.h): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]
-    
-    Change-Id: Ie7f67510ea948fb72b57fe08d9f95d135c5855a5
-    Reviewed-on: https://code.wireshark.org/review/20194
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9f47916
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 20 14:23:18 2017 +0100
-
-    print(.h): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]
-    
-    Change-Id: Iedffbd72c855340ab77157df954366c8e479c7df
-    Reviewed-on: https://code.wireshark.org/review/20193
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d84577f
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Feb 19 10:58:47 2017 -0800
-
-    Yell at the user less.
-    
-    Our user-facing messages should have a helpful (or at the very least
-    neutral) tone. In English, exclamation points are neither. Replace a
-    bunch of them with periods.
-    
-    Change-Id: I29c3b2f84c25e06aae5b559860224559053a0378
-    Reviewed-on: https://code.wireshark.org/review/20189
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6e8066c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 20 14:32:42 2017 +0100
-
-    stats_tree: fix no previous prototype for ‘stats_tree_cfg_free’ [-Wmissing-prototypes]
-    
-    Change-Id: Iddf63fabec9a2abb5b3d75fb5289f769e0175b55
-    Reviewed-on: https://code.wireshark.org/review/20197
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 94559de
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Feb 20 15:49:53 2017 +0100
-
-    [Diameter] Add 3GPP AVPs
-    
-    Change-Id: I53c2298584b53943924da417ac407e13f7c23d40
-    Reviewed-on: https://code.wireshark.org/review/20206
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 52ce1b0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Feb 19 22:02:04 2017 +0100
-
-    SNMP: fix insertion of first entry in SNMP Users UAT
-    
-    when using the GUI to add the first entry, num_ueas is still 0.
-    
-    Change-Id: Iea03495a2e5e39b71391a01454aec5fb6e2b05eb
-    Reviewed-on: https://code.wireshark.org/review/20191
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 1089211
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Feb 19 21:41:55 2017 +0100
-
-    SNMP: duplicate dynamic members of snmp_ue_assoc_t structure in localize_ue()
-    
-    Otherwise you can end up freeing twice the same memory blocks
-    (from localized_ues and unlocalized_ues lists)
-    
-    Bug: 13420
-    Change-Id: I7e6f1f8d740b0e5ffca851f3f5b1928a7686c069
-    Reviewed-on: https://code.wireshark.org/review/20190
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit e2e4415
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Feb 17 16:19:56 2017 +0100
-
-    Add some glib functions not available in older glibs
-    
-    Change-Id: I6526d799447a3b6c0b9bb42f8d0f8c3415299ed0
-    Reviewed-on: https://code.wireshark.org/review/20158
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 6c65486
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Feb 19 19:46:13 2017 +0100
-
-    Qt: Mystery pixel issue is solved
-    
-    The mystery pixel issue has probably been mysteriously solved earlier
-    because the adjustments does not work as expected now.
-    
-    This fixes an issue where one of the panes increases with 1 pixel at
-    startup and when changing profile using layout type 3, 4, 5 and 6
-    (selection number 1, 4, 5 and 6 in “Preferences -> Appearance -> Layout”).
-    
-    Change-Id: Iab36fa5303dc8628b21e5cf920e7c70a7167d76e
-    Reviewed-on: https://code.wireshark.org/review/20188
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b3f435e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Feb 18 22:40:49 2017 +0100
-
-    Qt: Add "Reset Layout"
-    
-    Add menu item "Reset Layout" to manually reset panes to equal sizes.
-    
-    Change-Id: I1efbf655462e25053062e03f8038dc20f9f555c0
-    Reviewed-on: https://code.wireshark.org/review/20173
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d1b943d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 13 16:37:39 2017 +0100
-
-    stat_tap_ui: skip duplicate keys.
-    
-    Change-Id: If2a2d6af94458a72dc304eae3cacac0a4af2d25a
-    Reviewed-on: https://code.wireshark.org/review/20092
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 29733ad
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 19 17:00:47 2017 +0100
-
-    DNS: Don't display DNSSEC Protocol and Algo in flag tree
-    
-    Change-Id: Ifbee604f25c27076750f41ada9dfef6157ac7819
-    Reviewed-on: https://code.wireshark.org/review/20180
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 351e892
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 19 18:31:58 2017 +0100
-
-    BGP: Update some draft to final RFC
-    
-    draft-ietf-idr-aigp -> RFC7311
-    draft-ietf-idr-ls-distribution -> RFC7752
-    draft-ietf-idr-large-community -> RFC8092
-    
-    Change-Id: Ia05809ed88514f3a0c221af2aaea779f24be99e7
-    Reviewed-on: https://code.wireshark.org/review/20187
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9ce32f9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 19 17:11:09 2017 +0100
-
-    BGP: add Deprecated BGP Path Attribute (RFC 8093)
-    
-    Change-Id: I18f01f8c989a8d25a168761f22b4cf6e2b51bf18
-    Reviewed-on: https://code.wireshark.org/review/20182
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9b00828
-Author: Alexandr Savca <s.alex08@mail.ru>
-Date:   Sat Feb 18 14:34:22 2017 +0200
-
-    packet-tns.c: Add Sesskey, Auth (SQLNET_RETURN_OPI_PARAM)
-    
-    I added a few TNS pcaps on the SampleCaptures wiki and tested with all
-    of them.
-    
-    With this patch I get an error (malformed packet) on 'Set Protocol'
-    response. Peter Wu fixed it by this patch:
-    https://code.wireshark.org/review/#/c/20098/
-    
-    Change-Id: Ia41ba7d229a5332740c57853b1929764604eda03
-    Reviewed-on: https://code.wireshark.org/review/20165
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dc173f9
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Feb 19 15:54:55 2017 +0100
-
-    tap: use g_new0() instead of g_new() and memset()
-    
-    Change-Id: Ib6b7424ac38a08efebc3b86aca4dc6641f6c7585
-    Reviewed-on: https://code.wireshark.org/review/20178
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit ef20188
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Feb 19 08:12:05 2017 -0800
-
-    [Automatic update for 2017-02-19]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I2796bfe2a186adfe14adaf09c0fef65e765c474a
-    Reviewed-on: https://code.wireshark.org/review/20183
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit e2951a2
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Feb 12 00:04:31 2017 +0100
-
-    stat_tap_ui: remove leaks.
-    
-    Change-Id: If7a28ba305bed9f63f200f8a8a27a796f2df9c07
-    Reviewed-on: https://code.wireshark.org/review/20015
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 897c750
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Feb 18 10:46:24 2017 -0500
-
-    Clean up some memory leaks in wsutil/filesystem.c
-    
-    The fixes involve functions always returning a string that needs to be
-    freed by the caller.  That way the static string pointers within the functions
-    don't end up leaking at program end.
-    
-    Change-Id: I35a8dc37536c2927d88f33217887f62efafcc8ca
-    Reviewed-on: https://code.wireshark.org/review/20175
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7e70311
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Feb 18 17:29:52 2017 -0500
-
-    Fix ieee80211_tag_ssid
-    
-    Was still using tag type + length when doing offset calculations.
-    
-    Change-Id: I778f56f28fa1ccec57c5192df4f8e4aa99e45e45
-    Reviewed-on: https://code.wireshark.org/review/20174
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f7724c3
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Sat Feb 18 13:28:43 2017 -0500
-
-    file-pcapng: Undo some unnecessary changes.
-    
-    In commit 35cf66d8bd2d225ab4dad39f5af5253ab6c8caa9 four existing
-    objects were renamed for no good reason.  Restore original names.
-    Also remove unnessary Darwin options from packet block options
-    and remove leftover include.
-    
-    Change-Id: I9dfa642639af13e73b519438b82b1b2a77546c7c
-    Reviewed-on: https://code.wireshark.org/review/20171
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jim Young <jim.young.ws@gmail.com>
-
-commit 0a4273f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Feb 18 15:29:56 2017 -0500
-
-    Only cleanup open_routines if not NULL
-    
-    Change-Id: I76ea675625ef2812f51bad0c37f6c58060897f55
-    Reviewed-on: https://code.wireshark.org/review/20172
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8c758f0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Feb 18 16:17:31 2017 +0100
-
-    roofnet: display always reserved field
-    
-    Change-Id: I22d91cad10f925e7634c246ef9d22abe59fd9b51
-    Reviewed-on: https://code.wireshark.org/review/20170
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 45a216e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Feb 18 10:07:32 2017 +0100
-
-    roofnet: always declare variable on the top
-    
-    i known... not longer recommanded but i prefer
-    
-    Change-Id: I0114202a2f1d7045524aa9fe254209c93d510b7d
-    Reviewed-on: https://code.wireshark.org/review/20169
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 279dc61
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Feb 18 10:00:40 2017 +0100
-
-    roofnet: fix indent (add some missing space)
-    
-    Change-Id: Iecd662a60ffc96e5d4900c716766fd376a6b2c14
-    Reviewed-on: https://code.wireshark.org/review/20168
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fcc9cf2
+commit e1d4ce4
 Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 14 10:05:01 2017 +0100
+Date:   Tue Jun 20 14:08:39 2017 -0400
 
-    proto: ensure that length is set for proto_tree_add_item_new_ret_length
+    Fix filter for "Next Packet in Conversation"
     
-    A user reported that the TNS dissector would show "Malformed Packet" in
-    the Info column in Qt. The actual packet details and Expert Info dialog
-    however had no trace of the issue.
+    The "Previous/Next Packet in Conversation" actions accidentally
+    overwrites more specific filters (like TCP port matching) by less
+    specific ones (like IP addresses). This resulted in strange behavior
+    where packets from different TCP streams were selected.
     
-    It turns out that proto_tree_add_item_new_ret_length did not correctly
-    set the length. Test case (based on pcap from SampleCaptures wiki):
-    
-        tshark -r TNS_Oracle1.pcap -w 19.pcap -Y frame.number==19
-        tshark -r 19.pcap -Y tcp
-    
-    Change-Id: I82cb1ccbc7c3b33d2bcdb22f89a1754c1a4575e7
-    Fixes: v2.1.0rc0-1394-gc67c6e8f30 ("Add routines to add an item and return the item's real length.")
-    Reviewed-on: https://code.wireshark.org/review/20098
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 64d0133
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Feb 12 16:52:11 2017 +0100
-
-    plugins: free list on cleanup.
-    
-    Change-Id: Idff606297f72238f8539cb00ea394ee80fcb502c
-    Reviewed-on: https://code.wireshark.org/review/20074
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f792625
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Feb 10 18:04:20 2017 +0100
-
-    epan/wsutil: free memory on exit.
-    
-    Change-Id: I1cf3a4ce3b21b2e10887cbef5576e5e028e55bab
-    Reviewed-on: https://code.wireshark.org/review/20052
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6d79055
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 8 14:25:57 2017 +0100
-
-    wsutil: remove leaks from filesystem and plugins code.
-    
-    Change-Id: Iac2805c0130bd2ba6cdb3c9dd997050274d58d99
-    Reviewed-on: https://code.wireshark.org/review/20020
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 19b97fb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 18 00:41:53 2017 -0800
-
-    Why you only get 16 bytes of process name.
-    
-    Change-Id: I719706e04668aa50ed0eb6184681943718b67f00
-    Reviewed-on: https://code.wireshark.org/review/20164
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3d02987
-Author: Simon Barber <simon.barber@meraki.net>
-Date:   Fri Feb 10 18:42:29 2017 -0800
-
-    roofnet: decode framed ethernet frames.
-    
-    Change-Id: I4881bf8e16c75d34ff3421230b763803c1d2f43b
-    Reviewed-on: https://code.wireshark.org/review/20055
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 35cf66d
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Thu Feb 16 21:27:05 2017 -0500
-
-    file-pcapng: Add support for inspecting Apple's PKTAP enhanced pcapng files
-    
-    This patch augments the MIME based file-pcapng dissector to allow one to
-    more easily examine pcapng blocks that contain Darwin Process Information.
-    
-    With this patch one can dissect and inspect, albeit as a MIME object, the
-    Darwin process information elements contained within an Apple augmented
-    pcapng file:
-    
-    $ wireshark -X read_format:'MIME Files Format' -r bug12587.pktap.pcapng
-    
-    $ tshark -V -X read_format:'MIME Files Format' -r bug12587.pktap.pcapng | egrep '^    Block:|Darwin .* =' | less
-    
-    Apple's macOS provides an enhanced tcpdump with a pktap interface option
-    that supports the collection, display and storing of Darwin process and/or
-    service class information related to each captured packet. Using Apple's
-    pktap interface during a live capture the process information may be
-    revealed using Apple's tcpdump -k [metadata] option.
-    
-    Apple's tcpdump -k option augments tcpdump's standard report with an
-    additional parenthesized () set of information inserted after the packet
-    timestamp. If the capture file actually contains Darwin process
-    information, Apple's tcpdump -k could include the interface name (or
-    interface id), process id, process name, process_uuid, service, and/or
-    direction for each packet depending on the value of the -k's [metadata]
-    argument provided (if any).
-    
-    If the Apple tcpdump trace is captured to disk, the Darwin based process
-    and service information is saved in pcapng format augmented with several
-    new Enhanced Packet Block options (32779, 32780, 32781) along with a new
-    block type (0x80000001) called here a Darwin Process Event Block (DPEB).
-    The Darwin Process Event Block is used in a manner similar to a pcapng
-    IDB in that it contains process event information that is referenced by
-    later EPB's via the EPB options Darwin DPEB ID (32769) and Darwin EDPEB
-    ID (32871). EPBs may also include the Darwin Service Class option (32770)
-    which includes a numeric value that maps to a mnemonic service class.
-    
-    A PKTAP enhanced pcapng file can later be read back in with Apple's tcpdump
-    along and the help of its -k option to display the original Darwin Process
-    Information. Packets collected using Apple's remote virtual interface
-    (rvictl)[1] from iOS devices can also contain Darwin Process Information.
-    
-    Note: This is a first step to help determine what will be necessary to
-    eventually display any available Darwin Process Information within
-    the Frame tree when an Apple PKTAP enhanced pcapng file is opened
-    naturally in Wireshark and not as a MIME object.
-    
-    [1] https://developer.apple.com/library/content/qa/qa1176/_index.html
-    
-    Ping-Bug: 13096
-    Ping-Bug: 12587
-    Change-Id: I180e661dab0b0096a711603b53270105390d05e2
-    Reviewed-on: https://code.wireshark.org/review/20157
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7ccc551
-Author: Chris Bontje <cbontje@gmail.com>
-Date:   Fri Jan 20 10:32:33 2017 -0700
-
-    Modbus - Add ability to filter by holding/input register number OR value
-    
-    Bug: 13337
-    Change-Id: I695530c29b9b0f76eab65503dcba97d19af343fb
-    Reviewed-on: https://code.wireshark.org/review/19706
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7d83068
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Feb 12 17:21:38 2017 +0100
-
-    user_encap: Don't allocate duplicate strings for user_encap2
-    
-    All is does is lead to memory leaks.
-    
-    Change-Id: Ia20b95c9a7ae36df5b902cf59b33fbd046c2da56
-    Reviewed-on: https://code.wireshark.org/review/20076
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5d3d96c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Feb 12 12:35:46 2017 -0500
-
-    transum: Add protections against NULL trees.
-    
-    proto_find_finfo doesn't have NULL tree protection, so protect it from
-    transum dissector.
-    
-    Bug: 13395
-    Change-Id: I1037c675cf10b959f116b20b12cc7b388c175cd3
-    Reviewed-on: https://code.wireshark.org/review/20077
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2c3dda5
-Author: Volodymyr Khomenko <Volodymyr_Khomenko@DellTeam.com>
-Date:   Fri Feb 17 14:27:35 2017 +0200
-
-    SMB2 ioctl FSCTL_STORAGE_QOS_CONTROL dissector
-    
-    Format of the data is described by MS-SQOS document -
-    see https://msdn.microsoft.com/en-us/library/mt226249.aspx
-    Both v1.0 and v1.1 are handled.
-    
-    Also few cosmetic fixes for
-    dissect_smb2_FSCTL_QUERY_SHARED_VIRTUAL_DISK_SUPPORT
-    
-    Bug: 13417
-    Change-Id: If7b793042257112d8f16f739d09aafe168443960
-    Reviewed-on: https://code.wireshark.org/review/20156
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 46ae4ac
-Author: Volodymyr Khomenko <Volodymyr_Khomenko@DellTeam.com>
-Date:   Mon Feb 13 12:10:26 2017 +0200
-
-    RSVD TUNNEL_SCSI bugfix: SCSI payload is not dissected for request packets
-    
-    For SCSI packets tunnelled via RSVD, the logic of
-    SCSI Payload dissection should be:
-    -For SCSI IN transfer type (DataIn=1), display SCSI Payload of reply packet only.
-    -For SCSI OUT transfer type (DataOut=0), display SCSI Payload of request packet only.
-    -For non-data transfer type (DataIn=2) don't display SCSI payload even if DataBuffer is non-empty.
-    
-    Minor fix: display RSVD DataBuffer BEFORE SCSI Payload in response packets.
-    If SCSI dissector failed (malformad packet), binary DataBuffer blob
-    will be still displayed in SVHDX_TUNNEL_SCSI_RESPONSE subtree.
-    
-    Bug: 13403
-    Change-Id: Ia4fec817ae30799b763ae9d96c312fb7771d1618
-    Reviewed-on: https://code.wireshark.org/review/20089
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 67d8830
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Feb 4 17:01:00 2017 +0100
-
-    wiretap: add open_routines cleanup function.
-    
-    Change-Id: Id88fe84189b8baa597eaa69159395cdc4bc56195
-    Reviewed-on: https://code.wireshark.org/review/19951
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 52637ad
-Author: Masashi Honma <masashi.honma@gmail.com>
-Date:   Sat Jan 28 00:17:58 2017 -0500
-
-    Dissector: Add IEEE802.11 mesh awake window dissector
-    
-    Change-Id: I0275228c3f3e03d817ce886fc949a65426dbc9cf
-    Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/19737
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 9e1232e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 18 23:15:51 2017 -0500
-
-    Convert IEEE802.11 tagged fields into a dissector table
-    
-    One GIANT switch statement is a little difficult to maintain, so convert each
-    case into its own function and add them to a dissector table.  Many of the
-    case statements were already their own function, but signatures needed to
-    be converted into dissector_handle_t
-    -1 was uses as the protocol for the dissector handles because there isn't
-    a need to be associated with a protocol.  This also allows third-parties
-    and plugins to add tagged fields outside of Wireshark using the new
-    dissector table.
-    
-    Change-Id: I5e4c705dd6a7d99549a27ae684dbde4c47774123
-    Reviewed-on: https://code.wireshark.org/review/19670
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit b59c87f
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 17 12:20:58 2017 -0800
-
-    CMake: Move the search for libgcc_s to GLib.
-    
-    Move the search for the libgcc_s_seh and _sjlj DLLs to the GLib directory.
-    That's the only place it currently exists on the 64-bit builder.
-    
-    Change-Id: Icf55dacf061d9423e78cabeaf16aa539ccb619bb
-    Reviewed-on: https://code.wireshark.org/review/20162
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 560a6c3
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 16 15:31:56 2017 -0800
-
-    Rawshark: Try to avoid a VC runtime crash.
-    
-    The MSDN documentation for _read says
-    
-    "If fd is invalid, the file is not open for reading, or the file is
-    locked, the invalid parameter handler is invoked, as described in
-    Parameter Validation."
-    
-    This means that on Windows, if our parent has closed stdin when we call
-    _read we'll crash. Add a check to bail out early if that's happened.
-    
-    Fix a sign cast while we're here.
-    
-    Change-Id: I8afb75f6e56c6a6c2b62103ba7e2fb635dc85702
-    Reviewed-on: https://code.wireshark.org/review/20153
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 48eff6a
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Oct 19 14:54:02 2016 +0200
-
-    Bluetooth: AD: Add dissector for Apple iBeacon
-    
-    iBeacon is manufacturer specific (Apple) data in advertising packets.
-    Based on: https://developer.apple.com/ibeacon/Getting-Started-with-iBeacon.pdf
-    
-    Use DecodeAs on advertise packet using field "BT EIR/AD Manufacturer Company ID"
-    then select this dissector "Apple iBeacon".
-    
-    Change-Id: Ie3e50a391914054f33144d99734cf59fbda9683e
-    Reviewed-on: https://code.wireshark.org/review/19970
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 16c3ecb
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Feb 16 16:13:41 2017 +0100
-
-    g_slist_free_full requires glib 2.28
-    
-    Change-Id: I4f9ce7f65da0349b962f6be317635c5acb2daf73
-    Reviewed-on: https://code.wireshark.org/review/20148
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 14e1912
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Feb 16 10:41:58 2017 +0100
-
-    Qt: Disable pane menu items if not used in layout
-    
-    If a pane is not used in the layout it should not be possible to show
-    and hide this from the menu, as this may give unexpected results.
-    
-    Change-Id: I335168e66e1dffc89992cad480dd7daaea7e9d59
-    Reviewed-on: https://code.wireshark.org/review/20140
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 384c266
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Feb 16 15:08:06 2017 +0100
-
-    Qt: Preserve pane sizes when layout content changed
-    
-    Preserve pane sizes when rearranging layout content in the
-    preferences dialog.
-    
-    Change-Id: I2af2a60424a7bf94f1f92e7c63e6a1823985b60d
-    Reviewed-on: https://code.wireshark.org/review/20145
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 7e9b7b5
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Thu Feb 16 16:09:59 2017 +0100
-
-    opcua: display abort messages correctly
-    
-    Change-Id: I795fc3a3cf4ca93483f870d229668d7f747bb799
-    Reviewed-on: https://code.wireshark.org/review/20147
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a5a8fce
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Aug 3 12:14:23 2016 -0700
-
-    Qt: Warn the user about DBAR 1.8 on Windows.
-    
-    At startup, dig through the registry looking for shell extensions. If
-    any of them match known Dell Backup and Recovery DLL names and the DLL
-    version matches 1.8.*.*, show the user a warning dialog.
-    
-    This is a bit extreme but I'm not sure what else to do. Dell is a popular
-    computer manufacturer and bug reports keep trickling in.
-    
-    Change-Id: I6d1bd6c56850279356570154d231b07facb30cff
-    Bug: 12036
-    Ping-bug: 12701
-    Ping-bug: 13414
-    Reviewed-on: https://code.wireshark.org/review/16861
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 815916b
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Feb 16 14:37:01 2017 +0100
-
-    [GTPv2] Add dissection of Node Identifier.
-    
-    Change-Id: Icb2198e4f32ad7e6993bd80c2bf38ed323fb9ba0
-    Reviewed-on: https://code.wireshark.org/review/20144
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a467f63
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Mon Feb 13 00:44:21 2017 -0500
-
-    packet-nvme-rdma: Present keep alive timeout in decimal.
-    
-    This patch presents Keep alive time out value in decimal as its ready to
-    read time in decimal.
-    Its adds (msec) string as its unit is in millisecond.
-    
-    Change-Id: Ia7a1fc6e9cdbba86f8dae14d5fbb07a509d6b30f
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/20087
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d33f7b9
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Feb 16 15:49:10 2017 +0100
-
-    [GSM RLCMAC] Use rtlli_vals
-    
-    Change-Id: I491bdfd3c206971244f26dfc2cfd8172347313c6
-    Reviewed-on: https://code.wireshark.org/review/20146
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 656da8a
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Feb 16 13:22:19 2017 +0100
-
-    ifdef g_list_free_full it requires glib 2.28
-    
-    Change-Id: I86292b3d736bb08b21c034bb45f1dcac19196740
-    Reviewed-on: https://code.wireshark.org/review/20142
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ba643d6
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Feb 16 10:59:05 2017 +0100
-
-    [GSM RLCMAC] Added parsing of EC-EGPRS DL and UL data messages.
-    
-    Change-Id: Ia7c74a834d2384642cac7f9a2899313b9bac7c26
-    Reviewed-on: https://code.wireshark.org/review/20141
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e2cef4c
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Feb 16 10:03:41 2017 +0100
-
-    Qt: Improved pane size auto detect
-    
-    Split panes in exactly equal sizes.
-    
-    Change-Id: I4b984931e860160791497a299011489aa26ad4ef
-    Reviewed-on: https://code.wireshark.org/review/20139
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 6efc0f4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 16 00:29:57 2017 -0800
-
-    Updated URL for STANAG 4607 documentation.
-    
-    Change-Id: Ib25ab0ba5b9d613d55fc54c0f3ef84cb7698754f
-    Reviewed-on: https://code.wireshark.org/review/20136
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c7042be
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 16 00:18:30 2017 -0800
-
-    Report an error for too-short packets.
-    
-    The packet length field gives the length of the *entire* packet, so, by
-    definition, it must not be zero.  Make sure it's at least big enough for
-    the packet header itself plus one segment header.
-    
-    Bug: 13416
-    Change-Id: I625bd5c0ce75ab1200b3becf12fc1c819fefcd63
-    Reviewed-on: https://code.wireshark.org/review/20133
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bc2b135
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 15 19:10:10 2017 -0500
-
-    Add follow "types" by protocol short name, not filter name
-    
-    This is what the GUI is expecting.
-    
-    Change-Id: Ia51800fc7df2f978cf727dc326254b28d01ac9a2
-    Reviewed-on: https://code.wireshark.org/review/20126
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: Ifa93064e1db3777fa3c12e2220bbb0b36b9478fe
+    Reported-by: Christian Landström
+    Reviewed-on: https://code.wireshark.org/review/22274
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 54c0a6d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 15 23:27:31 2017 -0800
-
-    Cast away some compiler warnings.
-    
-    Change-Id: Ia8b68a718b6cee77b479594be09542fd7133ebe1
-    Reviewed-on: https://code.wireshark.org/review/20131
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1077e9a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 15 22:41:51 2017 -0800
-
-    Squelch a compiler warning.
-    
-    All we care about is whether the bit in question is set or not, so just
-    test whether (value & BIT) != 0.
-    
-    Change-Id: I6a1eb6b09a7e64d4da9cf92423a44be17625310f
-    Reviewed-on: https://code.wireshark.org/review/20129
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 34b9836
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Feb 15 23:35:19 2017 +0100
-
-    Qt: Reset pane sizes when layout type changed
-    
-    Reset pane sizes when layout type has changed in the preferences
-    dialog to avoid “random” sizes.
-    
-    Change-Id: I9ca830572e3d21cb4227de3d5d05449b759aec7e
-    Reviewed-on: https://code.wireshark.org/review/20122
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a98eb3c
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Feb 15 21:41:08 2017 +0100
-
-    Qt: Auto detect pane size when configured zero
-    
-    The recent file configuration for pane sizes states that
-    “pane size of zero will auto detect”, so ensure we do this in
-    all cases where the settings may be zero.
-    
-    This affects initial startup, Default profile reset and new profiles.
-    
-    Change-Id: I1430ec1a83b7fb294b92837476f2bf9472384e45
-    Reviewed-on: https://code.wireshark.org/review/20121
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 989b9d5
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 15 17:05:49 2017 +0100
-
-    ssl: fix misdetection of HelloRequest handshake message
-    
-    The encrypted "Finished" message was wrongly decoded as two
-    "HelloRequest" messages due to the presence of GCM nonce.
-    
-    Bug: 10235
-    Change-Id: I44f9bb5d927ac0d3c604e4125034cd34981d3943
-    Reviewed-on: https://code.wireshark.org/review/20119
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d718b1d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Feb 15 14:32:45 2017 +0100
-
-    Qt: Preserve pane sizes when changing profile
-    
-    When changing between profiles having certain different layout types
-    the size of the last pane was calculated wrong.
-    
-    This involves switching between this layout types:
-    
-       2 -> 3   2 -> 5   3 -> 1   3 -> 2   3 -> 4   3 -> 5
-       4 -> 3   4 -> 5   5 -> 2   5 -> 3   5 -> 4   5 -> 6
-    
-    Change-Id: I6ee3ed92c4c639b720587c0771be0a242e5a8793
-    Reviewed-on: https://code.wireshark.org/review/20116
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c529e91
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 15 00:09:48 2017 +0100
-
-    TLS: add Signed Certificate Timestamp support (RFC 6962)
-    
-    Adds support for dissecting the Signed Certificate Timestamp List
-    in the TLS Hello, X.509v3 Certificate and OCSP Response extensions.
-    
-    Tested with tls-sct.pcap (TLS extension, OCSP) and x509-sct.pcap (cert).
-    
-    Bug: 13372
-    Change-Id: I127dbf5cfe9a8dd9ed13741322273c4841b0f582
-    Reviewed-on: https://code.wireshark.org/review/20110
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
     Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 23d3a30
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 15 01:52:12 2017 +0100
-
-    ssl-utils: refactor DigitallySigned
-    
-    Refactor DigitallySigned dissection to return the length and make it
-    accept a version integer instead of Session pointer. Hopefully this
-    makes it easier to use the routine for SCT dissection in X.509 certs.
-    
-    While at it, convert it to use ssl_add_vector.
-    
-    Change-Id: I64afecc65ff597fda50d208d8f96ca0b97bfcbde
-    Reviewed-on: https://code.wireshark.org/review/20111
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9a22102
-Author: Diederik de Groot <dkgroot@talon.nl>
-Date:   Mon Feb 13 17:50:53 2017 +0100
-
-    [skinny]: Added conversation and request_response handling
-    
-    Improvements:
-     - added conversation
-     - added request/response handling
-    
-    Change-Id: Ia670eb23c0671b195108876a30ff3ff5eb4a152c
-    Reviewed-on: https://code.wireshark.org/review/20094
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e6c51e7
-Author: Oliver Downard <oliver.downard@couchbase.com>
-Date:   Wed Feb 1 17:04:56 2017 +0000
-
-    Couchbase: Add support for XATTRs
-    
-    Please see https://issues.couchbase.com/browse/MB-22004
-    
-    Alters subdoc dissecting to support XATTRs
-    Accomodates for the addition of the XATTR HELLO flag
-    Changes SET_WITH_META to support XATTRs
-    Changes DCP mutation/deletion to support XATTRs
-    
-    Change-Id: I4ff6e498b96c329d51167daf58a6d85c1f0c77c4
-    Reviewed-on: https://code.wireshark.org/review/20062
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cd1d90e
-Author: John Viklund <john.viklund@effnet.com>
-Date:   Mon Feb 13 10:40:33 2017 +0100
-
-    ROHC: Basic support for RTP extension 3
-    
-    Change-Id: Ifcc9d3791c54c484a2ec6f6e566a07e7dfc9fe7e
-    Reviewed-on: https://code.wireshark.org/review/20088
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 724dc1c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 15 16:46:42 2017 -0800
-
-    "NULL" is not what you use for a null pointer.
-    
-    It's a non-null pointer to a character string with the value "NULL".
-    You want just NULL, with no quotes.
-    
-    Change-Id: I51bfb73a3002f46f13a8f513d07b1ddc009a14cb
-    Reviewed-on: https://code.wireshark.org/review/20123
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 64f8364
-Author: Mark Phillips <mark.phil@samsung.com>
-Date:   Thu Oct 20 18:50:26 2016 +0100
-
-    Cleanup runlex.sh to use builtin POSIX functions instead of sed
-    
-    Bug: 13412
-    
-    Change-Id: If43b30a33dcc4f23ba2bcb3cce3d0feea0d9fe40
-    Reviewed-on: https://code.wireshark.org/review/20120
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0f59480
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Feb 15 16:46:05 2017 +0100
-
-    ifdef g_list_free_full it requires glib 2.28
-    
-    Change-Id: I390d602c6caaa5daa2928dcd37f5f476195a685f
-    Reviewed-on: https://code.wireshark.org/review/20118
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0b8a12f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Feb 15 14:01:23 2017 +0100
-
-    Windows: update GnuTLS to 3.4.11 and Libgcrypt to 1.7.6
-    
-    Also switch some third party libraries to stripped version to reduce size
-    
-    Change-Id: If0fd06a85fb17fb3e35543bcc714c8a8a1ce20c6
-    Reviewed-on: https://code.wireshark.org/review/20117
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a691315
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 14 19:09:31 2017 +0100
-
-    TLS13: handle message-specific TLS extensions
-    
-    Some extensions from the client are processed differently than those
-    sent by the server. In TLS 1.3 the Encrypted Extensions section took
-    over most of the Server Hello extensions and some appear in Certificate.
-    
-    Based on https://tlswg.github.io/tls13-spec/#rfc.section.4.2
-    
-    Change-Id: I40d98bae21fe7933563df4a79b0cec4bf02a76f8
-    Reviewed-on: https://code.wireshark.org/review/20109
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 3e7f32e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 14 18:42:41 2017 +0100
-
-    ssl-utils: sort extensions cases
-    
-    Sort cases to match the extension numbers. No functional change.
-    
-    Change-Id: I648ecce9037511cc19721e81b434645d61560dd2
-    Reviewed-on: https://code.wireshark.org/review/20108
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit e207506
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 14 13:32:00 2017 +0100
-
-    TLS13: dissect NewSessionTicket and CertificateRequest extensions
-    
-    Process NewSessionTicket and CertificateRequest extensions for TLS 1.3.
-    CertificateExtension in draft -18 is replaced by Extension in the next
-    draft, so anticipate for that and start decoding this extensions vector.
-    Rename ssl_dissect_hnd_hello_ext to reflect extended functionality.
-    
-    (Certificate Extensions SCT is still not dissected though, but at least
-    OCSP (status_request(_v2)) is supported now.)
-    
-    Change-Id: I3cae58dbde600e82598b3c2f8e29e92e38cd1db1
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20104
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit bb1450b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 14 11:18:24 2017 +0100
-
-    ssl,dtls: fix wrong expert info for overly large records
-    
-    The plaintext length is limited to 2^14, but the actual record length
-    (TLSCiphertext) may be larger due to expansion from compression and the
-    cipher (like AEAD auth tags). The wrong check led to false expert infos.
-    
-    Change-Id: I3a56f1b0af05ecc1d97c4f1f0bcf35ff4d0fad42
-    Fixes: v2.3.0rc0-1584-gff0371e898 ("ssl,dtls: add expert info for overly large record lengths")
-    Reviewed-on: https://code.wireshark.org/review/20099
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit efcb5c0
-Author: John Viklund <john.viklund@effnet.com>
-Date:   Wed Feb 15 07:49:08 2017 +0100
-
-    Display 4 octets SDVL with 3 bits in ROHC
-    
-    Four octets self-describing variable-length in ROHC has three bits
-    discriminator, not four as previously displayed.
-    
-    Change-Id: Ibe366aed3ac822abd0046efe71e9b4e4c633524f
-    Reviewed-on: https://code.wireshark.org/review/20112
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 78ce70e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Feb 14 22:36:52 2017 +0100
-
-    Qt: Indicate profile created from system provided
-    
-    Indicate when a profile is created from a system provided profile.
-    
-    Change-Id: Iaabe5a2dbf17c7baa14e888dfab5f2aeadaedb67
-    Reviewed-on: https://code.wireshark.org/review/20107
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 6f18fed
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Feb 14 18:41:25 2017 +0100
-
-    wiretap: fix wtap_opttypes_cleanup() function
-    
-    Change-Id: I475e2bc54af470e380e23e5dd98198885e189d6f
-    Reviewed-on: https://code.wireshark.org/review/20106
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c01cdd4
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Feb 13 23:00:00 2017 +0100
-
-    Qt: Reset Default profile support
-    
-    Add support for resetting the Default profile by deleting it in
-    the Profile Dialog.  All profile files will be deleted and all
-    other files will be kept.
-    
-    Change-Id: I795a6db3ee7b2c29e7aba461183e6cc411798b75
-    Reviewed-on: https://code.wireshark.org/review/20097
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 4deb97f31f52ca9c88efbbf46cf3e580c85474f3)
+    Reviewed-on: https://code.wireshark.org/review/22287
 
-commit fe78e13
+commit d0e9027
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Feb 14 18:04:02 2017 +0100
+Date:   Tue Jun 20 21:00:59 2017 +0200
 
-    BT LE LL: fix invalid memory access reported by valgrind
+    IP: ensure that fragment contains payload before adding it for reassembly
     
-    - broadcast_addr shoudl be static and not on call stack
-    - set the AT_STRINGZ address length with the string length and not the buffer length
+    Solves a UBSan runtime error null pointer passed as argument 1, which is
+    declared to never be null.
+    It can be reproduced with the pcap from bug 13603
     
-    Bug: 13381
-    Change-Id: I86e15ccaa9b5d7779c266ab24b637476e983664c
-    Reviewed-on: https://code.wireshark.org/review/20103
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit bc29b8c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Feb 14 18:22:57 2017 +0100
-
-    androiddump: fix compilation with ANDROIDDUMP_USE_LIBPCAP define
-    
-    Change-Id: I6edc4ff9f4db5fab9b80cb0be56639443ab22518
-    Reviewed-on: https://code.wireshark.org/review/20105
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0ed1065
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Feb 14 13:36:07 2017 +0100
-
-    rawshark: add initializer.
-    
-    Change-Id: I696b1cfd7cf226d07918cca708a3463db3114333
-    Reviewed-on: https://code.wireshark.org/review/20100
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 319de13
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Sun Feb 12 22:03:24 2017 +0200
-
-    Handle NSAP IPv4 addresses in NBAP's TransportLayerAddress field which aren't padded to 20 bytes (= max NSAP address length, expected by NSAP dissector).
-    
-    Bug: 13399
-    Change-Id: Ife0b3bbaf851e821dbfde15610eee69e9e7a6e62
-    Reviewed-on: https://code.wireshark.org/review/20069
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 415580b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Feb 4 16:37:08 2017 +0100
-
-    tshark: free capture file filename on exit.
-    
-    Change-Id: I561bc7b46ad8582013d3897ae19801d2fc5a7f49
-    Reviewed-on: https://code.wireshark.org/review/19950
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 4b423c5
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Fri Feb 3 14:52:08 2017 +0100
-
-    gtp: changed display format of a FQDN from BYTES to STRING
-    
-    as suggested on https://code.wireshark.org/review/#/c/19930/
-    
-    Change-Id: Ia340b733fb87b3e139b165ff701ff0ba25c1cf44
-    Reviewed-on: https://code.wireshark.org/review/19931
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7c0c580
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Feb 4 16:26:34 2017 +0100
-
-    wiretap: add cleanup routine.
-    
-    The cleanup routine has been added to exit section of the applications.
-    Those which required a exit restyle have been patched as well.
-    
-    Change-Id: I3a8787f0718ac7fef00dc58176869c7510fda7b1
-    Reviewed-on: https://code.wireshark.org/review/19949
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit ae0bdcc
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Mon Feb 13 22:36:45 2017 +0100
-
-    [Diameter AVPs] Add 3GPP AVP 1664 to 1680 from TS 29.272
-    
-    Change-Id: Iccc98e4bb6f7923c9ed0720d6fc469f5c3f74d39
-    Reviewed-on: https://code.wireshark.org/review/20096
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 993e098
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Feb 2 19:25:10 2017 +0100
-
-    Change Qt setup from 5.5.0 to 5.8.0
-    
-    Change-Id: Ic98922a9e3bf784487512c28921eb5c7d9914e53
-    Reviewed-on: https://code.wireshark.org/review/19962
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 6b84dde
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Feb 9 15:00:19 2017 +0100
-
-    Make Libgcrypt a mandatory dependency
-    
-    Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to
-    error out if it is not available. Update release notes, developer
-    documentation and README with the new status. Clarify relation with
-    GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script.
-    
-    Motivation for this change is that many dissectors depend on Libgcrypt
-    and having it optional increases the maintenance burden (there have been
-    several compile issues in the past due to the optional status).
-    Furthermore, wsutil has crypto code that can be replaced by Libgcrypt.
-    
-    Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f
-    Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html
-    Reviewed-on: https://code.wireshark.org/review/20030
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit b5610a0
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Feb 13 15:25:43 2017 +0100
-
-    [ISAKMP] Dissect 3GPP private error and status messages in NOTIFY.
-    
-    Change-Id: Iaa65c1cf9f358e36e77b4a5cad2543dcbb98072e
-    Reviewed-on: https://code.wireshark.org/review/20090
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 119bf86
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 13 17:27:10 2017 +0100
-
-    tools: add suppressions to valgrind.
-    
-    Remove leaks from libgcrypt.
-    
-    Change-Id: I920e504cfcb45c41510f3edc65d2dbeefda5c5a1
-    Reviewed-on: https://code.wireshark.org/review/20093
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 940c758
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 12 19:33:35 2017 -0800
-
-    Further explanation in comments.
-    
-    Change-Id: If88220dc39b2a6baeeefc244639992271b7f0464
-    Reviewed-on: https://code.wireshark.org/review/20086
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b009095
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 12 19:30:17 2017 -0800
-
-    Fix a comment to reflect (and better explain) reality.
-    
-    Change-Id: I4d87438046c18419cea775c547c49cd3abb2089e
-    Reviewed-on: https://code.wireshark.org/review/20085
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ece6e7c
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sun Feb 12 22:59:32 2017 +0100
-
-    Fix compilation without plugins.
-    
-    proto.c:667:6: error: ‘dissector_plugins’ undeclared (first use in this function)
-    tap.c:773:20: error: ‘tap_plugins’ undeclared (first use in this function)
-    
-    Change-Id: I8feaec4219dc97202bdb79d72399c5fd1d383e27
-    Reviewed-on: https://code.wireshark.org/review/20081
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit ad2eb83
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 12 10:58:57 2017 -0800
-
-    Set the partial AID in the radio metadata structure.
-    
-    Change-Id: I2d5a1cd7d264e8df7f4520272d6310e49cf8126d
-    Reviewed-on: https://code.wireshark.org/review/20080
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8bc29d1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Feb 12 17:34:45 2017 +0100
-
-    sharkd: fix a memory leak on Windows introduced in gfe06aad
-    
-    Change-Id: I907dbc924574b02d2f1b8d7668158b5b6d2c87cf
-    Reviewed-on: https://code.wireshark.org/review/20073
+    Change-Id: I0d6fdddcccc892b3141855d59be372887afcaca5
+    Reviewed-on: https://code.wireshark.org/review/22272
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit dc3b772
-Author: Martin Kacer <kacer.martin@gmail.com>
-Date:   Sat Feb 11 15:55:05 2017 +0100
-
-    tshark removed empty line in -T ek output
-    
-    Change-Id: Id4c1ab258308ecc8421a5c82b6e937a9d35bf58e
-    Reviewed-on: https://code.wireshark.org/review/20061
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 6322f9c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Feb 12 17:21:24 2017 +0100
-
-    uat: add missing parameter to documentation.
-    
-    Change-Id: Ic39b00e0800c123083a6583d78eb96154b93e49f
-    Reviewed-on: https://code.wireshark.org/review/20075
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit ea0a7f2
-Author: Diederik de Groot <dkgroot@talon.nl>
-Date:   Sat Feb 11 13:41:58 2017 +0100
-
-    [skinny]: Add struct/union guards to multi-part message handlers
-    
-    Improve multi-part message handling
-    - Calculate (sub) structure/union length
-    - Add a guard when iterating over multi-part message
-    - For fixed length messages, advance the cursor when iteration falls short of max length
-    
-    Change-Id: Id2af3aa1a878328f105e173cabe2b68dd0343507
-    Reviewed-on: https://code.wireshark.org/review/20057
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fb3a7ca
-Author: Diederik de Groot <dkgroot@talon.nl>
-Date:   Sat Feb 11 13:41:58 2017 +0100
-
-    [skinny] Fix ConnectionStatRes and DialedNumber Messages protocol version >20
-    
-    - ConnectionStatisticsResponse Comes in three different forms
-    - DialedNumber Message has variable length
-    
-    Minor:
-    - Pass ipv4or6 connection address back to calling function (using this later on in seperate commit)
-    - Correct spelling mistakes
-    - Remove duplicates from DeviceType[]
-    
-    Change-Id: Ib1619b163c12b6a4c6c86972186d828be3fd94e2
-    Reviewed-on: https://code.wireshark.org/review/20056
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6550b10
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Feb 12 08:12:26 2017 -0800
-
-    [Automatic update for 2017-02-12]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I84ecfdd35a8f2935f950f72c01a69b70a6a80c07
-    Reviewed-on: https://code.wireshark.org/review/20070
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 1e1ceeb
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Sun Feb 12 12:32:10 2017 +0100
-
-    Put the definitions first
-    
-    To help compilers that don't like mixed definitions, put the definitions
-    first.
-    
-    Bug: 13398
-    Change-Id: I7f011feef7c7574df7a03cec87693e664be559ca
-    Reviewed-on: https://code.wireshark.org/review/20067
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6bbbc34
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 12 02:03:13 2017 -0800
-
-    Fill in pseudo-header fields in order, and add the group ID for 11ac.
-    
-    Change-Id: I0011917b77b1adc0cb6effd5d9d902f541675d78
-    Reviewed-on: https://code.wireshark.org/review/20066
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6a37625
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 12 01:50:28 2017 -0800
-
-    Add a comment about wired-to-little-endian fields.
-    
-    Other fields in the Prism header are in the same byte order as the magic
-    number; if the host generating those fields is big-endian, are these
-    fields little-endian or big-endian?
-    
-    Change-Id: Ieb857db3ea63a673d9224cb2a7be3ff2bfb5861c
-    Reviewed-on: https://code.wireshark.org/review/20065
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e2c92fa
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 12 01:46:09 2017 -0800
-
-    White space/style cleanup and consistency.
-    
-    Go with 4-space indentation.
-    
-    Also, get rid of some unnecessary brackets.
-    
-    Change-Id: I07b4f126ba58ef3d013db7741d91484ae32e60d7
-    Reviewed-on: https://code.wireshark.org/review/20064
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 386a286
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 12 01:32:41 2017 -0800
-
-    signal() is defined on some UN*Xes; don't use it as a variable name.
-    
-    Change-Id: Iec68f35eefdc3ce17112c04477eae99e5aa58eb8
-    Reviewed-on: https://code.wireshark.org/review/20063
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4125aa1
-Author: Simon Barber <simon.barber@meraki.net>
-Date:   Thu Sep 15 15:46:06 2016 -0700
-
-    Decode QCA sniffer PRISM extensions, and populate some wlan_radio
-    fields.
-    
-    Patch received from QCA, and fixed up to build on master and pass
-    some fields on to wlan_radio.
-    
-    Bug: 12978
-    Change-Id: I65ba7d07fbd76e98bb13399e46b400109387764c
-    Reviewed-on: https://code.wireshark.org/review/17720
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b8ead95
-Author: Martin Kacer <kacer.martin@gmail.com>
-Date:   Sat Feb 11 15:40:24 2017 +0100
-
-    tshark print_indent function
-    
-    Modified epan/print.c to use function print_indent
-    
-    Change-Id: Iefcb1e3c7813919c6af70d57a4f8a6f921595360
-    Reviewed-on: https://code.wireshark.org/review/20060
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a2b48ad
-Author: S. Shapira <sswsdev@gmail.com>
-Date:   Fri Feb 10 16:42:38 2017 +0200
-
-    Fixing the MAC tvb creation in FP's tb dissection method
-    
-    Bug: 13392
-    Change-Id: I387a6715164180487606ba3e9e4aaf64695aa543
-    Reviewed-on: https://code.wireshark.org/review/20050
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6cc7a70
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Feb 11 12:02:40 2017 +0100
-
-    TLS13: handle Key Update for decryption
-    
-    Generate new key upon receipt of Key Update message. Untested.
-    Note that the "traffic_secret" field in SslDecryptSession was unused and
-    since the client and server have two different encryption states, store
-    the application traffic secret in SslDecoder.
-    
-    Change-Id: Iefca3f6cb75745a996fecb0fe7769c876dc9c4ee
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/20013
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit eb1a63f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 8 02:04:18 2017 +0100
-
-    TLS13: add Key Update dissection
-    
-    Actual decryption support will be added later.
-    
-    Ping-Bug: 12779
-    Change-Id: I3ff1f243fd0bd1467e84d8a6a5433c1fe71bbebf
-    Reviewed-on: https://code.wireshark.org/review/20012
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 746bbe7
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 7 22:45:55 2017 +0100
-
-    ssl-utils: add length validation for Certificate handshake message
-    
-    This also introduces a new macro, "G_MAXUINT24" as symbol for 2^24-1
-    (this name does not exist in GLib and uncommon in Google).
-    
-    Change-Id: If000f41f6286161e3a7697357fc33ae16c1e11db
-    Reviewed-on: https://code.wireshark.org/review/20003
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit b659c76
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 8 00:48:28 2017 +0100
-
-    TLS13: fix length of Finished message
-    
-    Select the full message instead of just the first 12 bytes (as was the
-    case in previous TLS versions. No check is added since it is too much
-    work for little gain (it would require looking up the hash length for
-    the cipher suite).
-    
-    Change-Id: Iea13d5abe6a7e55b04fabacfa8919a02acd8517d
-    Reviewed-on: https://code.wireshark.org/review/20011
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 8136258
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 8 00:38:52 2017 +0100
-
-    ssl-utils: add length validation to CertificateRequest
-    
-    Add length validation to several fields in CertificateRequest. Clarify
-    specification, remove unnecessary length check and add TODO for TLS 1.3.
-    
-    Change-Id: Ic3aca62d90e5fad6930beb371adf10d7b7b9fbe2
-    Reviewed-on: https://code.wireshark.org/review/20010
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 0e08518
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 8 00:01:13 2017 +0100
-
-    TLS13: add length validation for Pre-Shared Key Exchange Modes
-    
-    Add length validation for expert info and add a reference.
-    
-    Change-Id: Id21916b11ca924b517ea45294798692a010e7541
-    Reviewed-on: https://code.wireshark.org/review/20009
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 738f4b7
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 7 23:55:32 2017 +0100
-
-    TLS13: add length validation for Pre-Shared Key Extension
-    
-    Use "ssl_add_vector" for length validation and expert info.
-    
-    Change-Id: Ib38d36dfd82b78580035415d0924f1fae6cbe96d
-    Reviewed-on: https://code.wireshark.org/review/20008
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit b295829
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 7 23:35:29 2017 +0100
-
-    ssl-utils: update supported_groups extension
-    
-    Update references, rename the old "elliptic_curves" name to
-    "supported_groups". Fix a wrong field name (EC Point Format now has its
-    own hf). Add length validation for "elliptic_curve_list".
-    
-    Change-Id: I554ebb259ba7561b48dfe1cc9162a0b3b3bcdba4
-    Reviewed-on: https://code.wireshark.org/review/20007
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a77b690
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 7 21:41:23 2017 +0100
-
-    TLS13: add length validation for SupportedVersions
-    
-    Also add reference to specification.
-    
-    Change-Id: I5619ce175711f6768949f8b7eec789320100573c
-    Reviewed-on: https://code.wireshark.org/review/20002
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit efed7b5
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 7 21:39:08 2017 +0100
-
-    ssl-utils: stylistic changes for ServerHello, HelloRetryRequest
-    
-    Change "length" to "offset_end" parameter for consistency. Clarify
-    applicable TLS version in comments. Remove unnecessary check for length.
-    
-    Change-Id: Icdc7edff9c8fdaf4c7d7349f65fed42f5344f2c3
-    Reviewed-on: https://code.wireshark.org/review/20001
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d13da6c
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Fri Feb 3 11:07:12 2017 +0100
-
-    diameter_3gpp: added decoding of TWAN-Identifier AVP
-    
-    Change-Id: Ib3adec4f7abbdd0313e0017f540044ac45a8883a
-    Reviewed-on: https://code.wireshark.org/review/19930
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0bf7ba3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 9 20:17:33 2017 +0100
-
-    wmem_list: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Ibbbe9fb0165eaa297c2b70bf7e478cf538e2cc33
-    Reviewed-on: https://code.wireshark.org/review/20040
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9ced31a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Feb 3 23:15:56 2017 +0100
-
-    filter_list: add cleanup function and call it on exit.
-    
-    Change-Id: I51d8074cc5a63d4fd3af8852df120d6b4163217f
-    Reviewed-on: https://code.wireshark.org/review/19942
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 59fc668
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Feb 3 22:41:31 2017 +0100
-
-    Clean columns on exit.
-    
-    Change-Id: I950295c35fc67193d9825ebc741da151ad99e077
-    Reviewed-on: https://code.wireshark.org/review/19941
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b54c438
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Feb 9 12:28:14 2017 -0500
-
-    Convert conversation hash tables to use wmem.
-    
-    Simplifies cleanup because wmem can handle the memory cleanup.
-    
-    Change-Id: Idc6a9bfe5f23c83b59a5278a64b9fb706862342d
-    Reviewed-on: https://code.wireshark.org/review/20042
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8bbf034
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Feb 10 08:09:38 2017 +0100
-
-    service_response_time_table (GTK) fix parameter 'data' not found in the function declaration [-Wdocumentation]
-    
-    Change-Id: I6079399be6a94d3b718b31c6a21076d092adf580
-    Reviewed-on: https://code.wireshark.org/review/20049
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 424fef1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Feb 10 08:05:47 2017 +0100
-
-    response_time_delay_dialog (Qt): Fix warning: parameter 'user_data/data' not found in the function declaration [-Wdocumentation]
-    
-    Change-Id: I592b35a3ceec477a8269f5cda0c5c363681a36aa
-    Reviewed-on: https://code.wireshark.org/review/20048
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 5c7cc28
-Author: Noel Power <noel.power@suse.com>
-Date:   Thu Feb 2 15:59:22 2017 +0000
-
-    mswsp: Align parse_CAggregSpec function with MS-WSP specification.
-    
-    Fix some errors in the parsing of the CAggregSpec structure, see
-    2.2.1.24 in the MS-WSP specification.
-    
-    Change-Id: Ib281c10ab897e5c0282aa1b0d304df97a2fd14a3
-    Signed-off-by: Noel Power <noel.power@suse.com>
-    Reviewed-on: https://code.wireshark.org/review/20036
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b18245a
-Author: Noel Power <noel.power@suse.com>
-Date:   Thu Jan 12 05:52:23 2017 -0500
-
-    mswsp: Numerous bugfixes
-    
-    1. Fix display of CTableColumn.StatusUsed & CTableColumn.LengthUsed
-    Both StatusUsed and LenghtUsed members were displayed as 2 byte length
-    values instead of single byte values.
-    
-    2. Fix minor spelling mistake
-    
-    3. display correct address(s) for array of address values
-    
-    4. Use correct minimum CTableColumn size
-    
-    This is followup patch for patch already provided for bug 13299.
-    The previous minimum value neglated to take into account the
-    CFullPropSpec structure (which is on the wire) but is represtented
-    as a string in the internal CTableColumn structure. Note: this doesn't
-    make any difference to the effectiveness of the previous patch but should
-    avoid confusion if someone later actually investigates the correct minimum
-    size.
-    
-    5. Fix CPMCREATEQUERY message parsing
-    
-    Following a query and subsequent clarification from dochelp@microsoft.com
-    the MS-WSP specification document was found to be incorrect.
-    
-    CPMCreateQueryIn
-          |
-          ---> CSortSet
-    
-    should instead eventually point to CSortSet via the following msg structure
-    
-    CPMCreateQueryIn
-          |
-          ---> CInGroupSortAggregSets
-               |
-                ---> CInGroupSortAggregSet
-                     |
-                     ---> CSortSet
-    
-    Change-Id: I7da6c7db817113f5542f25f078626030ad30d737
-    Signed-off-by: Noel Power <noel.power@suse.com>
-    Reviewed-on: https://code.wireshark.org/review/20031
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e0fafa5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 8 19:32:13 2017 -0500
-
-    Convert conversation data_list from GSList to wmem_tree.
-    
-    Change-Id: I7eac4b4da86d1ac1ce8753f424b698a9949df00b
-    Reviewed-on: https://code.wireshark.org/review/20041
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f8b69fb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Feb 9 12:25:43 2017 -0500
-
-    Add wmem_map_get_keys.
-    
-    Mimic functionality of g_hash_table_get_keys
-    
-    Change-Id: I7702854ed771a5b3bf7ea5295a67c42f0f477cdf
-    Reviewed-on: https://code.wireshark.org/review/20039
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e3128d9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Feb 9 10:14:46 2017 -0500
-
-    Add wmem_map_steal
-    
-    Mimic functionality of g_hash_table_steal
-    
-    Change-Id: Iaf4aeef951b60934569143b2d119f782aeefe380
-    Reviewed-on: https://code.wireshark.org/review/20038
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cd38552
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 8 19:28:25 2017 -0500
-
-    Add wmem_tree_remove32
-    
-    Change-Id: Ic79fd0a2a13341dd7ba563cf3a056c51e9d16960
-    Reviewed-on: https://code.wireshark.org/review/20037
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f6d9f7f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Feb 9 09:48:04 2017 +0100
-
-    dof: free more memory on shutdown.
-    
-    Change-Id: Ic4604cc2f999f4e669af00e37dad9b60cb06e599
-    Reviewed-on: https://code.wireshark.org/review/19977
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d03b6c0
-Author: Günther Deschner <gd@samba.org>
-Date:   Tue Feb 7 16:25:38 2017 +0100
-
-    dissectors: update list of controls in CTDB dissector.
-    
-    Note that although some of the controls have been removed from the
-    protocol in upstream CTDB versions they are still present here in order
-    to dissect older protocol variants.
-    
-    Guenther
-    
-    Signed-off-by: Guenther Deschner <gd@samba.org>
-    Change-Id: I67d8f69a7e920f4b1eeed21caab4d2b0b104d669
-    Reviewed-on: https://code.wireshark.org/review/20023
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 80e8f7d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 8 22:31:11 2017 -0500
-
-    Add wtap_init to dftest.
-    
-    Bug: 13387
-    Change-Id: I7dfae550f814cdc15924357996e2086eea58ecf4
-    Reviewed-on: https://code.wireshark.org/review/20026
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 520a1b2
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Mon Jan 30 02:45:15 2017 -0500
-
-    Make the capture file's interface description filterable
-    
-    This patch introduces the frame.interface_description field.
-    
-    While testing this new functionality it became obvious that we have
-    a non-optimal interaction between the existing cfile.c's
-    cap_file_get_interface_name(), the recently added frame.interface_name
-    field and this new frame.interface_description field.
-    
-    The string returned from cap_file_get_interface_name() may in fact
-    come from one of three different sources: the idb's interface name
-    (if it exists) or the idb's interface description (if that exists)
-    or a default text of "unknown".  The string ultimately becomes the
-    rame.interface_name whether or not the idb had an interface name
-    option to begin with.  This behavior does not allow one to test for
-    the simple presence of frame.interface_name.  The new peer function
-    cap_file_get_interface_description() added by this patch returns
-    NULL instead of "unknown" if the idb does not have an interface
-    description.  Should cap_file_get_interface_name() be similarly
-    modified to return NULL if the idb does not have an interface name?
-    
-    Bug: 9781
-    Change-Id: Ie479f373c5080c004dd22bd88919838feca71e95
-    Reviewed-on: https://code.wireshark.org/review/19861
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit e6883c15ac00942e3232213f087147e355f7494b)
+    Reviewed-on: https://code.wireshark.org/review/22284
 
-commit 9e2366a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 8 16:42:05 2017 -0500
-
-    Don't duplicate memory for key values when passing into wmem_tree_insert_string.
-    
-    Change-Id: Ib9d8f23faa7a9f83a975396a1be8f85078223feb
-    Reviewed-on: https://code.wireshark.org/review/20024
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b28b073
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Tue Feb 7 23:35:50 2017 +0100
-
-    editcap: handle too short frames in frame comparison
-    
-    With option -I one can ignore the first number of bytes from the frame
-    while doing duplicate frame removal. This doesn't handle shorter frames
-    correctly. Add safeguards for this, and update the help text.
-    
-    Bug: 13378
-    Change-Id: Ia6b65d0797f4069f0b89fa134114d88d80988211
-    Reviewed-on: https://code.wireshark.org/review/20004
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit edf5ae3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 8 16:15:18 2017 +0100
-
-    proto: destroy list on cleanup.
-    
-    Change-Id: Icc46f1078cda4597f5a70760c96b866659092006
-    Reviewed-on: https://code.wireshark.org/review/20022
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2e0ea97
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 8 15:58:47 2017 +0100
-
-    tap: destroy list on cleanup.
-    
-    Change-Id: I24ab3d07721d338edf910b9fa8864306cbfe9dfa
-    Reviewed-on: https://code.wireshark.org/review/20021
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 19ba947
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Jan 22 21:36:39 2017 +0100
-
-    dof: add shutdown routine.
-    
-    Change-Id: I91bc792302f61fd8f20fa41ec067534316e26074
-    Reviewed-on: https://code.wireshark.org/review/19742
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 523c09f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Feb 5 22:28:26 2017 +0100
-
-    addr_resolv: remove leak.
-    
-    Change-Id: If4676b2982efae593084dbe951d8e0bb97189917
-    Reviewed-on: https://code.wireshark.org/review/19966
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit bfe0716
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Feb 3 23:06:35 2017 +0100
-
-    sharkd: make the way it returns more similar to other apps.
-    
-    The clean_exit block allows deallocation of memory on exit.
-    
-    Change-Id: I52078f0e4e851b6aa5f34cbbd15eba0a4f37cae0
-    Reviewed-on: https://code.wireshark.org/review/19940
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 70381f7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 7 23:07:27 2017 -0500
-
-    Switch stat tap to use wmem_tree_t instead of (sorted) GSList.
-    
-    Change-Id: I172167eb20793113562b69d1e0e93a4882200404
-    Reviewed-on: https://code.wireshark.org/review/20019
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c5483f4
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 7 21:51:43 2017 -0500
-
-    Switch follow (tables) to use wmem_tree_t instead of (sorted) GSList.
-    
-    Change-Id: Iabf354d2533ae429c002b115c5de33b592019997
-    Reviewed-on: https://code.wireshark.org/review/20018
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 89dfa6b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 7 20:18:33 2017 -0500
-
-    Switch rtd and srt tables to use wmem_tree_t instead of (sorted) GSList.
-    
-    Change-Id: I54fec10801eb8f359414f34bf705767964c9725e
-    Reviewed-on: https://code.wireshark.org/review/20017
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 243c09f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 7 19:44:19 2017 -0500
-
-    Switch export objects to use wmem_tree_t instead of (sorted) GSList.
-    
-    Change-Id: Iaaa7b44954337c7857dbb541b727924e2de57c9d
-    Reviewed-on: https://code.wireshark.org/review/20016
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 64a00dc
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Feb 3 23:23:42 2017 +0100
-
-    xml: replace g_strdup with wmem_strdup.
-    
-    Change-Id: Ib16bd79e117cbb54d1a8d98e79924b6bb20703a8
-    Reviewed-on: https://code.wireshark.org/review/19943
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit db5c8e1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Feb 6 16:51:57 2017 +0100
-
-    wmem_list: add wmem_list_insert_sorted.
-    
-    This mimics the function g_list_insert_sorted.
-    
-    Change-Id: I6f7ac01155588006662c8c0c138d88cea753868c
-    Reviewed-on: https://code.wireshark.org/review/19978
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 40fe50f
-Author: Volodymyr Khomenko <Khomenko.Volodymyr@gmail.com>
-Date:   Mon Feb 6 19:15:09 2017 +0200
-
-    RSVDv2 support - 1st stage
-    
-    Added META_OPERATION_START (Resize, ConvertToVHDSet)
-    Added META_OPERATION_QUERY_PROGRESS
-    Added QUERY_SAFE_SIZE
-    
-    Minor fixes:
-    Using GUID data type for LinkageID, VirtualDiskId and InitiatorId, not binary blob
-    Fixed length for SVHDX_TUNNEL_OPERATION_HEADER
-    Cosmetic: unused var, code makeup
-    
-    Ping-Bug: 11232
-    Change-Id: I4ea598367a1c12586501555f4a23d6249057484a
-    Reviewed-on: https://code.wireshark.org/review/19979
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 64984b7
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Feb 7 21:35:16 2017 +0100
-
-    Qt: Add check for valid profile name
-    
-    Add check for a valid profile name in the Profile dialog and disable
-    the Ok button and mark the invalid profile if error.
-    
-    The GTK dialog does not close on errors but the Qt dialog does, so
-    ensure the user is informed beforehand.
-    
-    Change-Id: If31ffe75183066cf49e2b5a082112bfe62d6c06e
-    Reviewed-on: https://code.wireshark.org/review/19995
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit b3068a0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 7 18:21:00 2017 -0800
-
-    Fix a comment to match we-run-on-Windows-too reality.
-    
-    Change-Id: I68a299afd1d8228e7c842f66ffd3b4ee1ffb3798
-    Reviewed-on: https://code.wireshark.org/review/20014
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ddd8380
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 7 21:16:37 2017 +0100
-
-    ldap (asn1): fix indent (use 2 spaces)
-    
-    Change-Id: I62d3e966928eba75dc26c2c3b6993175fe0f133e
-    Reviewed-on: https://code.wireshark.org/review/19994
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3f0e6d5
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 7 20:15:08 2017 +0100
-
-    ssl-utils: add vector length validation for Client Hello
-    
-    Use ssl_add_vector to process DTLS Cookie, cipher_suites,
-    compression_methods, client_hello_extension_list. Removed some checks
-    (like cipher_suite_length > 0) since (per specification) these must be
-    non-empty (if this is not the case, then at worst an empty tree is
-    visible).
-    
-    Change-Id: I7ab2ef12e210d5878769478c7dfba33a799fb567
-    Reviewed-on: https://code.wireshark.org/review/19993
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 0e74fbb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 7 13:35:41 2017 -0800
-
-    Make sure pid_t is defined.
-    
-    Just as we include <windows.h> on Windows to get HANDLE defined, include
-    <sys/types.h> on UN*X to get pid_t defined.
-    
-    We don't seem to need this (yet) on the master and 2.2 branches, but it
-    looks as if it might be necessary on the 2.0 branch.  Do it everywhere.
-    
-    Change-Id: I9535fa9944265746d332f8dc337e42a020b503d3
-    Reviewed-on: https://code.wireshark.org/review/19998
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1185fba
+commit 06a002e
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Feb 7 15:30:43 2017 +0100
+Date:   Tue Jun 20 15:49:53 2017 -0400
 
-    ui: Write recent file when applying profile changes
-    
-    Write the recent file for the current profile before copying or renaming
-    the profile to ensure the latest changes are not lost.
+    Qt: Rename "Filter Expressions" to "Filter Buttons"
     
-    Change-Id: Ib07881925b398314da0a9b2ec875da7650b84712
-    Reviewed-on: https://code.wireshark.org/review/19984
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I7adcb1d28d239bbc25d8a7a5969b34c6db84e022
+    Reviewed-on: https://code.wireshark.org/review/22277
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 75f9247c2cfec63caeb59039de972abc768e3a4b)
+    Reviewed-on: https://code.wireshark.org/review/22279
 
-commit cecf9f1
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 7 18:05:44 2017 +0100
-
-    TLS13: update NewSessionTicket dissection
-    
-    The new ticket_age_add field resulted in a dissector exception. With
-    this fixed, the tls13-18-picotls-earlydata.pcap capture can now be fully
-    decrypted.
-    
-    Also add validation for the ticket length (using ssl_add_vector).
-    
-    Change-Id: I167038f682b47b2d1da020a8f241daaf7af22017
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/19992
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f958dd5
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 7 16:15:01 2017 +0100
-
-    TLS13: support Early Data and accept CLIENT_EARLY_TRAFFIC_SECRET
-    
-    Update "early_data" extension to draft 18 (context field is gone).
-    Add support for "client_early_traffic_secret" to the keylog.
-    Support decryption of 0-RTT data (required handling cipher in Client
-    Hello and handling of "end_of_early_data" alert).
-    
-    Tested with tls13-18-picotls-earlydata.pcap, early data decrypts
-    correctly. (The server data is messed up, but that is possibly the
-    result of broken NewSessionTicket handling which throws a dissector
-    exception and thus breaks the record sequence number.)
-    
-    Ping-Bug: 12779
-    Change-Id: I9e6aeeb08111d5d977f2c0ab855f14d6d86ca87d
-    Reviewed-on: https://code.wireshark.org/review/19989
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 6d08a0e
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Feb 7 17:15:17 2017 +0100
-
-    [H248 Annex C] hf variable imported from packet-sdp,c is uint16 not int
-    
-    Change-Id: I8122a88b9b203b9535e8f69f8b71d2e11dc7dac6
-    Reviewed-on: https://code.wireshark.org/review/19988
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 829b681
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Feb 7 12:36:47 2017 +0100
-
-    Update symbols
-    
-    Change-Id: I4a868eb276af26ffc38e5c66f47bc9cc32f1d4de
-    Reviewed-on: https://code.wireshark.org/review/19985
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 2a4a6f6
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Feb 7 16:29:11 2017 +0100
-
-    Ubuntu 14.04 complains about unititialized variable proto_name_length
-    
-    Change-Id: I325e98c9eeafaa53b5f757f4b8e5e903a31e1cc2
-    Reviewed-on: https://code.wireshark.org/review/19987
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c31b8da
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Feb 5 23:00:51 2017 +0100
-
-    stats_tree: add cleanup function.
-    
-    Change-Id: Iefd264bdd79af172c245c3a30119999cca9d56c0
-    Reviewed-on: https://code.wireshark.org/review/19976
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit a2ce684
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 13:34:16 2017 +0100
-
-    prefs: free memory on cleanup.
-    
-    Change-Id: I723032974e34940715ccde5c3744f8c572c6dfda
-    Reviewed-on: https://code.wireshark.org/review/19895
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 96c756c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Feb 7 12:58:18 2017 +0100
-
-    ssl-utils: fix false warning about empty SNI
-    
-    Server Hello can contain an empty extension, so restore the check.
-    
-    Change-Id: I7d1ccfa113cd8a568def6915a80fd2791fd361df
-    Fixes: v2.3.0rc0-2284-g420b9e061e ("ssl-utils: add length validation for SNI extension")
-    Reviewed-on: https://code.wireshark.org/review/19983
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 02190e7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 5 14:55:46 2017 +0000
-
-    .mailmap: Update (of January and February )
-    
-    Change-Id: If1034d7aad02640adc45b4f276e180433e901e50
-    Reviewed-on: https://code.wireshark.org/review/19965
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 6e761f0
-Author: Allan Møller Madsen <almomadk@gmail.com>
-Date:   Sun Feb 5 16:03:34 2017 +0100
-
-    Add dissection of Bluetooth 5.0 AE related HCI commands
-    
-    Added the following batch of HCI commands:
-    LE Read Maximum Advertising Data Length
-    LE Read Number of Supported Advertising Sets
-    LE Remove Advertising Set
-    LE Set Periodic Advertising Data
-    LE Set Periodic Advertising Enable
-    LE Set Extended Scan Parameters
-    LE Set Extended Scan Enable
-    LE Extended Create Connection
-    
-    Corrected min/max interval field sizes of LE Set Extended
-    Advertising Parameters command and updated LE Set Extended
-    Advertising Enable command to use subtree for each set.
-    
-    Change-Id: Id9c08189a76a0a4adc89b669b50d832f68a929aa
-    Signed-off-by: Allan Møller Madsen <almomadk@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/19958
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1ec2a69
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Feb 2 19:31:39 2017 +0100
-
-    Bluetooth: EIR/AD: Add support for LE Features and Channel Map
-    
-    Based on CSS7 specification.
-    
-    Change-Id: Ibf00e3add7fcb1a2b3a22574bb63b0fddaf4adcb
-    Reviewed-on: https://code.wireshark.org/review/19972
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5d1c478
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Feb 1 18:31:39 2017 +0100
-
-    Bluetooth: AD: Add support for AltBeacon
-    
-    Another format of beacon in advertising packet.
-    Based on: https://github.com/AltBeacon/spec
-    
-    User needs to use DecodeAs to use this dissector - any manufacturer's
-    company id may be valid.
-    
-    Change-Id: I5656d9dbb70b648b2fadba7f3b525d38a2fe8e57
-    Reviewed-on: https://code.wireshark.org/review/19971
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 912aaf0
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Feb 6 12:53:18 2017 -0800
-
-    Adjust startup count for extcap.
-    
-    The number of extcap splash items is the number of extcap binaries plus
-    RA_EXTCAP.
-    
-    Change-Id: I9702da5a94e244ddd95a845a67da9302ee41c826
-    Reviewed-on: https://code.wireshark.org/review/19981
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e9cf760
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Feb 6 10:50:22 2017 -0800
-
-    GTK: Wrap static preference labels.
-    
-    In the GTK+ prefrences dialog, enable wrapping and set a maximum width.
-    This should keep labels from making the dialog unusably wide.
-    
-    Make a couple of enum preferences drop-downs instead of radio buttons.
-    Note that we might want to make the drop-down vs radio button behavior
-    automatic.
-    
-    Change-Id: Ib72a2c8d5cfb99324be86f2218b6d57a395fa22c
-    Reviewed-on: https://code.wireshark.org/review/19980
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 420b9e0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 3 18:44:36 2017 +0100
-
-    ssl-utils: add length validation for SNI extension
-    
-    Add copy of the definition in a comment, remove check for empty
-    extension such that export info can be added if the extension is empty.
-    Remove check for empty HostName, this cannot happen (and is caught by
-    ssl_add_vector).
-    
-    Change-Id: Ie63b97e89dc7254f159abb338b52f5f894a8564d
-    Reviewed-on: https://code.wireshark.org/review/19939
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 6c1d140
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 3 17:19:32 2017 +0100
-
-    ssl-utils: add length validation for Cookie extension
-    
-    Also adds the definition from TLS 1.3 draft 18 spec.
-    
-    Change-Id: Ic7910874507e76dcbe7ae15aff99c91496a2b590
-    Reviewed-on: https://code.wireshark.org/review/19938
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit bdbe1e2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 3 17:14:52 2017 +0100
-
-    ssl-utils: add length validation for renegotiation_info extension
-    
-    Add description from spec, remove zero-length extension check since it
-    is not allowed by specification.
-    
-    Change-Id: I4bf85b36d933db3658f7788768fd794b6199187e
-    Reviewed-on: https://code.wireshark.org/review/19937
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f3eb00a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 3 17:06:40 2017 +0100
-
-    ssl-utils: add length validation to NPN extension
-    
-    Add the definition from draft 4 as well (which describes the structure
-    in text). Remove the check for zero length name since this is normally
-    not the case (according to draft specification).
-    
-    Change-Id: I72c3f04a5146d4c4fa291383258246d9ba2b14be
-    Reviewed-on: https://code.wireshark.org/review/19936
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit e19084f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 3 15:51:31 2017 +0100
-
-    ssl-utils: add validation for ALPN
-    
-    Use ssl_add_vector to ensure that the lengths are checked for validity
-    and that expert info is added when invalid data is encountered.
-    
-    Change-Id: I5d03dce988f695cdc305f1bfff9d19ae90c5f6e2
-    Reviewed-on: https://code.wireshark.org/review/19935
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 658253b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 3 15:15:10 2017 +0100
-
-    (D)TLS: simplify SignatureAndHashAlgorithm dissection
-    
-    Merge the length parsing into the SignatureAndHashAlgorithm vector
-    parsing. Remove extra expert info which are replaced by the generic
-    ones.
-    
-    Tested with a mutated pcap where the signature length field is off by
-    one (too large = expert error, too small = expert warning, as expected).
-    
-    Change-Id: I43350352ae00eb42bbe5c2ee81289fb592b88f86
-    Reviewed-on: https://code.wireshark.org/review/19933
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 4623b05
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 3 14:31:08 2017 +0100
-
-    ssl-utils: refactor "length" parameter into "offset_end" for extensions
-    
-    Change all Hello extension dissector functions to accept the end of the
-    extension rather than the extension length. The changes are quite
-    mechanical: change "ext_len" to "ext_len = offset_end - offset".
-    
-    Remove some "offset += ext_len" to ensure that additional unparsed data
-    is warned for.
-    
-    The intent is that (extension) dissectors can easier check for overflow
-    (offset + 2 < offset_end). Later changes should remove "guint ext_len"
-    with appropriate changes (like replacing by ssl_add_vector).
-    
-    Change-Id: Ic4846e6fd6164685c4704984136f701bec3afa58
-    Reviewed-on: https://code.wireshark.org/review/19932
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f6b7857
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 3 01:13:32 2017 +0100
-
-    ssl-utils: add helper for validating Variable Length Vectors
-    
-    Currently variable length vectors are mostly unchecked with issues
-    ignored (see various "XXX - expert info"). In order to detect possible
-    attacks (and catch dissector issues), add helpers that extract the
-    vector length and that validate that a vector is correctly terminated.
-    Further dissection of a vector stops when not enough data is available.
-    
-    The KeyShare extension and Extension itself are modified as a start,
-    more should follow. Future work should also ensure that the return value
-    represents the length after dissection (which should not exceed the
-    length). Also, the length field needs to be converted to an "offset_end"
-    value to ease overflow checking (length = offset_end - offset).
-    
-    Change-Id: I6d757da2eb028f08a7b18661660313a6afd417e0
-    Reviewed-on: https://code.wireshark.org/review/19926
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 4f532f5
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Feb 5 11:14:56 2017 +0100
-
-    Bluetooth: Update Assign Numbers
-    
-    Updated on 5th February 2017:
-    - UUIDs
-    - Company Ids
-    
-    Change-Id: I9868891ee2bdcdaa687bd45c76429f2b476889cc
-    Reviewed-on: https://code.wireshark.org/review/19973
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 015adf8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Feb 5 19:51:31 2017 +0100
-
-    rawshark: fix err code.
-    
-    Change-Id: I5aec3ad14eb0f0d591691f2aa7eb8ce09341e020
-    Reviewed-on: https://code.wireshark.org/review/19963
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b774638
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Feb 5 12:16:02 2017 +0100
-
-    Bluetooth: ATT: Implement "Resolvable Private Address"
-    
-    "Resolvable Private Address" comes in Core 5.
-    Also fix expert infos (usage) for all GAP characteristics are
-    described in Core 5.
-    
-    Change-Id: I8386f5908b64cb758e2a973fb6f92fabcb30885a
-    Reviewed-on: https://code.wireshark.org/review/19974
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0eda452
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Feb 5 13:04:56 2017 +0100
-
-    Bluetooth: SDP: Add HDP MDEP Data Type values for ISO/IEEE 11073-20601
-    
-    Values found at Bluetooth SIG: Assign Number:
-    https://www.bluetooth.com/specifications/assigned-numbers/health-device-profile
-    
-    Change-Id: Ic99129e717f1de22162f5e398fa5b81ff3dcdc5a
-    Reviewed-on: https://code.wireshark.org/review/19975
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cde0937
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Feb 4 23:53:10 2017 +0100
-
-    llc: replace GHashTable and glib allocator with wmem.
-    
-    Change-Id: Ia7736e0faff16dd73d56a91b5a96cc715e3ce75d
-    Reviewed-on: https://code.wireshark.org/review/19953
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 850393b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Feb 4 23:41:10 2017 +0100
-
-    geoip_db: remove leak.
-    
-    Change-Id: I40911820fa09111c167a5c526027f10381038dbb
-    Reviewed-on: https://code.wireshark.org/review/19952
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 5df6983
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Jan 31 19:27:51 2017 +0100
-
-    checkfiltername: Add llc.bluetooth_pid to the whitelist
-    
-    "llc.bluetooth_pid" is now placed in bluetooth-file, it seems to be
-    fine, but there is a need to avoid terrible/horrible scream from
-    this script.
-    
-    Change-Id: I0bf3f5b5f6459ab1f13a8c2c6ad12859af608e85
-    Reviewed-on: https://code.wireshark.org/review/19969
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 60edcb1
-Author: Oliver Downard <oliver.downard@couchbase.com>
-Date:   Fri Feb 3 12:42:32 2017 +0000
-
-    Couchbase: Add decoding for create_bucket config
-    
-    Change-Id: I7d84e67723196d9b39f6007950ec8fb95fe9a50e
-    Reviewed-on: https://code.wireshark.org/review/19934
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 9ffff86
-Author: Volodymyr Khomenko <Volodymyr_Khomenko@DellTeam.com>
-Date:   Sun Feb 5 21:03:04 2017 +0200
-
-    RSVD dissector: minor fixes
-    
-    DataIn field should be three-state enum (not boolean)
-    See https://msdn.microsoft.com/en-us/library/dn393496.aspx
-    
-    Fixed HandleStateShared value of QUERY_SHARED_VIRTUAL_DISK_SUPPORT reply
-    See https://msdn.microsoft.com/en-us/library/dn409282.aspx
-    
-    Added VHDSET disk format (used by RSVD v2).
-    
-    Change-Id: I7a9528e680dd4fede7e982d98316af5ef40cff3b
-    Reviewed-on: https://code.wireshark.org/review/19964
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a69d0b1
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Thu Feb 2 08:41:52 2017 +0100
-
-    GTK: Add 'in' operator in display filter expression dialog
-    
-    Add the 'in' operator to the list of available operators, where 'eq'
-    operator would be present also. Setup the curly bracket expression in
-    the filter and allow for multiple enums to be selected.
-    
-    Bug: 12808
-    Change-Id: I42b328bcb3328521d193d9cdae56577eb66f8e15
-    Reviewed-on: https://code.wireshark.org/review/19913
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit e35c21c
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Feb 5 08:11:59 2017 -0800
-
-    [Automatic update for 2017-02-05]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Ic3553d0e987fc7c0eafbe42a517f46212d137edc
-    Reviewed-on: https://code.wireshark.org/review/19959
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 19f0721
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 5 15:17:54 2017 +0100
-
-    ieee802.11: fix indent
-    
-    Change-Id: I8d521200b645b7a7b73c1da1d466bfd992c70c17
-    Reviewed-on: https://code.wireshark.org/review/19957
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 5511386
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 5 15:10:58 2017 +0100
-
-    iee80211: fix typo on some tag define
-    
-    Change-Id: Ib3c35d332ef4c4b1b6d66d5fb9de7f87bcf15461
-    Reviewed-on: https://code.wireshark.org/review/19956
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit c9d8c1c
-Author: Martin Kacer <kacer.martin@gmail.com>
-Date:   Thu Jan 19 15:37:54 2017 +0100
-
-    PDML: protocol filter incorrectly filters desired subfields
-    
-    Bug: 12847
-    Change-Id: I8a560dc44dceb06123d8bcecd512d132ee4ebb0d
-    Reviewed-on: https://code.wireshark.org/review/19671
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit a8ceeca
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sat Feb 4 21:09:59 2017 +0000
-
-    DNP3: Fix reassembly of out of order fragments
-    
-    Rework Application Layer fragment reassembly to handle
-    out of order fragments (seen over UDP).
-    
-    Change-Id: Ifd2bffba30f0a419a5f82ea6b9d2d221f7d6d276
-    Reviewed-on: https://code.wireshark.org/review/19947
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit fd2bd2b
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Sun Feb 5 09:23:44 2017 +0100
-
-    [GSA RR] Dissect System Information Type 21
-    
-    Change-Id: I85535dfdb7b064ba81f44ed08c3b1e84e7204e9e
-    Reviewed-on: https://code.wireshark.org/review/19954
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c7622c9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Feb 3 23:06:48 2017 -0500
-
-    pint(.h): Add Modelines and fix indent (use spaces)
-    
-    Change-Id: Icadbf65ad186c775b2a0ca8596d5bf4ba66e4c68
-    Reviewed-on: https://code.wireshark.org/review/19873
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4248a97
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 4 14:23:23 2017 -0800
-
-    There's an RFC for that.
-    
-    Change-Id: If9a3ba7fbd93374b4c63be7ce37510be5c2848f0
-    Reviewed-on: https://code.wireshark.org/review/19948
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 55b3de8
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Feb 2 11:23:24 2017 +0000
-
-    IPv6: Update SRH dissection to draft-*-05
-    
-    Change-Id: Ia61e8ffb4499e2ea25e66e9e05a6d2881f15d6ae
-    Reviewed-on: https://code.wireshark.org/review/19914
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 0b25b1a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Jan 24 14:19:22 2017 +0100
-
-    tap: add cleanup routine.
-    
-    Change-Id: I460b053880ed43a7377b7696531bbaeb0fd0d68b
-    Reviewed-on: https://code.wireshark.org/review/19764
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e595836
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Feb 3 23:37:44 2017 +0100
-
-    tap-stats_tree: use wmem allocator.
-    
-    Change-Id: I17e652bf9c6e8a17c57afa0bc7bb909636152d15
-    Reviewed-on: https://code.wireshark.org/review/19945
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9a47f5c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Feb 3 23:31:01 2017 +0100
-
-    conversation_table: replace g_string with wmem allocated string.
-    
-    Change-Id: I54402822ee24214d13e052c0379514a39de16980
-    Reviewed-on: https://code.wireshark.org/review/19944
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 92601c4
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Feb 3 23:49:27 2017 +0100
-
-    srt_table: add cleanup function.
-    
-    Change-Id: I8d1e9d587f7d47a9064d7b2e0c89f31dc41854ea
-    Reviewed-on: https://code.wireshark.org/review/19946
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6311657
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 11 21:32:55 2016 +0100
-
-    .mailmap: Update (of december)
-    
-    Change-Id: Id96ce391b9957ac37705c503bea35395ee3d358d
-    Reviewed-on: https://code.wireshark.org/review/19207
-    Reviewed-by: Paul Williamson <paul@mustbeart.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 22ab065
-Author: olivermd <oliver.downard@couchbase.com>
-Date:   Thu Feb 2 15:28:59 2017 +0000
-
-    Add support for Couchbase LWW *_with_meta commands
-    
-    Decodes the options and meta length fields added with LWW for
-    {set,del}_with_meta request commands.
-    
-    Decodes get_meta responses extra field.
-    
-    Please see https://issues.couchbase.com/browse/MB-22003
-    
-    Change-Id: Ie5205e8188a32d59145c4f9c499b16c7a7997274
-    Reviewed-on: https://code.wireshark.org/review/19928
-    Reviewed-by: Dave Rigby <daver@couchbase.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a3bd605
-Author: samsaha <ssahasamiran@gmail.com>
-Date:   Wed Feb 1 17:20:38 2017 +0530
-
-    MKA: Padding support for basic-param-set dissection added
-    
-    * It must be multiple of 4 Octets otherwise NULL padding should be there
-    
-    Change-Id: I7563b0407bd70d1f0b7aac8597ce3a757a08925e
-    Reviewed-on: https://code.wireshark.org/review/19893
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1a1e7e4
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Feb 3 09:13:26 2017 +0100
-
-    BTLE: check connection_info presence before trying to perform reassembly
-    
-    Bug: 13379
-    Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e
-    Reviewed-on: https://code.wireshark.org/review/19927
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3481ca8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Feb 2 17:10:51 2017 +0100
-
-    extcap: destroy hash tables on exit.
-    
-    Change-Id: Ia6a1d8a45c36aff7f2bea8bde2ed5f308bddd2e1
-    Reviewed-on: https://code.wireshark.org/review/19919
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit fe06aad
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Feb 2 22:59:21 2017 +0100
-
-    sharkd: fix warning C4090: 'function' : different 'const' qualifiers
-    
-    According to https://msdn.microsoft.com/en-us/library/windows/desktop/ms682425(v=vs.85).aspx
-    the lpCommandLine argument must not be const as is may cause an access violation.
-    
-    Change-Id: Iedd77663cd21ca8df542595890fbc7023f2c9c2b
-    Reviewed-on: https://code.wireshark.org/review/19922
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7c69ae9
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Feb 2 16:43:22 2017 +0100
-
-    dfilter-macro: add cleanup routine.
-    
-    Change-Id: I3de59c0366e9bec058de144eb136abaca24b5911
-    Reviewed-on: https://code.wireshark.org/review/19918
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 370d130
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Feb 2 14:41:46 2017 +0100
-
-    stream: clean up reassembly table.
-    
-    Change-Id: I71bc19eed5de342cd794938e3eb21545249d4853
-    Reviewed-on: https://code.wireshark.org/review/19917
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6031712
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 2 16:12:23 2017 -0800
-
-    Fix builds without libpcap.
-    
-    capture_opts_cleanup() doesn't exist if we're building without libpcap,
-    so don't call it if we're building without libpcap.
-    
-    Change-Id: I9ae33b0c13af2785b5adb380a5b03e89116f67df
-    Reviewed-on: https://code.wireshark.org/review/19925
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 14fba80
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 2 16:00:49 2017 -0800
-
-    Fix builds without libpcap.
-    
-    capture_opts_cleanup() doesn't exist if we're building without libpcap,
-    so don't call it if we're building without libpcap.
-    
-    Change-Id: I6c9defea15fac7df5533269c4945b965d9a67c25
-    Reviewed-on: https://code.wireshark.org/review/19924
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 93a5c83
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Jan 25 10:16:35 2017 +0100
-
-    capture_opts: free memory on exit to avoid leak.
-    
-    This required a restyle of the way the different apps exit.
-    
-    Change-Id: Iedf728488954cc415b620ff0284d2e60f38f87d2
-    Reviewed-on: https://code.wireshark.org/review/19780
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 844cf1a
-Author: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
-Date:   Thu Feb 2 19:40:15 2017 +0100
-
-    NFSv4.2 mode_umask support
-    
-    Add support for the NFSV4.2 mode_umask attribute which will be initially
-    supported by Linux v4.10.
-    
-    Change-Id: Id98e20cd0ed93bf7ad9b2246e9e05299f3d7a9fc
-    Reviewed-on: https://code.wireshark.org/review/19921
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0da95c1
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 19:33:09 2017 +0100
-
-    dtls: Support Decode As for selecting appdata dissector
-    
-    Being able to override (set) the application data dissector without
-    hacks (RSA keys dialog) would be nice. Modelled after
-    v2.3.0rc0-481-gafa2605e43 ("Support Decode As for {SSL,TLS}-over-TCP.")
-    
-    Change-Id: Ic4c5ca55e8f20ad599c41c1df58b24f3bced2281
-    Reviewed-on: https://code.wireshark.org/review/19869
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7893ffa
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 1 13:12:01 2017 +0100
-
-    wsutil/sober128: remove unused macros and functions
-    
-    Removed unused macros/functions that are apparently imported from
-    LibTomCrypt, only LOAD32L and STORE32L are needed. Remove code that
-    tries to distinguish between little/big endian, since WORDS_BIGENDIAN
-    was never defined, this would never have worked on big endian anyway.
-    
-    Remove the special ROR "optimization" for GCC on i386, modern compilers
-    are able to optimize it to exactly the same thing. The generic
-    LOAD32L/STORE32L macros are less optimized (as can be seen in the
-    generated code), but this was not noticable in the mean running time.
-    
-    Tested with the packet capture from bug 3232, the result is the same:
-    
-        tshark -ocorosync_totemnet.private_keys:example.com -r corosync-totemsrp--key:example.com--2nodes.pcap -Vx
-    
-    Bug: 13368
-    Change-Id: I59bf27d7dd990bbcd5ad34a1797f4a6c8a04512d
-    Reviewed-on: https://code.wireshark.org/review/19894
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit f15d5dd
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 13 11:32:20 2017 +0100
-
-    xml: use wmem allocators and replace GHashTable with wmem_map_t.
-    
-    Change-Id: I9dbddc6fd4a5eaa458843343b3e9b8e1832bde8f
-    Reviewed-on: https://code.wireshark.org/review/19630
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit f6e8894
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Jan 31 17:30:02 2017 +0100
-
-    sharkd: make it compile without libGeoIP.
-    
-    Change-Id: Ief867ce8552136298bd6bd6879ec482cc5b38b6f
-    Reviewed-on: https://code.wireshark.org/review/19887
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 179e0fb
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 14:40:56 2017 +0100
-
-    imf: convert GHashTable to wmem_map
-    
-    Change-Id: Ia5bd6af88db76bbe4e0a267c30b6f7749b23e299
-    Reviewed-on: https://code.wireshark.org/review/19903
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 47ad059
-Author: Gianluca Borello <g.borello@gmail.com>
-Date:   Mon Jan 23 08:57:32 2017 -0800
-
-    Rawshark: Add a memory limit (-m) option.
-    
-    Add an option to rawshark that lets the user set a maximum memory limit.
-    
-    Change-Id: Ie102ee5f6ba5aec90a35bd63297184c7dc37662c
-    Reviewed-on: https://code.wireshark.org/review/19911
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit c0d25e8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 14:22:43 2017 +0100
-
-    ncp: convert GHashTable to wmem_map_t.
-    
-    Change-Id: I0de1c332a6052c20f6afbe1e51dfb14e18485891
-    Reviewed-on: https://code.wireshark.org/review/19899
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 577d21e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 1 23:13:42 2017 -0500
-
-    GHashtable -> wmem_map conversions
-    
-    Many of the register_init_routine/register_cleanup_routine functions
-    are for initializing and cleaning up a GHashtable.
-    wmem_map_new_autoreset can do that automatically, so convert many
-    of the simple cases.
-    
-    Change-Id: I93e1f435845fd5a5e5286487e9f0092fae052f3e
-    Reviewed-on: https://code.wireshark.org/review/19912
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 36892d8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 14:29:30 2017 +0100
-
-    iso15765: convert GHashTable to wmem_map.
-    
-    Change-Id: I25fd598f3c2bd75548213140e93198b611f30d4b
-    Reviewed-on: https://code.wireshark.org/review/19900
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 3026652
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 21:59:14 2017 +0100
-
-    tools: add a Gtk/GNOME suppression file.
-    
-    As described here https://wiki.gnome.org/Valgrind valgrind can be
-    tuned for Gtk/GNOME (glib) software by this official (or so) suppression
-    file. Add it to the standard valgrind script to reduce the output
-    for those functions out of Wireshark scope.
-    
-    Change-Id: I5dbc91ce82a890c9c02b624289ced96909be5f84
-    Reviewed-on: https://code.wireshark.org/review/19910
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit efb5c15
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 7 13:30:26 2015 +0100
-
-    Qt: Add extcap placeholder parameter
-    
-    Added a parameter to set placeholder text in textBox.
-    
-    Change-Id: Iccf92fe60abc78be8f0fa112c0c9eb78890674b5
-    Reviewed-on: https://code.wireshark.org/review/12463
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit bd3c2d2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 1 09:40:58 2017 -0500
-
-    Make some more protocols into pinos.
-    
-    Change-Id: I87d842e3efe9f82eaaab81347dfb79d6c0932792
-    Reviewed-on: https://code.wireshark.org/review/19491
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 28d7753
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 1 11:04:54 2017 -0800
-
-    Use INVALID_SOCKET for an invalid socket handle.
-    
-    -1 is fine on UN*X, but, on Windows, it's INVALID_SOCKET.  We define
-    INVALID_SOCKET as (-1) on UN*X, so it can be used on both platforms.
-    
-    Change-Id: Ib2269ddf98c352a1d3c85e44006cc49d80750a78
-    Reviewed-on: https://code.wireshark.org/review/19909
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c46ea01
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 1 10:17:48 2017 -0800
-
-    Fix some more UN*X-vs-Windows issues.
-    
-    Change-Id: Ie9ad31289f0572a7e7249fcb3305849673536f05
-    Reviewed-on: https://code.wireshark.org/review/19908
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ed6c961
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 15:11:15 2017 +0100
-
-    frame: use wmem instead of glib allocator.
-    
-    Change-Id: Ibed5c2418d1dd400fe586d40681fb5ba90efbd9f
-    Reviewed-on: https://code.wireshark.org/review/19906
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 226377f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 15:34:15 2017 +0100
-
-    h460: use wmem for strdup.
-    
-    Change-Id: Iac6027e4b1449a77bc6b0a3d089634a296b8e802
-    Reviewed-on: https://code.wireshark.org/review/19904
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 96b8da7
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 15:25:16 2017 +0100
-
-    h248: convert GTree to wmem_tree.
-    
-    Change-Id: Ia8d1a7ca4ce7e8754ab97ffe5f6e11181f08b264
-    Reviewed-on: https://code.wireshark.org/review/19905
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit add6cb3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 14:37:30 2017 +0100
-
-    ipmi: use wmem instead of glib allocator.
-    
-    Change-Id: I739e0cd9ebe35049b6633a9cfa0f793d66823f9a
-    Reviewed-on: https://code.wireshark.org/review/19901
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0a200b2
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 14:39:10 2017 +0100
-
-    hdcp2: convert GHashTable to wmem_map.
-    
-    Change-Id: If68a73c05bfc301e1cfdba75c090305a5b454979
-    Reviewed-on: https://code.wireshark.org/review/19902
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2cdc1ec
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 13:40:11 2017 +0100
-
-    proto: free memory on cleanup.
-    
-    Change-Id: Ia6cb39cbf6d5b50d39746f38758433a7541219a2
-    Reviewed-on: https://code.wireshark.org/review/19896
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 401a20d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 13:53:19 2017 +0100
-
-    ieee802a: add shutdown routine.
-    
-    Change-Id: I21d0ab5619cde9a43b96eaff351fa338e317f4f9
-    Reviewed-on: https://code.wireshark.org/review/19897
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 57d2705
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 1 13:57:35 2017 +0100
-
-    ndps: convert GHashtable to wmem_map.
-    
-    Change-Id: Id1f46ed533980e67bf18aa13fcc828bf1f5e7f6e
-    Reviewed-on: https://code.wireshark.org/review/19898
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bf14d8f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 1 11:49:30 2017 +0100
-
-    dtls: avoid possible NULL deref
-    
-    "decoder->flow" could result in a NULL pointer dereference if a null
-    cipher was in use (caught by Clang static analyzer).
-    
-    Answering the questions:
-    - DTLS records fragments do not need to be reassembled, thus there is no
-      flow. The Handshake messages have their own fragment_offset field and
-      thus there is no need to maintain an extra flow.
-    - Actually one datagram can contain multiple records (RFC 6347, 4.1.1),
-      but this is not implemented yet. The key can however not be "0"
-      though, it must match the offsets from ssl_get_record_info.
-    
-    Fixes: v2.3.0rc0-2152-g77404250d5 ("(D)TLS: consolidate and simplify decrypted records handling")
-    Change-Id: Iac367a68a2936559cd5d557f877c5598114cadca
-    Reviewed-on: https://code.wireshark.org/review/19892
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 5dde07c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 27 18:20:40 2017 +0100
-
-    GSM A / NAS-EPS: detect missing mandatory information elements
-    
-    Current code is not able to detect missing mandatory information elements
-    because the macro will return once the end of the payload is reached.
-    Remove this check from all mandatory IE macros, and put it at the beginning
-    of optional IE ones. It should allow to detect any missing mandatory IE
-    while still stopping message dissection in case optional IEs are not
-    present.
-    
-    Change-Id: Ie820740e25c1d03ee3462fa4a913c3a7870fcc2d
-    Reviewed-on: https://code.wireshark.org/review/19816
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 2755942
-Author: Allan Møller Madsen <almomadk@gmail.com>
-Date:   Sun Jan 29 22:40:42 2017 +0100
-
-    Bluetooth 5.0, HCI command/event PHY update dissection
-    
-    Dissection of all new HCI command/events related with
-    Bluetooh 5.0 feature 'PHY update - LE 2M and LE Coded'
-    
-    Change-Id: I212cb368d3295ba36eb0ca34329df566cae1611b
-    Signed-off-by: Allan Møller Madsen <almomadk@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/19849
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-
-commit 20bce6f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 31 23:48:27 2017 -0500
-
-    packet-btle.c: If frame information is missing, provide a default.
-    
-    "default" frame information sets no retransmission or more fragments.
-    
-    Bug: 13015
-    Change-Id: I1c8a29fe06d0b38abc789c8e454dc484490186f9
-    Reviewed-on: https://code.wireshark.org/review/19891
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 11ce17f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 31 20:41:38 2017 -0800
-
-    Expand a comment to give more details.
-    
-    (Dear Microsoft: why did you choose not to support line buffering in
-    the MSVC "standard I/O library" routines?)
-    
-    Change-Id: I5add94d2c83e73e9845fea0f355a1923fddf2deb
-    Reviewed-on: https://code.wireshark.org/review/19890
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2b91f04
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Jan 28 22:40:17 2017 +0100
-
-    sharkd: windows support
-    
-    Change-Id: I6581bacdea49416cc26431f66b093f36b39c5a67
-    Reviewed-on: https://code.wireshark.org/review/19829
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e25c458
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jan 31 20:38:58 2017 +0100
-
-    ssl-utils: fix format specifies type 'void *' but the argument has type 'SslFlow *' (aka 'struct _SslFlow *') [-Wformat-pedantic]
-    
-    Change-Id: Iec574db8c28d2e02136e6c4119e5688b21112299
-    Reviewed-on: https://code.wireshark.org/review/19889
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fcf2eb4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 22 15:17:57 2017 +0100
-
-    Openflow (v5): fix redundant redeclaration of ‘dissect_openflow_message_v5’ [-Wredundant-decls]
-    
-    Change-Id: I6340f0b903af1371e69172b05650c49fc18b8890
-    Reviewed-on: https://code.wireshark.org/review/19888
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fe72fe0
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Jan 30 22:13:58 2017 +0100
-
-    Don't provide GTK setup by default.
-    
-    Update comments to reflect the behaviour as well.
-    
-    Update comment inside the
-    
-    Change-Id: Id3629b217a2adc096fd6b0cb0221270e92ebd5da
-    Reviewed-on: https://code.wireshark.org/review/19875
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 6ab483f
-Author: Justin Helgesen <justinhelgesen@gmail.com>
-Date:   Sun Jan 29 15:06:49 2017 -0600
-
-    Add Decode As capabilities to MoldUDP dissector
-    
-    Per the Nasdaq TotalView-ITCH v2/3 protocol specifications the
-    NASDAQ-ITCH dissector needs be able to dissect a MoldUDP payload.
-    
-    Change-Id: Id5194930025a9abdfb1663234233fd51e525a34b
-    Reviewed-on: https://code.wireshark.org/review/19847
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4a1150a
-Author: Arjen Zonneveld <arjen@bz2.nl>
-Date:   Tue Jan 31 14:35:29 2017 +0100
-
-    Also show BGP Shutdown communication on admin reset
-    
-    Shutdown communication is now also allowed on Admin Reset NOTIFICATION messages:
-    https://tools.ietf.org/rfcdiff?url2=draft-ietf-idr-shutdown-04.txt
-    
-    Change-Id: I6450d3d5de5aef4bd709ba2b211ca717784b00a7
-    Reviewed-on: https://code.wireshark.org/review/19886
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 30baa45
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu May 26 13:02:07 2016 +0200
-
-    PAPI: Add dissection of Licence Manager
-    
-    Change-Id: I1b7dd1835fe60852b8c90f0ce5e240813cad89d1
-    Reviewed-on: https://code.wireshark.org/review/15574
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 148fb1a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 31 08:29:53 2017 -0500
-
-    Add wmem allocator parameter to format_uri
-    
-    Change-Id: Ic6de84a37b501e9c62a7d37071b2b081a1a1dd50
-    Reviewed-on: https://code.wireshark.org/review/19885
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 51a3014
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 31 07:51:19 2017 -0500
-
-    format_text_wmem -> format_text
-    
-    All cases of the "original" format_text have been handled to add the
-    proper wmem allocator scope.  Remove the "original" format_text
-    and replace it with one that has a wmem allocator as a parameter.
-    
-    Change-Id: I278b93bcb4a17ff396413b75cd332f5fc2666719
-    Reviewed-on: https://code.wireshark.org/review/19884
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0165b8c
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 30 12:51:19 2017 -0800
-
-    Enable some more tests.
-    
-    The "Microsecond pcap-ng via stdin" and "Nanosecond pcap-ng via stdin"
-    tests work here on macOS and Windows (likely due to g8a141fe), so
-    enable them.
-    
-    Change-Id: I148d02f0cc23162d782457e1d8f0e7c2c0dc6932
-    Reviewed-on: https://code.wireshark.org/review/19877
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 8938a31
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 18:10:00 2017 +0100
-
-    TLS13: partial update of CertificateRequest for draft -18
-    
-    Document structure, did not put much effort in there as the format is
-    subject to change (untested, no pcap available).
-    
-    Change-Id: I2da8c4e005d65314158d038bc0af7411773d8fba
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/19865
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cf4f44e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 05:28:21 2017 +0100
-
-    TLS13: add Encrypted Extensions
-    
-    See https://tools.ietf.org/html/draft-ietf-tls-tls13-18#section-4.3.1
-    
-    Change-Id: I35e049d991be4c242ef2b84db3a322c6a13d2f96
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/19860
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 69ee6ec
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 05:25:11 2017 +0100
-
-    TLS13: handle content type from decrypted record
-    
-    Extract the content type and handle padding per
-    https://tools.ietf.org/html/draft-ietf-tls-tls13-18#section-5.2
-    
-    When TLS 1.3 is detected, rename the "Content Type" field to "Opaque
-    [Content] Type" and add a new generated field for the content type that
-    was extracted from the decrypted contents.
-    
-    Change-Id: I149a5d7e2493dded6e2c0190e170fa350f76466e
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/19859
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit aaa6551
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 17:51:46 2017 +0100
-
-    TLS13: update Certificate for draft -18
-    
-    Note that RPK (RFC 7250) is not well-defined and is left untouched.
-    https://github.com/tlswg/tls13-spec/issues/722
-    
-    Certificate extensions dissections remains a task for later.
-    
-    Change-Id: I62276e59db94429e4c09058aca3c08f390ec3af7
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/19864
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c5adada
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 18:16:06 2017 +0100
-
-    TLS13: fix CertificateVerify dissection for -18
-    
-    digitally-signed is gone in TLS 1.3. ClientKeyExchange/ServerKeyExchange
-    are gone, so effectively modifying this function is good enough to cover
-    CertificateVerify dissection (ssl_dissect_hnd_cli_cert_verify).
-    
-    See https://tools.ietf.org/html/draft-ietf-tls-tls13-18#page-58
-    
-    Change-Id: I07f621bc088d810a3f35343bec7a0a3303b1426b
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/19866
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ec38330
-Author: Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
-Date:   Mon Jan 30 19:13:20 2017 +0100
-
-    Support for NSH with Ethernet encapsulation
-    
-    Change-Id: I88bc4924add4d89c1386cb1be9d27233cef861f1
-    Reviewed-on: https://code.wireshark.org/review/19867
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 52d62a6
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 30 16:30:45 2017 -0800
-
-    WSDG: Update some of the NSIS text.
-    
-    Recommend v3 instead of v2.
-    
-    Change-Id: I13260611dd6b12372aba8938a87574cd9a8e1a47
-    Reviewed-on: https://code.wireshark.org/review/19880
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 58fb6e1
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jan 29 23:19:48 2017 +0100
-
-    test: add (D)TLS test for AEAD ciphers
-    
-    TLS and DTLS share the same code for decryption of AEAD ciphers.
-    Add tests for all possible AEAD cipher modes (GCM, CCM, CCM_8).
-    PSK is used to reduce the handshake size (removing certificates).
-    
-    The decryption suite passes these tests on:
-    
-    * Libgcrypt 1.6.5 (Ubuntu 14.04)
-    * Libgcrypt 1.7.6 (Arch Linux)
-    * Libgcrypt 1.4.5 (CentOS 6). Note that the GnuTLS packages are too old,
-      so tests that depend on RSA keys fail here (but the new tests pass).
-    
-    Change-Id: If0dc5b94223fb247062e23960ff66dfdd4f7a902
-    Reviewed-on: https://code.wireshark.org/review/19850
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d4e3975
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 27 07:55:55 2017 +0100
-
-    BGP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I0569326140c88a6dd2d7e2b8819c9f5323a98670
-    Reviewed-on: https://code.wireshark.org/review/19810
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a402c1c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jan 30 22:38:20 2017 -0500
-
-    format_text -> format_text_wmem for wlan dialogs
-    
-    format_text_wmem uses NULL scope in GUI dialogs
-    
-    Change-Id: Ifaa342e034de9f99b59169cdf0c7ddc52ff67597
-    Reviewed-on: https://code.wireshark.org/review/19882
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cc47932
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jan 30 23:18:51 2017 -0500
-
-    Have tvb_format_text use wmem_packet_scope() memory.
-    
-    It's only use is in dissectors or other tree creation APIs (where
-    packet scope is valid), so have it use format_text_wmem with
-    wmem_packet_scope().
-    
-    Change-Id: I1f34e284a870c9844c6b27f4ae08a1e7efe54098
-    Reviewed-on: https://code.wireshark.org/review/19883
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 93e7103
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 14:29:12 2017 +0100
-
-    TLS: add bare essentials for TLS 1.3 decryption support
-    
-    The bare essentials are now in place to perform decryption
-    (HKDF-Expand-Label, calculation of traffic secrets, AEAD integration).
-    Can successfully decrypt the initial handshake message. Only AES ciphers
-    are supported, ChaCha20-Poly1305 still needs to be added.
-    
-    Note: "decryption" indeed works, but dissection needs to be updated. The
-    padding must be stripped and the content type extracted.
-    
-    Ping-Bug: 12779
-    Change-Id: I3869c9ae5131e57519be99c5f439c4fa68841bae
-    Reviewed-on: https://code.wireshark.org/review/19858
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 17b98fe
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 02:00:18 2017 +0100
-
-    ssl-utils: add AEAD authentication check
-    
-    Unauthenticated data should not be displayed as valid. Validate the
-    authentication tag, similar like how MAC checks are done for block
-    ciphers. This requires Libgcrypt 1.6 or newer.
-    
-    Tested against the (D)TLS AEAD tests on Libgcrypt 1.4.5 (CentOS 6),
-    1.6.5 (Ubuntu 14.04), 1.7.6 (Arch Linux). Compile-tested w/o Libgcrypt.
-    
-    Change-Id: Iee15f4ccc5bbe01a50677167fa9c50c1ffe382d3
-    Reviewed-on: https://code.wireshark.org/review/19853
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5f0edb2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Sep 20 21:26:43 2016 +0200
-
-    ssl-utils: refactor AEAD decryption handling
-    
-    The current ssl_decrypt_record is hard to understand due to mixing CBC
-    concepts (MAC, padding) with AEAD. Extract the AEAD functionality and
-    use better variable naming.
-    
-    The "Plaintext" debug print now includes just the plaintext (the auth
-    tag is stripped). A write_iv.data_len check is added just to be sure and
-    more prep work is done for auth tag validation and TLS 1.3 support.
-    
-    Tested against the (D)TLS AEAD tests on Libgcrypt 1.4.5 (CentOS 6),
-    1.6.5 (Ubuntu 14.04), 1.7.6 (Arch Linux). Compile-tested w/o Libgcrypt.
-    
-    Change-Id: I94dd2fd70e1281d85c954abfe523f7483d9ac68b
-    Reviewed-on: https://code.wireshark.org/review/19852
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7e7445c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 29 22:19:57 2017 -0500
-
-    Have hfinfo_format_text use format_text_wmem.
-    
-    Use NULL scope to be safe.
-    
-    Change-Id: I1967737cf6a1c90cc2e0476d3f2ace63aa0c9153
-    Reviewed-on: https://code.wireshark.org/review/19857
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ad5cb2e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 29 22:00:39 2017 -0500
-
-    Have tvb_format_stringzpad use wmem_packet_scope() memory.
-    
-    It's only use is in dissectors, so have it use
-    format_text_wmem with wmem_packet_scope().
-    
-    Change-Id: I22121324fd47aee32174b65104458ad2ef329bd7
-    Reviewed-on: https://code.wireshark.org/review/19856
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d802b5b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 29 21:53:49 2017 -0500
-
-    Add format_text_wmem.
-    
-    This allows for a wmem_allocator for users of format_text who want
-    it (dissectors for wmem_packet_scope()).  This lessens the role of
-    current format_text functionality in hopes that it will eventually
-    be replaced.
-    
-    Change-Id: I970557a65e32aa79634a3fcc654ab641b871178e
-    Reviewed-on: https://code.wireshark.org/review/19855
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 60a8771
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 30 21:33:44 2017 +0100
-
-    ISAKMP: Add Forticlient (connect License and EndPoint Control) from Fortinet Vendor ID
-    
-    Change-Id: Idf40de8bfa76cbe4437a157fc90bd994d4b2233e
-    Reviewed-on: https://code.wireshark.org/review/19872
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4d506a0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 19:41:29 2017 +0100
-
-    coap: add support for coaps (DTLS-secured CoAP)
-    
-    coaps port is defined in RFC 7252, section 12.7.
-    
-    CoAP (RFC 7252) is defined only for UDP, not TCP. For TCP, the frame
-    format is slightly different (draft-ietf-core-coap-tcp-tls-05) and
-    needs more dissector changes, so remove registration for now.
-    
-    Change-Id: I1fc7163086f8fe66986565aa24b579ef24f72550
-    Ping-Bug: 13370
-    Reviewed-on: https://code.wireshark.org/review/19870
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 977d076
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jan 30 19:13:01 2017 +0100
-
-    dtls: fallback to data dissector if nothing took care of it
-    
-    Also unconditionally show the encrypted appdata record, matching the SSL
-    dissector. Now the bytes are always linked to a field.
-    
-    Change-Id: Ie65cd5fc6620d53da46a94cdb1972863702b452c
-    Reviewed-on: https://code.wireshark.org/review/19868
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit bd86a45
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 30 12:52:35 2017 -0800
-
-    Dumpcap: Improve an error message.
-    
-    Dumpcap doesn't yet support capturing pcapng from stdin. On Windows,
-    make sure we invalidate our file handle so that instead of printing
-    
-      "Error reading from pipe: The operation completed successfully. (error 0)"
-    
-    we show the more useful
-    
-      "Capturing from a pipe doesn't support pcapng format."
-    
-    Change-Id: I472c1bf5c8520c9ee3fe4b6299a6e0250262ea51
-    Reviewed-on: https://code.wireshark.org/review/19876
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d5b053d
+commit 63943ab
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Jan 30 14:07:55 2017 +0100
+Date:   Tue Jun 20 15:12:48 2017 -0400
 
-    Qt: Use system DateTimeFormat in QDateTimeEdit
+    Qt: Create the user profiles dir at startup
     
-    In extcap argument ExtArgTimestamp set DisplayFormat to system DateTimeFormat.
+    Ensure the user profiles directory is created at startup so that
+    users can put downloaded profiles without creating the directory.
     
-    Change-Id: I281d6cc1aa59e785a75d6f1c8ff9780ba5ad9eba
-    Reviewed-on: https://code.wireshark.org/review/19863
+    Change-Id: Ib06bb3055daef8fd9e78d7887ce56f8fe50e48bf
+    Reviewed-on: https://code.wireshark.org/review/22275
     Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 07c1832
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Jan 30 11:07:36 2017 +0100
-
-    Remove unused variable initialization.
-    
-    Change-Id: I674afef24938f3b860171d87640a6228ee042e82
-    Reviewed-on: https://code.wireshark.org/review/19862
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit bde5441
-Author: Kenneth Soerensen <knnthsrnsn@gmail.com>
-Date:   Wed Jan 11 19:49:14 2017 +0100
-
-    ZigBee: Add attribute and command names from Metering used with GBCS.
-    
-    The Great Britain Companion Specification specifies how energy meters
-    will communicate in the UK. This patch adds names for attributes and
-    commands from the Smart Energy Metering cluster that are used within
-    that specification.
-    
-    Futhermore take care of Change 19481 for ZigBee Smart Energy.
-    
-    Bug: 13360
-    Change-Id: Ia229265f9dc2168c8977303f3540c2ffc1bb5a0a
-    Reviewed-on: https://code.wireshark.org/review/19768
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f789c91
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 29 18:51:00 2017 -0500
-
-    Have format_text_wsp use wmem allocated memory.
-    
-    format_text_wsp is fed into by tvb_format_text_wsp and tvb_format_stringzpad_wsp
-    so those functions need to add a wmem allocated parameter as well.
-    Most of the changes came from tvb_format_text_wsp and tvb_format_stringzpad_wsp
-    being changed more so than format_text_wsp.
-    
-    Change-Id: I52214ca107016f0e96371a9a8430aa89336f91d7
-    Reviewed-on: https://code.wireshark.org/review/19851
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9365fd3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 28 22:29:32 2017 -0500
-
-    Convert GHashTable -> wmem_map_t for ASN.1 disseectors
-    
-    Change-Id: Id749c41947c6300f2c82ed947352c336f9e45b72
-    Reviewed-on: https://code.wireshark.org/review/19838
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 984d78d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jan 29 17:16:53 2017 -0800
-
-    Clean up indentation.
-    
-    Change-Id: I0815bf008ed056e3cd400a24fb10abb4ca88c3ce
-    Reviewed-on: https://code.wireshark.org/review/19854
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c44c8f9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 29 14:19:25 2017 -0500
-
-    Have format_text_chr use wmem allocated memory.
-    
-    Change-Id: Idcea59f6fc84238f04d9ffc11a0088ef97beec0c
-    Reviewed-on: https://code.wireshark.org/review/19844
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b3035df
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Jan 27 22:30:34 2017 +0100
-
-    (D)TLS: fix type of record sequence number
-    
-    The record sequence number is 64-bit, not 32-bit. This applies to all
-    SSLv3/TLS/DTLS versions. Without this fix, after about four million
-    records, the wrong MAC is calculated (for TLS 1.2) or decryption will
-    fail (for TLS 1.3).
-    
-    Change-Id: I05e5e8bc4229ac443a1b06c5fe984fb885eab1ca
-    Reviewed-on: https://code.wireshark.org/review/19824
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 9fb9bc5
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Sun Jan 29 22:09:15 2017 +0100
-
-    Use g_list_prepend, it's more efficient.
-    
-    Change-Id: Ic13f60a3e700f3d8325063079f032eda47eaf22f
-    Reviewed-on: https://code.wireshark.org/review/19848
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9b7ccdc
-Author: Moshe Kaplan <me@moshekaplan.com>
-Date:   Sun Jan 29 14:04:26 2017 -0500
-
-    Fix typo in autogen.sh
-    
-    Change-Id: I7048dc9bf49a1e83302563db269c6a89a17c6df0
-    Reviewed-on: https://code.wireshark.org/review/19843
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 4aa8d58
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jan 29 08:10:45 2017 -0800
-
-    [Automatic update for 2017-01-29]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I4a55af48f03ec5940c2a5fd902a57c7b06ac0e37
-    Reviewed-on: https://code.wireshark.org/review/19839
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit af54b29
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 28 19:53:36 2017 -0500
-
-    Register reassembly tables
-    
-    Register all reassembly tables with a central unit, allowing the
-    central unit to have the callback that initializes and destroys
-    the reassembly tables, rather than have dissectors do it individually.
-    
-    Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4
-    Reviewed-on: https://code.wireshark.org/review/19834
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ed8ac81
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Jan 24 13:53:57 2017 +0100
-
-    ipx: Convert GHashtable to wmem_map
-    
-    Change-Id: If7994b2bc5d341f381e0f15a0d6179ad73bf9367
-    Reviewed-on: https://code.wireshark.org/review/19763
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3dd6e2c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jan 26 14:11:35 2017 +0100
-
-    ssl: add expert info for unexpected messages in TLS 1.3
-    
-    This will also avoid invoking ssl_finalize_decryption which will not be
-    used for TLS 1.3.
-    
-    Change-Id: I958508276488764ad1a82e6412504bcd72f3b995
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/19823
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4de1983
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Dec 22 17:54:35 2016 -0500
-
-    Bugfix MPEG descriptor Logon Initialize Descriptor tag.
-    
-    Do length checks in case not all fields are present to prevent
-    malformed packets.
-    
-    Bug: 13237
-    Change-Id: Ie7cc3006fa33f1dedeffb09a4f35adb8dee8e9f6
-    Ping-Bug: 13238
-    Reviewed-on: https://code.wireshark.org/review/19390
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 55703ad
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 28 17:44:50 2017 -0800
-
-    Fix decoding of T.30 over T.38.
-    
-    In change 9bcac48403de9aff6435d0f48028ae1f72f64528, "t30.hdlc" was
-    inadvertently changed to "t30.hdlc""rtp"; this meant that we didn't
-    actually find the T.30 dissector, as we were looking for it under the
-    name "t30.hdlcrtp".
-    
-    Change-Id: Ic1c1daf558926afdb43ac9220940f3ac0159d247
-    Reviewed-on: https://code.wireshark.org/review/19835
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 39e30aa
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 28 16:51:32 2017 -0800
-
-    Allow Decode As for T.38-over-TCP and T.38-over-UDP.
-    
-    This got lost as part of change 9132706b2dca67c4991edf0f3779d1d43d4b3f65
-    - that removed the explicit registering, with a port number, in the
-    tcp.port and udp.port dissector tables, *without* replacing it with a
-    dissector_add_for_decode_as() registering it *without* a port number.
-    
-    Change-Id: I9ae22418553c143d51f9a78f5c0901f2f6490351
-    Reviewed-on: https://code.wireshark.org/review/19832
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e4c1e42
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 28 21:55:52 2017 +0000
-
-    Revert "Check whether we need -lm for fmod."
-    
-    This reverts commit aaac50cfde090f4c7e71472ae8bf8e8ea67a1d44.
-    
-    Not clear that this is the problem.
-    
-    Change-Id: I5a0547eb4fda1a1ac7a6548c75ba6bc5e4b82d61
-    Reviewed-on: https://code.wireshark.org/review/19830
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit aaac50c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 28 13:07:27 2017 -0800
-
-    Check whether we need -lm for fmod.
-    
-    Apparently, fmod may be in -lm even if cos isn't.
-    
-    Change-Id: Ifef1246ccd1ae1e17e4bbbab120c6181092c7786
-    Reviewed-on: https://code.wireshark.org/review/19827
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9bf42ae
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Jan 22 21:30:41 2017 +0100
-
-    tcap: convert GHashTables into wmem.
-    
-    Change-Id: I95509cada53d363320a5a5d9e36612d7a85d7ef3
-    Reviewed-on: https://code.wireshark.org/review/19741
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d94d7fc
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 28 09:34:04 2017 -0500
-
-    wmem_map_new -> wmem_map_new_autoreset
-    
-    A few dissectors can benefit from the conversion.
-    
-    Change-Id: I3b7d54926b79314009e271960aff61870a115390
-    Reviewed-on: https://code.wireshark.org/review/19826
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 120a1eb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 28 12:31:29 2017 -0500
-
-    wmem: Delay creation of map table until its needed
-    
-    wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), ...)
-    doesn't have "file" scope ready at startup to create hash table
-    and will assert.
-    
-    Change-Id: I3437f45ef42bf8635e4d504cf073fc3fb0c9a8cd
-    Reviewed-on: https://code.wireshark.org/review/19825
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-
-commit 8f81dd4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Jan 25 21:52:27 2017 +0100
-
-    TLS: fix decryption of renegotiated sessions
-    
-    Renegotiated sessions may interleave application data with handshake
-    records. These handshake records should however not be included in the
-    flow associated with the application data. This fixes a regression in
-    the previous patch, now the "1.12 Step: SSL Decryption (renegotiation)"
-    test passes again.
-    
-    Also remove duplicate DTLS data sources for decrypted records.
-    
-    Change-Id: I46d416ffba11a7c25c5a682b3b53f06d10d4ab79
-    Fixes: v2.3.0rc0-2152-g77404250d5 ("(D)TLS: consolidate and simplify decrypted records handling")
-    Reviewed-on: https://code.wireshark.org/review/19822
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0ce7b55
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 24 08:27:58 2017 -0500
-
-    qsig: Remove unnecessary hash table functionality
-    
-    The information from qsig_opcode2oid_hashtable could be derived directly from
-    qsig_op_tab, and get_op() can serve as a lookup instead of qsig_oid2op_hashtable.
-    
-    Change-Id: Ibc5b20ff9ff46b1644c6a6c2c90ee1c4ac131e45
-    Reviewed-on: https://code.wireshark.org/review/19743
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6cff5c6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 25 23:07:23 2017 -0500
-
-    Add wmem_map_new_autoreset
-    
-    This can be used similarly to wmem_tree_new_autoreset for hash tables that need
-    reset after capture file change.
-    
-    Change-Id: I3a2f0b0a0cad3eca46266523c594d3d7aac17489
-    Reviewed-on: https://code.wireshark.org/review/19794
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 618df24
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Jan 28 12:47:47 2017 +0100
-
-    decode_as: Initialize decode_as_list after free
-    
-    Initialize decode_as_list = NULL after free to avoid random crashes
-    in g_list functions after changing profile.
-    
-    This bug was introduced in g5c7b0b96
-    
-    Change-Id: Ibc752f245115c5a426989e20e0ab9d0f0faac43d
-    Reviewed-on: https://code.wireshark.org/review/19821
+    (cherry picked from commit 4f1053c5464de12b635a8cf4128b78d51f6f3deb)
+    Reviewed-on: https://code.wireshark.org/review/22278
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit a949d78
-Author: Anders Broman <a.broman58@gmail.com>
-Date:   Sat Jan 28 10:29:52 2017 +0000
-
-    Revert "MPLS: relax pw_eth_heuristic and improve 1st nibble logic"
-    
-    This reverts commit 01ddd93a7296b54a2048de74691984a7e78e4cb9.
-    
-    Change-Id: I90f19fec52d3f1edc63fd00e614173a0154503d4
-    Reviewed-on: https://code.wireshark.org/review/19820
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1bfa581
+commit 1c212eb
 Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Jan 22 09:01:33 2017 -0800
-
-    Snort: add a preference to show alert in reassembled frame
-    
-    Change-Id: Ia29d451857995b186c88193c9722ae156eb3f66d
-    Reviewed-on: https://code.wireshark.org/review/19729
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 01ddd93
-Author: Francesco Fondelli <francesco.fondelli@gmail.com>
-Date:   Tue Jan 10 08:54:52 2017 +0000
-
-    MPLS: relax pw_eth_heuristic and improve 1st nibble logic
-    
-    relax pw_eth_heuristic and, at the same time, improve
-    the 1st nibble logic in dissect_mpls in order to disambiguate
-    between Ethernet pseudo-wire without a control word, with the MAC
-    address's first nibble being 4/6 and IPv4/6 packet.
-    
-    Bug: 13301
-    Change-Id: If4697c2e40271d84e2db11a9f64ee60a8657e164
-    Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/19599
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ac68c43
-Author: Adam Mitz <mitza@ociweb.com>
-Date:   Mon Jan 23 14:16:08 2017 -0600
-
-    Updated parsing of ParticipantMessageData submessages.
-    
-    Zero-length octet sequences don't need to show <MISSING> for their contents.
-    
-    Change-Id: I89662ff8cd29563981ba9e1b34dc82023b6a070e
-    Reviewed-on: https://code.wireshark.org/review/19755
-    Reviewed-by: Juan Jose Martin Carrascosa <juanjo@rti.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ee18544
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 24 23:06:04 2017 -0500
-
-    rtmpt: Ensure sequence count is incremented for stored fragments
-    
-    Bug: 13347
-    Change-Id: I351c80dea8ac7a9f2540b40782b1cc5c0b8fdaed
-    Reviewed-on: https://code.wireshark.org/review/19777
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7740425
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Jan 25 21:52:27 2017 +0100
-
-    (D)TLS: consolidate and simplify decrypted records handling
-    
-    Previously there was a distinction between decrypted handshake
-    Application Data records ("Decrypted SSL data") and some others (like
-    Alerts, Handshake and Heartbeat, "Decrypted SSL record"). Remove this
-    distinction and always decrypt the payload before passing it on and
-    always display a data sources for decrypted contents ("Decrypted SSL").
-    
-    This is prepatory work for TLS 1.3 support where the content type is
-    located in the encrypted record, having the record decryption in one
-    place makes it easier to adapt.
-    
-    Change-Id: I92c51c7f9e87e5c93231d28c39a8e896f5afd1ef
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/19789
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 990b5dc
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Jan 27 21:20:51 2017 +0100
-
-    Qt: Add exported packet files to the recent files
-    
-    Update the recent files list when exporting specified packets to file.
-    
-    Change-Id: I4e7dd7f943aa99ab9d5f3fd88444d730434970e9
-    Reviewed-on: https://code.wireshark.org/review/19818
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 26d930f
-Author: Jordan Keister <grokspawn@gmail.com>
-Date:   Thu Jan 26 16:55:51 2017 -0600
-
-    GPTv2: add CIoT optim support indication and ePCO IEs dissection
-    
-    Change-Id: I87239a5af8476c1285e68cfbd45e62b89f1440eb
-    Reviewed-on: https://code.wireshark.org/review/19808
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 784bd04
-Author: Thomas PORTASSAU <thomas.portassau@hotmail.fr>
-Date:   Fri Jan 27 09:31:57 2017 +0100
+Date:   Sun Jun 18 22:01:04 2017 +0100
 
-    Delete unsed variable in ccid
+    Misc snort fixes.
     
-    Change-Id: I4c9eff4248f25c15ef4d525e0a4360bf3bdb480c
-    Reviewed-on: https://code.wireshark.org/review/19813
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 6d4e340
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 27 08:10:56 2017 +0100
-
-    sharkd(session): Fix Value stored to 'frame' during its initialization is never read
-    
-    Change-Id: Ia7e351167edc0ca5c48e284bee0c940bba12c6d7
-    Reviewed-on: https://code.wireshark.org/review/19812
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b5fe13f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 27 07:02:34 2017 +0000
-
-    dicto (RFC5580) fix typo
-    
-    From FreeRADIUS
-    
-    typo.  Fixes https://github.com/FreeRADIUS/freeradius-server/pull/1882
-    
-    Alan T. DeKok@2017-01-18T18:09:05Z
-    Files modified:
-            * share/dictionary.rfc5580
-    
-    Commit diff:
-    https://github.com/FreeRADIUS/freeradius-server/commit/f22f1bf53c3a316865cc20cb1b1f27d9706cc472
-    
-    Change-Id: I7f64d97352a453ff22dac45e9e9737af80fc1b2c
-    Reviewed-on: https://code.wireshark.org/review/19811
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6313e96
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Jan 25 10:57:49 2017 +0100
-
-    Qt: Hide "Go to Packet" frame when closing capture file.
-    
-    The "Go to Packet" frame cannot be used without a capture file so
-    ensure we hide this when closing a capture file.
-    
-    Change-Id: I339bc90b87181a8361e9f0bf27dfdf26d2f05333
-    Reviewed-on: https://code.wireshark.org/review/19783
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7f4d849
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Jan 23 09:18:53 2017 +0100
-
-    prefs: Preserve UTF-8 characters in preferences.
-    
-    When saving preferences the strings in string lists must not be
-    escaped with g_strescape() because this will destroy UTF-8 characters.
-    
-    Because this strings only should use printable characters we manually
-    escape quote and backslash, and skip non-printable.
-    
-    Bug: 13342
-    Change-Id: I57e492dff746a5ecc0aee809f946a615ad110b4d
-    Reviewed-on: https://code.wireshark.org/review/19738
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 87f4dc0
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Jan 25 20:28:34 2017 +0100
-
-    Qt: Preference editor improvements.
-    
-    Use correct disconnect() signature to ensure everything is disconnected
-    before connecting new signals.  Without this all previous connects() are
-    still active.  This leads to gradually more and more syntax checks being
-    called for each change, and possibility of a wrong syntax check
-    (especially for strings which has no syntax check).
-    
-    Use the textEdited() signal to trigger a syntax check at startup.
-    This gives consistency.
-    
-    Do not clear preferenceLineEdit when done because it looks weird when
-    the preference text disappears while the widget is hiding.  The entry
-    is cleared before next show anyway.
-    
-    Change-Id: I21c6fd8ec6bb0ecff1b2c0b66fe97dc3eaecf9b3
-    Reviewed-on: https://code.wireshark.org/review/19788
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dc86242
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jan 26 12:07:49 2017 +0100
-
-    ssl-utils: recognize new TLS 1.3 keylog format
-    
-    Implemented by BoringSSL, an older description can be found at:
-    https://github.com/google/boringssl/commit/e776cc29568e520aaabc83188cc7db7991f0b776
+    - search for content fields taking into account length of last match
+    - handle absolute path to file file inclusion not using $RULE_PATH
+    - parse longer tokens (saw emerging-threats rule with enormous pcre)
+    - content offset is relative to start of frame, *not* previous content match
+    - show content modifiers 'rawbytes' and 'http_user_agent'
     
-    Implementation pending at OpenSSL:
-    https://github.com/openssl/openssl/pull/2287
-    
-    NSS bug (still open):
-    https://bugzilla.mozilla.org/show_bug.cgi?id=1287711
-    
-    Proposal for PicoTLS:
-    https://github.com/h2o/picotls/issues/6
-    
-    Change-Id: Ib597f48e296d286d8f6d30873ca03e7d6324a3c4
-    Ping-Bug: 12779
-    Reviewed-on: https://code.wireshark.org/review/19801
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9f60038
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Jan 25 15:35:09 2017 +0100
-
-    sharkd: fix potential division-by-zero issue
-    
-    The interval parameter is user-supplied and is used as divisor.
-    
-    Change-Id: I9cbbecb71da3991c1712cb87e93de072cc950224
-    Reviewed-on: https://code.wireshark.org/review/19787
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 69c29d7
-Author: Thomas PORTASSAU <thomas.portassau@hotmail.fr>
-Date:   Tue Jan 24 03:26:58 2017 -0500
-
-    CCID added dwFeatures, bStatus bitmasks and IFSD in class description
-    
-    Change-Id: I2855c83c6b5e9add3f34d72a2f2ed3394bf79b78
-    Reviewed-on: https://code.wireshark.org/review/19761
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ffea2f8
-Author: dsrsupport <eugene.exarevsky@dsr-company.com>
-Date:   Thu Jan 26 13:09:54 2017 +0300
-
-    ZigBee: fix endian for File Version field in OTA
-    
-    That field parsed as Big Endian, while all data in ZigBee is Little Endian.
-    Not change to LE.
-    
-    Change-Id: I782ba5d17ca9f2208dc4e2f08ca2c731f4d683e4
-    Reviewed-on: https://code.wireshark.org/review/19800
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d66ee14
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Jan 26 09:25:25 2017 +0100
-
-    Qt: Signal number of active captures
-    
-    Adds a signal, which emits the number of active captures
-    
-    Change-Id: I637106294e331e7fc7607f6fd7704492e22fa7ac
-    Reviewed-on: https://code.wireshark.org/review/19799
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 795b5d4
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Tue Jan 24 19:42:18 2017 +0100
-
-    Add 'in' operator in display filter expression dialog
-    
-    Add the 'in' operator to the list of available operators, where 'eq'
-    operator would be present also. Setup the curly bracket expression in
-    the filter and allow for multiple enums to be selected.
-    
-    Ping-Bug: 12808
-    Change-Id: Ibeef52ba9d41549d0684b0069270ff09f5a93e81
-    Reviewed-on: https://code.wireshark.org/review/19767
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 6a99a2c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 25 23:15:13 2017 -0800
-
-    Cast arguments to socklen_t.
-    
-    That should squelch some warnings on Windows.
-    
-    Change-Id: I55b394be12203e14af023fdcc5d46564d0fcfa34
-    Reviewed-on: https://code.wireshark.org/review/19797
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5fbcfd6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 25 22:20:07 2017 -0800
-
-    Clean up some UN*X-vs-Windows socket issues.
-    
-    Have a wsutil/socket.h file, for inclusion by everything that uses
-    sockets, that contains the UN*X-vs-Windows #includes and #defines to
-    hide some UN*X-sockets vs. Winsock API differences.  That stuff mostly
-    comes from from extcap/extcap-base.h; have that file just include
-    wsutil/socket.h rather than defining that stuff itself.
-    
-    Include it in sharkd_daemon.c.  Use socklen_t for the size of things to
-    pass to bind() as the last argument; wsutil/socket.h defines it as int
-    on Windows.
-    
-    Ignore sharkd in Git.
-    
-    Change-Id: I3f2171b7aa613717f52305f62bfd7d43e0172dc6
-    Reviewed-on: https://code.wireshark.org/review/19796
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1165dfc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 25 21:29:54 2017 -0800
-
-    Make some variables 64-bit, to avoid overflows.
-    
-    Assume that the relative milliseconds could be 64-bit, and make the
-    indices calculated from it 64-bit as well.
-    
-    Change-Id: Ie1248c9440172b85ffbb05461ef1ee07c371fc3c
-    Reviewed-on: https://code.wireshark.org/review/19795
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 19028eb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 25 20:27:13 2017 -0500
-
-    Fix sharkd compiling on Windows
-    
-    Change-Id: I8c614189159f1263d9452d495cee34d1a2c1bfcb
-    Reviewed-on: https://code.wireshark.org/review/19790
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit eeab554
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 24 22:17:49 2017 -0500
-
-    ldss: Ensure ldss_file_request_t structure gets allocated
-    
-    Bug: 13346
-    Change-Id: I83175fefeef5035039e378dd68ffdcd0787970b8
-    Reviewed-on: https://code.wireshark.org/review/19775
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ee177fe
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Jan 25 12:21:06 2017 +0100
-
-    x11: add shutdown routine.
-    
-    Change-Id: I22b64a10ab3d0dcaccbea775b03ef3f82797697f
-    Reviewed-on: https://code.wireshark.org/review/19784
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0385a09
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Jan 25 10:38:49 2017 +0100
-
-    Qt: Use preference editor for port number entries
-    
-    After converting port preferences to use Decode As entries the preference
-    editor was no longer used when changing port number pereferences from the
-    Packet Details popup menu.
-    
-    Change-Id: Ifeff3b88bfd96a122b6a58d8917304eb69cf0c38
-    Reviewed-on: https://code.wireshark.org/review/19781
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 53c7f0a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Jan 25 15:06:42 2017 +0100
-
-    CMake,autotools: remove unneeded files, fixes build
-    
-    sharkd does not perform any capturing, so do not include related
-    libraries and files. This fixes the CMake build too.
-    
-    Change-Id: Ie002b09dbf60070e34dacc8ae7dadee6690d4db8
-    Reviewed-on: https://code.wireshark.org/review/19786
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit bceb614
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Jan 25 10:53:16 2017 +0100
-
-    sharkd: add cmake option.
-    
-    Change-Id: I4f961061f67aab86270f03c8f320245cf80ab70e
-    Reviewed-on: https://code.wireshark.org/review/19782
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit cfe7b85
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 24 22:40:07 2017 -0500
-
-    wsp: Sanity check capability length
-    
-    Bug: 13348
-    Change-Id: I64abc79475087f1c971419629b5c86e646123f3f
-    Reviewed-on: https://code.wireshark.org/review/19776
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 29d0f40
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 25 00:08:16 2017 -0800
-
-    Put sharkd.h into the distribution.
-    
-    Change-Id: I0e831a5448fc6247ccca033ae512a3fa74351c63
-    Reviewed-on: https://code.wireshark.org/review/19779
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e2930f3
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Sat Oct 15 20:48:17 2016 +0200
-
-    Add sharkd - daemon variant
-    
-    sharkd listens on UNIX socket and allows external clients
-    to run commands like: loading file, analysing frames or running TAP(s).
-    
-    Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766
-    Reviewed-on: https://code.wireshark.org/review/18208
-    Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-
-commit 1157420
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 24 19:42:11 2017 -0800
-
-    Clean up EVPN NLRIs dissection.
-    
-    Do the NLRI length checks in the switch cases for each route type, and
-    do them for *all* route types, rather than throwing a random check in
-    for one particular route type.
-    
-    There is no need to fail up front for unknown route types; at least
-    dissect the type and length, and fail in the switch statement.
-    
-    Dissect the route descriptor in each of the switch cases, after the
-    length check, rather than doing it up front.
-    
-    Add a comment noting where the prefix route type comes from.
-    
-    Change-Id: Iae26ecd467d4b36dbcf52e7998bd2881405281aa
-    Reviewed-on: https://code.wireshark.org/review/19774
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 538b6fc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 24 18:48:19 2017 -0800
-
-    Add URL for the AoE spec.
-    
-    Change-Id: I6e4fc624e6b4270a1db2b680e4d449c504bd56ee
-    Reviewed-on: https://code.wireshark.org/review/19773
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2e01a94
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 24 17:30:00 2017 -0800
-
-    That field is a route type, not an address family identifier.
-    
-    Change-Id: I547dd12479b9634d8176eca9fd2ae6c9e1f87981
-    Reviewed-on: https://code.wireshark.org/review/19772
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 61de3e5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 24 16:50:45 2017 -0800
-
-    Clean up and update list of RFCs and I-Ds supported.
-    
-    Change-Id: Ided8496b1d57a7906c805bca4ed848903d553721
-    Reviewed-on: https://code.wireshark.org/review/19771
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7c014c0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 24 16:40:13 2017 -0800
-
-    Update comment, clean up identation.
-    
-    Change-Id: I30812657e3fa5dc21e64ed2fb7605e5f2a36ab03
-    Reviewed-on: https://code.wireshark.org/review/19770
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1ee1e14
-Author: Erik de Jong <erikdejong@gmail.com>
-Date:   Mon Dec 12 21:49:39 2016 +0100
-
-    Dissector: IndigoCare nursecall protocols support
-    
-    Adds support for IndigoCare nursecall protocols
-    
-    Bug: 13241
-    Change-Id: I83098c15d467ea42da8301c6b6a5568d9892fc60
-    Reviewed-on: https://code.wireshark.org/review/19224
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4e2b2d4
-Author: Adam Mitz <mitza@ociweb.com>
-Date:   Mon Jan 23 14:15:42 2017 -0600
-
-    RTPS: avoid errors when encountering empty sequences of strings
-    
-    Change-Id: Ida9d2e6d632104ec3c6594f5ec500fec49a971a4
-    Reviewed-on: https://code.wireshark.org/review/19754
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 87f24a7
-Author: Adam Mitz <mitza@ociweb.com>
-Date:   Mon Jan 23 14:15:19 2017 -0600
-
-    RTPS: updated ContentFilterProperty field names to match the spec
-    
-    Change-Id: I17a8b51dbcb502624a83177135b31fdbe72fa118
-    Reviewed-on: https://code.wireshark.org/review/19753
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 68fd576
-Author: ruengeler <ruengeler@wireshark.org>
-Date:   Mon Jan 23 17:04:50 2017 +0100
-
-    Fix segfault, when only one TSN is captured
-    
-    Change-Id: Ibb6494e1f180ec8187d260245731d33ac16085eb
-    Reviewed-on: https://code.wireshark.org/review/19745
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d284cfd
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Jan 22 21:25:13 2017 +0100
-
-    dvbci: add shutdown routine.
-    
-    Change-Id: I3f950ce227818b6dae11ac89e4a8ec636294a6ec
-    Reviewed-on: https://code.wireshark.org/review/19740
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Dario Lombardo <lomato@gmail.com>
-
-commit 7b69c87
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 24 01:15:24 2017 -0800
-
-    Add a comment talking about the dictionary file format.
-    
-    Point to the FreeRADIUS man page for the dictionary file format, and
-    mention features we don't support - including features *not* documented
-    in the man page.
-    
-    Change-Id: I08085062a6abcafb9dd0abe5b1edee53187ea23f
-    Reviewed-on: https://code.wireshark.org/review/19762
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c301356
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Mon Jan 23 21:58:10 2017 +0100
-
-    WSUG: Display filter: add matches, contains, bitwise_and
-    
-    Added examples for the matches, contains and bitwise_and operators.
-    Most of the text and the examples have been taken from the wiki and the
-    wireshark-filter manpage.
-    
-    Bug: 13320
-    Change-Id: Icd9a325c05ecd4ecd1cbde8162a4c88cae335d1d
-    Reviewed-on: https://code.wireshark.org/review/19758
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 288fb5e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 23 12:11:51 2017 -0800
-
-    Fuzz: Fix the capinfos check (again).
-    
-    Capinfos might return 1 *or* 2 for an invalid capture.
-    
-    Change-Id: I1ff2ed2a5b252a77a894ad3fe10c983e9a2a1bc0
-    Reviewed-on: https://code.wireshark.org/review/19752
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 57894f7
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 23 10:09:33 2017 -0800
-
-    DHCPv6: Avoid integer overflows.
-    
-    Count using ints instead of guint16s.
-    
-    Make sure dissect_packetcable_ccc_option and
-    dissect_packetcable_cccV6_option return positive values while we're
-    here.
-    
-    Bug: 13345
-    Change-Id: Ic303ddc266f46ee3144e079731742c85808faf37
-    Reviewed-on: https://code.wireshark.org/review/19747
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 9cece7c
-Author: Gerald Combs <gerald@zing.org>
-Date:   Mon Jan 23 07:43:59 2017 -0800
-
-    GTK+: Yell at the user less.
-    
-    Change some exclamation points in error and warning messages to periods.
-    
-    Change-Id: Ie084c40cf54362b43462bf4f6a29134caa101387
-    Reviewed-on: https://code.wireshark.org/review/19744
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 781f035
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jan 23 09:43:33 2017 -0800
-
-    ASTERIX: Avoid an integer overflow.
-    
-    Count using a guint instead of a guint8.
-    
-    Bug: 13344
-    Change-Id: Ic7d337dbb29b92ebb8332f50fd47b5ba2aa3f41e
-    Reviewed-on: https://code.wireshark.org/review/19746
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit b70929e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 23 07:52:24 2017 +0100
-
-    tcp_graph (Gtk) Fix Dereference of null pointer
-    
-    Change-Id: Ie07ed9f2bcf719340ea607d679620916aa93ba72
-    Reviewed-on: https://code.wireshark.org/review/19736
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6eca591
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 23:27:17 2017 +0100
-
-    tools: allow multiple suppression file for valgrind.
-    
-    Change-Id: I7074705230deb3d24df8f2ea694a3a485c848efd
-    Reviewed-on: https://code.wireshark.org/review/19711
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 110ffac
-Author: MustBeArt <paul@mustbeart.com>
-Date:   Fri Jan 20 13:04:59 2017 -0800
-
-    DVB-S2-BB: Support all four MA modes
-    
-    Support all four mode adaptation input and output interfaces defined in
-    SatLabs reference document sl_561, "Mode Adaptation Input and Output
-    Interfaces for DVB-S2 equipment", instead of only the two modes that use
-    a sync byte.
-    
-    There is nothing in the packet format that specifies which format is in
-    use, so we have to guess based on the possible occurrence of a sync byte
-    and the CRC-protected BBHEADER that follows the mode adaptation header,
-    which is a different length for each format. This is a heuristic dissector,
-    so if none of the four formats match, we just return.
-    
-    Unfortunately, the BBHEADER CRC is only 8 bits, so there can be false
-    matches rather often. We detect when the packet matches more than one format,
-    and issue an expert info diagnostic. It is also possible for a UDP packet
-    that isn't DVB-S2 at all to match spuriously, with probability around 1%
-    (assuming random data). This is acceptable for a heuristic dissector,
-    especially one that is initially disabled.
-    
-    Standardize spelling per sl_561: adaption -> adaptation
-    
-    Change-Id: Iffc73ed01c72d1247e2378d648ffe0d7c1f21612
-    Reviewed-on: https://code.wireshark.org/review/19708
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 82b61bb
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Jan 22 12:14:33 2017 -0800
-
-    Qt: Reject drag and drop if we're capturing.
-    
-    Ignore drag enter events in the main window and warn the user if we
-    can't open files (which presumably means we're in the middle of a
-    capture).
-    
-    Don't yell at the user in the corresponding GTK+ code.
-    
-    Change-Id: Iffb5df5969c7ff76a854247b4b8d10d0e4b02e70
-    Reviewed-on: https://code.wireshark.org/review/19734
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 936ebfe
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 19 23:52:25 2017 +0100
-
-    ISAKMP: Add Fortigate (Fortinet) Vendor ID
-    
-    Display also release (and build)
-    
-    Change-Id: Ib97f47a0b0179712a82f0aee0ca079a05b8b590c
-    Reviewed-on: https://code.wireshark.org/review/19730
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 308e1de
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 22 11:19:13 2017 +0100
-
-    DNS: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Ib376127546aa15806ed37a7c26fe29b0fa80225c
-    Reviewed-on: https://code.wireshark.org/review/19722
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 59d2081
-Author: Benoît Canet <benoit@scylladb.com>
-Date:   Sun Jan 22 15:57:10 2017 +0100
-
-    CQL: Add support for prepared batch statement
-    
-    This portion of the code was never completed.
-    Complete it.
-    
-    Change-Id: Iaa139b8c6d50a5ce3a7039000e9af38fab3d6124
-    Signed-off-by: Benoît Canet <benoit@scylladb.com>
-    Reviewed-on: https://code.wireshark.org/review/19725
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 7318222
-Author: Volodymyr Khomenko <Volodymyr_Khomenko@DellTeam.com>
-Date:   Fri Jan 20 15:02:22 2017 +0200
-
-    SMB2: better RSVD flow
-    
-    Fixed FSCTL_QUERY_SHARED_VIRTUAL_DISK_SUPPORT dissector
-    to show fields of response properly - see
-    https://msdn.microsoft.com/en-us/library/dn409282.aspx
-    
-    Mapped few SMB2 IOCTL codes related to RSVD to names
-    (like FSCTL_STORAGE_QOS_CONTROL that is defined by MS-SQOS
-    as a helper for RSVD protocol)
-    
-    Added RSVD-specific SMB2 status codes
-    (used in SMB2 transport when RSVD is in use or inited)
-    See https://msdn.microsoft.com/en-us/library/dn392518.aspx
-    
-    Change-Id: I04d80df234505e8b32773ac95cf0b73f07cc5581
-    Reviewed-on: https://code.wireshark.org/review/19693
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 79f3d8f
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sun Jan 22 13:20:56 2017 +0100
-
-    MAN wireshark-filter: Add ~ operator
-    
-    The tilde (~) operator was missing as an alternative for matches.
-    
-    Bug: 13320
-    Change-Id: Idb96c802145dcdd0d9ffc196b32370cadd8735b3
-    Reviewed-on: https://code.wireshark.org/review/19723
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 013125a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 22 15:14:46 2017 +0100
-
-    reassemble: fix no previous prototype for ‘reassembly_table_free’ [-Wmissing-prototypes]
-    
-    Change-Id: Idb4b821e013a79777897d2f837cb8c3861e3c85f
-    Reviewed-on: https://code.wireshark.org/review/19724
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 73d3f79
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jan 22 08:11:54 2017 -0800
-
-    [Automatic update for 2017-01-22]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I75ec9ed3b0ef02d18dee79f629291e7bc1c81467
-    Reviewed-on: https://code.wireshark.org/review/19726
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 799827b
-Author: Kevin Hogan <kwabena@google.com>
-Date:   Fri Jan 20 20:57:09 2017 -0800
-
-    Qt: Add Goodput graph (ACK rate), and minor bug fixes
-    
-    Add Goodput graph:
-     - measures rate of ACKed bytes (including SACKed bytes)
-     - useful to compare to throughput during slow-start to estimate
-         bottleneck rate
-    
-    Add graph selection checkboxes to multi-plot graphs:
-     - most important for Throughput, since there are good cases
-         for showing a subset of graphs at once
-     - also added for Window Scale, since the addition is similar
-         to that for Throughput
-    
-    Minor bug fixes:
-     - allow zoom rect to work when growing in any direction
-         (not just right and up)
-     - keep stray mouse clicks from re-doing a previous zoom
-     - hide rubber band if active when keypress changes mouse mode
-         to drag
-     - allow mouse clicks on open space or grpah to return to default focus
-         (i.e. focus on graph)
-    
-    Change-Id: Id29356ceec810ebdbed9c3c0d8415416401fe643
-    Reviewed-on: https://code.wireshark.org/review/19718
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 21a3b8c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 7 08:52:23 2017 -0500
-
-    Internalize struct preference
-    
-    Move "struct preference" into prefs.c, essentially creating a "private"
-    structure to handle preferences. The 2 motivating factors were:
-    1. Better memory management so that clients/users of API don't have to worry
-    about it.
-    2. Hide the ugliness of the union stuff and make it transparent to the API.
-    
-    A few bugs related to preference <-> Decode As integration were fixed
-    while in the neighborhood.
-    
-    Change-Id: I509b9a236235d066b139c98222b701475e0ed365
-    Reviewed-on: https://code.wireshark.org/review/19578
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 76cf1d0
-Author: Roland Knall <rknall@gmail.com>
-Date:   Fri Jan 6 11:56:09 2017 +0100
-
-    Qt: Implement Custom CMake
-    
-    Implement the custom cmake calls analog to the gtk version
-    
-    Change-Id: I426d2a2df5a4bfb6fc385b970e3944415d3c8afd
-    Reviewed-on: https://code.wireshark.org/review/19563
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4ff9bdd
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Mon Jan 16 22:14:26 2017 +0100
-
-    wmem: fix rb-tree data printer feed
-    
-    When using a data printer for the red/black tree it is fed with the
-    nodes of the tree. But nodes can be either subtree or data nodes.
-    Don't feed the subtree nodes to the data printer. The data printer can't
-    recognize it as such, can't handle it, or worse, could break stuff.
-    
-    Change-Id: Ibbc1311d901c0d0c52e710f951dd53620f2c3d0f
-    Reviewed-on: https://code.wireshark.org/review/19652
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b83bbd9
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Fri Jan 20 07:59:12 2017 -0500
-
-    packet-frame: Make interface_name a filterable field.
-    
-    Change-Id: I1cc180abd7e73e5aea55b1b7eef9dc4b0e66e164
-    Reviewed-on: https://code.wireshark.org/review/19692
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7722003
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 20 23:10:43 2017 +0100
-
-    DNS: use formatted text in add_rr_to_tree() and add_opt_rr_to_tree
-    
-    Since the fix for bug 13289, an empty string can be returned by get_dns_name.
-    Ensure that:
-    - a malformed encoding with no characters and a length > 1 triggers an exception
-    - the formatted version is used to add info in tree.
-    
-    Bug: 13339
-    Change-Id: I88125a351904eabb5cededfbfe1d5ef14ea61ecc
-    Reviewed-on: https://code.wireshark.org/review/19714
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0212739
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 21 00:21:18 2017 -0800
-
-    One more cf_merge_files_to_tempfile() call needed to be changed.
-    
-    Change-Id: Id109e316714fd1c4843f9ffe1b866ec0e5f5c126
-    Reviewed-on: https://code.wireshark.org/review/19719
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a5fe96e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 20 12:26:32 2017 -0800
-
-    Qt: Fixup drag and drop merging.
-    
-    Make the behavior of MainWindow::dropEvent match the documentation and
-    dnd_open_file_cmd. If we've been passed a single file, open it. If we've
-    been passed multiple files, merge them first. Add an is_tempfile
-    parameter to openCaptureFile.
-    
-    Add a note about setting the drop description on Windows.
-    
-    Bug: 12129
-    Change-Id: I325a4da5a29e940b4efa7654627d8bcafba15b57
-    Reviewed-on: https://code.wireshark.org/review/19717
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 05fbb48
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jan 20 16:05:56 2017 -0800
-
-    Qt: Show merge progress.
-    
-    Add "file merge" callback plumbing. Use it to display "Merging files" in
-    the main statusbar.
-    
-    Make sure we have a usable window pointer when we merge files.
-    
-    Change-Id: I236b6edb30685f0b06703ab8304bc88ae592f83c
-    Reviewed-on: https://code.wireshark.org/review/19716
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 317649f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 17:02:52 2017 +0100
-
-    reassemble: add cleanup routine.
-    
-    Change-Id: I948d342a29aacc2212076359e5b073113c50c5de
-    Reviewed-on: https://code.wireshark.org/review/19697
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d020990
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 14:52:05 2017 +0100
-
-    conversation_table: add cleanup function.
-    
-    Change-Id: Icea963384c16b1ad5387a885219d0621b470181b
-    Reviewed-on: https://code.wireshark.org/review/19699
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fecf0d8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 12:19:18 2017 +0100
-
-    dissector_filters: add cleanup function.
-    
-    Change-Id: I9694a8e817e357061a60c425fb5881d525ed8143
-    Reviewed-on: https://code.wireshark.org/review/19695
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7e03647
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 12:01:56 2017 +0100
-
-    dcerpc: add shutdown routine.
-    
-    Also use g_hash_table_new_full to ease the free procedure.
-    
-    Change-Id: I0a411cccbd651cca18e94a048722bf5520903deb
-    Reviewed-on: https://code.wireshark.org/review/19691
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5c7b0b9
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 10:30:59 2017 +0100
-
-    decode_as: clean memory on exit.
-    
-    Change-Id: Ifbbfc1ff71c32c2e9b758b55d32bff9a1ccd1576
-    Reviewed-on: https://code.wireshark.org/review/19689
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5235c2e
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 22:37:55 2017 +0100
-
-    atalk: add check in shutdown routine
-    
-    Change-Id: I52c00fa143c8562cdb195679f28590d7f2bb30c8
-    Reviewed-on: https://code.wireshark.org/review/19709
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit d6b19f5
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 12:33:18 2017 +0100
-
-    packet: add post_dissectors cleanup.
-    
-    Change-Id: I9924425f1754c151552f41e23d20c7d4e6f1bf29
-    Reviewed-on: https://code.wireshark.org/review/19696
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 76d9d3d
-Author: Chris Bontje <cbontje@gmail.com>
-Date:   Fri Jan 20 11:30:31 2017 -0700
-
-    Identify Ethertype 0x892B (Schweitzer Engineering Labs layer 2 traffic).
-    
-    Change-Id: I5479ed21116dd8f91f231ebd1ec230892df9a404
-    See: http://standards-oui.ieee.org/ethertype/eth.txt
-    Reviewed-on: https://code.wireshark.org/review/19707
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d6282d5
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 16:19:15 2017 +0100
-
-    infiniband: add shutdown routine.
-    
-    Change-Id: I3e7c1b8f589662a81c665b8b43056f20c17428ca
-    Reviewed-on: https://code.wireshark.org/review/19704
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Change-Id: I0a4e0b857c8049380ed6aa47e4a3d3649e84d4ad
+    Reviewed-on: https://code.wireshark.org/review/22211
+    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3cf4f8a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 17:08:57 2017 +0100
-
-    corosync-totemnet: add shutdown routine.
-    
-    Change-Id: Ib2e93c012ec0547d4eb5968d1bf47b0e1489f3df
-    Reviewed-on: https://code.wireshark.org/review/19649
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cc30ba1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 16:07:10 2017 +0100
-
-    gssapi: add shutdown routine.
-    
-    Change-Id: If4d474b3c94019c6ef46f4ed5753a6a90625b1b1
-    Reviewed-on: https://code.wireshark.org/review/19650
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f739232
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 19 22:53:35 2017 +0100
-
-    giop: add shutdown routine.
-    
-    Change-Id: I954dd66d38390a1f67e8a0604bfdebb062a6f644
-    Reviewed-on: https://code.wireshark.org/review/19682
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 712d2ae
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 16:04:44 2017 +0100
-
-    ber: add shutdown routine.
-    
-    Change-Id: Idc494f6be0f2fd2187f21bccb870d24655ce1da5
-    Reviewed-on: https://code.wireshark.org/review/19647
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 81cbd4c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 14:51:47 2017 +0100
-
-    aim: add shutdown routine.
-    
-    Change-Id: Ide2f6f55902a42baa3c36f9c3ad6fd392b6a48c3
-    Reviewed-on: https://code.wireshark.org/review/19698
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d865d98
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 16:12:49 2017 +0100
-
-    zvt: add shutdown routine.
-    
-    Change-Id: Ied5ab457a372a74c1a7216002f5ea615ea2a5252
-    Reviewed-on: https://code.wireshark.org/review/19701
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 83d83df
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 15:23:46 2017 +0100
-
-    zbee: add shutdown routine
-    
-    Change-Id: I12ed488a26bde3a85cd75f61dad8f78412cd52ac
-    Reviewed-on: https://code.wireshark.org/review/19700
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 98718aa
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 16:17:10 2017 +0100
-
-    6lowpan: add shutdown routine.
-    
-    Change-Id: I1e324f9d7fdf4d96d8d9d53cbf1932458a2ea1a5
-    Reviewed-on: https://code.wireshark.org/review/19703
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6afcb11
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 16:15:11 2017 +0100
-
-    atalk: add shutdown routine.
-    
-    Change-Id: Ie35e457ba69fccc3ff45df76a21c747249788a20
-    Reviewed-on: https://code.wireshark.org/review/19702
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit db8b81b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 20 10:59:01 2017 +0100
-
-    rpc: add shutdown routine.
-    
-    Change-Id: Ic00dae4b73ef89d6108c8c3085b7ce5a99d88574
-    Reviewed-on: https://code.wireshark.org/review/19690
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c6cb16b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 19 16:21:20 2017 +0100
-
-    sshdump: add sudo option.
-    
-    Basic installation of tcpdump (the default remote capture binary)
-    don't have setcap option. Give the user the option to run tcpdump
-    with sudo (already possible with a custom remote capture command).
-    
-    Change-Id: I273798b5f7dc63b468b03eb633bfc60f53e30743
-    Reviewed-on: https://code.wireshark.org/review/19672
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 132cd6d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 20 09:58:09 2017 +0100
-
-    DNS: update name_len variable when replacing name string
-    
-    Bug: 13334
-    Change-Id: I07248747f678d4f89bbde33280b4d596462a4429
-    Reviewed-on: https://code.wireshark.org/review/19688
+    (cherry picked from commit d19c3a22b927db0dc83bcad9e024a8ed8f866671)
+    Reviewed-on: https://code.wireshark.org/review/22269
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 5c0003a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 19 22:32:51 2017 +0100
-
-    disabled_protos: add cleanup function.
-    
-    Change-Id: I7d585404463691946e2aa67e14e53edb813d9be8
-    Reviewed-on: https://code.wireshark.org/review/19681
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 387e7af
+commit 5897c97
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 20 08:08:52 2017 +0100
-
-    tap-tcp-stream.h: fix double declaration introduced in g73b5e3d
-    
-    Change-Id: I2656e323b9ea6d41566ab0cef1e4a94e3591b08c
-    Reviewed-on: https://code.wireshark.org/review/19687
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f2c0248
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 19 21:57:08 2017 +0100
+Date:   Tue Jun 20 02:49:07 2017 +0200
 
-    follow-stream: add cleanup function.
+    GTPv2: put dissection under GTPv2 protocol item
     
-    Change-Id: Icfe7de118bc49da57f537601c2f256e4a028b4e2
-    Reviewed-on: https://code.wireshark.org/review/19680
+    Bug: 13813
+    Change-Id: Ic1582406896b2d4d3505ae1d3bb79cdbafa481da
+    Reviewed-on: https://code.wireshark.org/review/22247
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6bf8e5b
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jan 16 09:53:56 2017 +0100
-
-    Bluetooth: HCI_EVT: Implement "LE Direct Advertising Report"
-    
-    It is part of Bluetooth Core 4 specification.
-    
-    Change-Id: I7a1e542285d65452d99f753b27777fff80ad1c59
-    Reviewed-on: https://code.wireshark.org/review/19646
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c38f2be
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jan 19 15:23:29 2017 -0800
-
-    Qt: Fix a sequence dialog crash.
-    
-    If gui.geom.SequenceDialog.maximized is TRUE, loadGeometry will trigger
-    a resize event, which will in turn call resetAxes. Call loadGeometry
-    after we've initialized our various QCustomPlot bits so that resetAxes
-    doesn't crash.
-    
-    Bug: 13329
-    Change-Id: I4d27683fb3eee0a7c897800401bfa3869e97662b
-    Reviewed-on: https://code.wireshark.org/review/19683
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 96f07a0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 19 17:36:50 2017 -0800
-
-    Fix typo.
-    
-    Change-Id: I46be1220c8e789e1006cfbf7cff60e9556ff2caf
-    Reviewed-on: https://code.wireshark.org/review/19685
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 73b5e3d
-Author: Kevin Hogan <kwabena@google.com>
-Date:   Tue Jan 17 20:30:26 2017 -0800
-
-    Qt: modify RTT graph (handle GSO, SACK, etc), plus bug fixes
-    
-    Modifications to RTT graph:
-     - change x-axis to time (s) rather than sequence number
-        [ avoids sequence number wraparound ambiguity, plus
-           easier to correlate RTT changes to tcptrace graph ]
-     - change RTT computation to properly handle acks to GSO packets
-     - change RTT computation to take SACK blocks into account
-    
-    Bug fixes:
-     - eliminate potential memory leak if some packets are unacked
-     - ensure RTT graph is shown if TCPGraph window is opened to it directly
-    
-    Change-Id: I2bdcab97399ebde0f15c78fa19c882529a814580
-    Reviewed-on: https://code.wireshark.org/review/19662
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 069a532
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 19 22:34:26 2017 +0100
-
-    LDAP: fix wrong use of g_strlcpy introduced in gc397add
-    
-    Last parameter is the destination buffer size, not the number of bytes to copy.
-    
-    Bug: 13332
-    Change-Id: I9a6f5231d2d7a94fd5e692e8bbf4f5dba30b7c1a
-    Reviewed-on: https://code.wireshark.org/review/19677
+    (cherry picked from commit 59670461b00414d504b2a9ed9e7bafeab65a7420)
+    Reviewed-on: https://code.wireshark.org/review/22270
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5df8d09
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 19 22:58:32 2017 +0100
-
-    packet: clean shutdown routines.
-    
-    Change-Id: I620c683d77c724181a506e10f9d06a3944878690
-    Reviewed-on: https://code.wireshark.org/review/19679
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 27960cc
-Author: Ashish Shukla <shukla.a@gmail.com>
-Date:   Thu Jan 19 08:30:56 2017 -0500
-
-    Always display vht mcs data rate, but mark invalid assuming BCC encoding.
-    
-    Bug: 12859
-    Change-Id: Iaf2242b0dcf16f211d5a7565b96099cc44e8bf3d
-    Reviewed-on: https://code.wireshark.org/review/17899
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 07541f1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Dec 13 12:40:22 2016 +0100
-
-    epan: add shutdown function for dissectors.
-    
-    Dissectors can register shutdown functions, that will be called
-    just before program exit. Those function will free the memory
-    allocated during the init function.
-    
-    Change-Id: Id88228af2cc916bfb316fe7b36d46499f6e4f8d4
-    Reviewed-on: https://code.wireshark.org/review/19282
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 86c4808
-Author: MustBeArt <paul@mustbeart.com>
-Date:   Fri Jan 13 22:47:25 2017 -0800
-
-    DVB-S2-BB: Obey frame format from BB Header fields
-    
-    Interpret packet contents according to the descriptive fields contained
-    in the BB header. Instead of always assuming a Generic Stream frame format,
-    use the TS/GS field to detect Generic Stream, Generic Packetized, Transport
-    Stream, or (reserved) frame formats and decode accordingly.
-    
-    In the case of Generic Stream frames, check the validity of header fields
-    ISSYI, NPD, and UPL, and issue expert info if they are invalid for Generic
-    Stream frames. Then dissect as GSE (as before).
-    
-    For other frame formats, just dump them as bytes for now.
-    
-    Change-Id: I6b040207f83369110eb704c543861c887f77baa7
-    Reviewed-on: https://code.wireshark.org/review/19634
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d691b0e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jan 19 10:28:35 2017 -0500
-
-    Remove space character from ETHERWATCH magic key
-    
-    V6.0 only has one space after "ETHERWATCH", not two so heuristics fail.
-    "ETHERWATCH " (one space) still seems like enough of a distinction.
-    
-    Bug: 13093
-    Change-Id: Ib8786f6e2f5f595a4cab710b91cf78d175a6ab88
-    Reviewed-on: https://code.wireshark.org/review/19673
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit af073d4
-Author: Radhashyam Behera <radhashyambehera@gmail.com>
-Date:   Fri Jan 6 17:22:09 2017 +0530
-
-    IEEE80211: Updated VHT Group ID Management
-    
-    Detailed decode of Membership status & User Position in GroupID Mamagement frame.
-    
-    Bug: 13322
-    Change-Id: I74b1d93757e3e10a2a0d4423fcfdcd2265e1bd62
-    Reviewed-on: https://code.wireshark.org/review/19564
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 259a3e5
-Author: Kevin Hogan <kwabena@google.com>
-Date:   Tue Jan 17 16:53:42 2017 -0800
-
-    Qt: add graph of unacked (outstanding) bytes to window scale graph
-    
-    This metric is commonly used as an estimate of the sender's congestion window.
-    [ when examining a capture taken from the sender ]
-    
-    Change-Id: I812d5556cef477c08ef1e5d396fbdddda9a6751e
-    Reviewed-on: https://code.wireshark.org/review/19661
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit c397add
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Jan 4 15:53:56 2017 +0100
-
-    dns: change get_dns_name to return consumed bytes + actual name len.
-    
-    Because of the DNS name encoding, the consumed bytes in the tvb and
-    the length of the string of the dns name can be different. We need
-    to handle them separately for the purpose they are. Moreover the
-    name string can contain null bytes, then we can't rely on strlen()
-    but we need the actual length.
-    
-    Subsequent calls to proto_tree_add_string() will require to pass
-    the string to format_text() in order have non-printable characters
-    printed.
-    
-    Bug: 13289
-    Change-Id: I6d0b295867ece265f8995f82da2c629992aeb703
-    Reviewed-on: https://code.wireshark.org/review/19539
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit a056b68
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Sun Jan 15 14:31:42 2017 -0500
-
-    pcep: Add support of draft-ietf-pce-pcep-service-aware-13
-    
-    update support of draft-ietf-pce-segment-routing-08
-    
-    Change-Id: I4d25268bb331462fbe219f242ff8278b017de37b
-    Reviewed-on: https://code.wireshark.org/review/19642
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 755ccae
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jan 13 13:49:41 2017 +0100
-
-    QUIC: fix dissection of ACK Frame
-    
-    First Ack Block is always present in ACK Frame (don't depend of present of NACK)
-    
-    Change-Id: I702151a6ccb236272ace9dfdf0f4b507a549871e
-    Reviewed-on: https://code.wireshark.org/review/19627
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7f52ff0
-Author: Volodymyr Khomenko <Khomenko.Volodymyr@gmail.com>
-Date:   Tue Jan 17 19:15:05 2017 +0200
-
-    RSVD dissector: added RSVD v2 verbs
-    
-    Improved operation_code map to resolve RSVD v2 codes.
-    Changed GET_FILE_INFO -> GET_INITIAL_INFO for spec conformance.
-    See https://msdn.microsoft.com/en-us/library/dn392322.aspx
-    
-    SMB2 IOCTL FSCTL_SVHDX_ASYNC_TUNNEL_REQUEST must be handled in the same way as FSCTL_SVHDX_SYNC_TUNNEL_REQUEST:
-    RSVD dissector must be used (new async flow used by RSVDv2).
-    See https://msdn.microsoft.com/en-us/library/dn366375.aspx
-    
-    Ping-Bug: 11232
-    Change-Id: Ie51773fc2199a7674538101b87cec398354bd97a
-    Reviewed-on: https://code.wireshark.org/review/19657
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3b6fe2b
-Author: Frank Carpenter <frank.carpenter@spectralink.com>
-Date:   Tue Jan 17 13:21:56 2017 -0700
-
-    Populate logcat year based on localtime
-    
-    Change-Id: If7c790c25ed24da1b1442ee86e3a2f75bd3f8856
-    Reviewed-on: https://code.wireshark.org/review/19658
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b3432de
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Jan 18 22:03:54 2017 +0100
-
-    packet.c: use call_routine() for all lists
-    
-    For running through the postseq cleanup and final registration lists, we
-    can use the same dummy function call_routine() that is used for the init
-    and the cleanup lists. We don't need our own copies.
-    
-    Change-Id: Ia1ea647d5831adda26dab86eceba8fcf704ce122
-    Reviewed-on: https://code.wireshark.org/review/19668
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d04b5cd
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jan 17 11:35:36 2017 -0500
-
-    Use dissector tables for PPP protocols' options.
-    
-    Create pinos for all of the PPP protocols options and a dissector table to store
-    them all.  Adapt a new version of dissect_ip_tcp_options, (now ppp_dissect_options)
-    that uses the dissector tables for name of options and dissection function.
-    Also standardize the dissectors for all protocols so that all include type and
-    length in the dissection.
-    
-    Change-Id: I0033574e2831789040a1ce2857bf0e825d791cbe
-    Reviewed-on: https://code.wireshark.org/review/19656
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 37f4e42
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Jan 18 14:01:06 2017 +0100
-
-    packet: free postseq_cleanup_routines list.
-    
-    Change-Id: Ic1972399b706407ce8f15a3e554f1304a36d1009
-    Reviewed-on: https://code.wireshark.org/review/19663
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit ddb0f7d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jan 18 09:17:46 2017 -0800
-
-    Update fuzz-test to match capinfos behavior.
-    
-    As of gebd3dc6, capinfos returns 2 for invalid capture files.
-    
-    Change-Id: I00c1ab44c9929a9e922ac2a1ee8904632c1e460f
-    Reviewed-on: https://code.wireshark.org/review/19667
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit cf94161
-Author: Paul Offord <paul.offord@advance7.com>
-Date:   Tue Jan 17 17:25:24 2017 +0000
 
-    Fix Access Violation in plugin_if_mainwindow_get_ws_info(...)
-    
-    Call to plugin_if_get_ws_info when no packets are being displayed
-    causes an Access Violation in plugin_if_mainwindow_get_ws_info
-    as the pointer in cf->current_frame is NULL.
-    
-    Bug: 12973
-    Change-Id: I33e8fe6f3894963a6f1f1ec9aa9169f85e1e3b18
-    Reviewed-on: https://code.wireshark.org/review/19659
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 3138dad
-Author: Sandeep Dahiya <sdahiya@gmail.com>
-Date:   Tue Jan 17 14:52:20 2017 -0800
-
-    Gigamon Trailer support for new chassis types
-    
-    Change-Id: Ib24cd2c701c0e158c07eff4dffe0bbf9937d132b
-    Reviewed-on: https://code.wireshark.org/review/19660
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e021f74
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jan 16 08:15:03 2017 +0100
-
-    OpenFlow (v5/1.4): Add complete dissection of error messages
-    
-    Like for OpenFlow (v4/1.3) (g4b7c2781fb)
-    
-    Change-Id: I61cfea015e548e5eaa37856df86e96bd0ba21795
-    Ping-Bug: 13221
-    Reviewed-on: https://code.wireshark.org/review/19644
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fe89424
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Jan 16 22:41:53 2017 +0100
-
-    stat_tap_ui: add cleanup function.
-    
-    Change-Id: I0275a6e0d5d151f086d96c6388b9fa647ea0085c
-    Reviewed-on: https://code.wireshark.org/review/19654
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit ae03fc7
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jan 16 09:53:27 2017 +0100
-
-    Bluetooth: HCI_EVT: Implement some commands from Core 4
-    
-    Now all unimplemented commands are in /* TODO */
-    
-    Change-Id: I53c8dd0a660b62403214a3c75297e627337ed5fb
-    Reviewed-on: https://code.wireshark.org/review/19645
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 57f530a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Jan 16 22:49:28 2017 +0100
-
-    packet: free init/cleanup functions lists.
-    
-    Change-Id: Ia28ceef189f8fe16105da88c01e1a159d5029c0a
-    Reviewed-on: https://code.wireshark.org/review/19655
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit baaff60
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Jan 16 22:08:12 2017 +0100
-
-    exported_object: add cleanup function.
-    
-    Change-Id: If4c35d18db1dc982e981004838e0eabbf4479e78
-    Reviewed-on: https://code.wireshark.org/review/19653
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit baf2612
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Jan 16 21:51:39 2017 +0100
-
-    exported_pdu: add cleanup function.
-    
-    Change-Id: Iafc9f1c4b2a0210d8098b37eefc095e740182258
-    Reviewed-on: https://code.wireshark.org/review/19648
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1551f01
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jan 14 09:30:48 2017 +0100
-
-    profinet (pn): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Id00e7dc1b23f7fce31845f024671a05fe06fc660
-    Reviewed-on: https://code.wireshark.org/review/19635
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 93df6be
-Author: Volodymyr Khomenko <Volodymyr_Khomenko@DellTeam.com>
-Date:   Fri Jan 13 15:54:51 2017 +0200
-
-    RSVD: fix TUNNEL_SCSI_REQUEST
-    
-    Length of CDBBuffer must be always 16 bytes
-    If CDBLength is less than 16, add padding bytes
-    
-    Change-Id: I241a10325ebe17b32469eaf7dc530fc7fe2105de
-    Reviewed-on: https://code.wireshark.org/review/19628
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fb0d51a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 8 19:29:35 2017 +0100
-
-    802.11(ad): not longer need to use p_add_proto_data/p_get_proto_data for pass isGrant to beamforming control function
-    
-    Change-Id: I719ff48a1992904c80c602f9706697e71b93ccba
-    Reviewed-on: https://code.wireshark.org/review/19640
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5f76627
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Sat Jan 14 00:11:28 2017 -0500
-
-    packet-nvme-rdma: Support Dissecting connect cmd & inline data.
-    
-    This patch adds support to dissect data of the connect command which
-    comes along with the cmd in same packet.
-    
-    It also removed unwanted tvb addition for rdma fabric commands,
-    completion and nvme commands.
-    
-    Bug: 13201
-    Change-Id: I33062f67a69cdca4b909ed8c08201dea5e0aa095
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/19632
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f27734f
-Author: Alexandr Savca <s.alex08@mail.ru>
-Date:   Sat Jan 14 23:12:14 2017 +0200
-
-    packet-tns.c: Add Version2 (SQLNET_RETURN_OPI_PARAM)
-    
-    I've tested with pcaps from SampleCaptures (wiki).
-    
-    Change-Id: Ifa1b628fbc675843c54dfd4b993809fd072dc69c
-    Reviewed-on: https://code.wireshark.org/review/19636
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b8ae1b1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 15 19:46:58 2017 +0100
-
-    xml(.h): fix indent (use spaces) and modelines
-    
-    use same indent like packet-xml.c
-    
-    Change-Id: I687b0306ba1d3559ce4a299a0e66c55e3f04fdfd
-    Reviewed-on: https://code.wireshark.org/review/19641
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 024cf94
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jan 15 08:12:09 2017 -0800
-
-    [Automatic update for 2017-01-15]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Ia487718c34913b5bb8297184fedb6c7ecaf604e6
-    Reviewed-on: https://code.wireshark.org/review/19637
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 990d2a9
-Author: MustBeArt <paul@mustbeart.com>
-Date:   Fri Jan 13 16:43:54 2017 -0800
+commit a879379
+Author: Robert Sauter <sauter@locoslab.com>
+Date:   Tue Jun 20 14:18:02 2017 +0200
 
-    DVB-S2-BB: Use proto_tree_add_bitmask()
+    IEEE 802.11: Use correct mask for 'SMK message'
     
-    Change-Id: I1a4b50873a183c0f6051dc0db3fecf5e62c92cbb
-    Reviewed-on: https://code.wireshark.org/review/19633
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I2def75c999faec0cbb16fd87133f09544bff78c4
+    Reviewed-on: https://code.wireshark.org/review/22264
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 23e667169eefc450808e60ea515fc271122052de)
+    Reviewed-on: https://code.wireshark.org/review/22266
 
-commit 298085d
+commit 90e1f73
 Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jan 10 23:46:31 2017 +0100
-
-    Qt: fix memory leaks in UatDialog
-    
-    Avoid leaking memory for the stringified UAT field values (tostr) and
-    for copies of rows.
-    
-    Change-Id: I1bf20035fabe92da8216c820bc47ebce7dd73951
-    Reviewed-on: https://code.wireshark.org/review/19604
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit dc647f1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 13 10:43:54 2017 +0100
-
-    geoip: free resources to avoid leak.
-    
-    Change-Id: Ia4a938e8a6b3856959c375f4bfcdf565a21eabef
-    Reviewed-on: https://code.wireshark.org/review/19629
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Dario Lombardo <lomato@gmail.com>
-
-commit 15deb60
-Author: MustBeArt <paul@mustbeart.com>
-Date:   Sat Jan 7 08:09:07 2017 -0800
-
-    DVB-S2 BB: Handle GSE Padding in BB frames
-    
-    GSE Padding is outside of any GSE Packet and continues to the end of the
-    Baseband Frame, per 4.2.1 of ETSI TS 102 606-1.
-    
-    Added dvb-s2_gse.padding as an integer representing the length in bytes
-    of the padding field.
-    
-    Change-Id: I9ed22c37a1969059a09ba44d9e3473cb9d0a1880
-    Reviewed-on: https://code.wireshark.org/review/19579
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c2ddc30
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 13 13:46:08 2017 +0100
-
-    X2AP: replace non ASCII characters in ASN.1 source files
-    
-    Change-Id: I114ba3fc68dccf9f791488920f602906d2d8c124
-    Reviewed-on: https://code.wireshark.org/review/19626
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit b357353
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 13 11:38:17 2017 +0100
-
-    LTE RRC: upgrade dissector to v13.4.0
-    
-    Change-Id: I5f7de78f0be320781091e17ec8c471a3fd482b14
-    Reviewed-on: https://code.wireshark.org/review/19625
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 05fad31
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jan 13 10:15:51 2017 +0100
-
-    tools: add options documentation to valgrind-wireshark.sh
-    
-    Change-Id: Id0bb85b9499f1e6f327b711d38deefe295e92c1a
-    Reviewed-on: https://code.wireshark.org/review/19624
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b34d93a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jan 13 09:11:53 2017 +0100
-
-    SSL: fix compilation without libgcrypt or gnutls
-    
-    Change-Id: I785db404969f89a3f90eddbda5542ee6b676ddb8
-    Reviewed-on: https://code.wireshark.org/review/19623
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c303679
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 12 23:14:44 2017 -0800
-
-    Decode TBCD strings in GSM MAP as per the GSM MAP spec.
-    
-    Hex digits 0xa through 0xe are '*', '#', 'a', 'b', and 'c',
-    respectively.
-    
-    Constify the dgt_set_t argument to tvb_bcd_dig_to_wmem_packet_str(),
-    while we're at it.
-    
-    Bug: 13316
-    Change-Id: I7586f35d23fd262453779d99946e7ccad4b6ffab
-    Reviewed-on: https://code.wireshark.org/review/19620
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a4bbd3c
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Thu Jan 12 18:23:45 2017 -0500
+Date:   Mon Jun 19 16:28:10 2017 -0400
 
-    packet-infiniband: Pass read request packets to ULP dissectors
+    Qt: make Wireless Timeline a separate item
     
-    This patch passes RDMA read request packets to ULP dissectors similar to
-    other RDMA packets so that ULP dissector can have opportunity to show as
-    upper layer protocol instead of IB or RRoCE.
+    Do not put the wireless timeline in the main view with splitters, it has
+    a fixed size anyway and is not taken into account for layout and size
+    calculations for the panes.
     
-    Change-Id: I594d8eada858b7f77fc94be44e3639526789779e
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/19619
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit aa76d58
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Jan 12 15:53:25 2017 +0100
-
-    uat: fix build error without libgcrypt/gnutls
-    
-    Change-Id: I00fea4d2e8c4d7fc8fc54627ced21796d40b854a
-    Reviewed-on: https://code.wireshark.org/review/19616
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4f01e93
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jan 12 12:09:40 2017 -0800
-
-    Make sure ui/qt/variant_pointer.h gets distributed.
-    
-    Change-Id: I3bbfaf392da346e937b5a1914c140d1114e3091e
-    Reviewed-on: https://code.wireshark.org/review/19618
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 259989a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 8 18:04:56 2017 +0100
-
-    camins: improve the heuristics
-    
-    The current mechanism that reads the first 20 blocks looking for a headerd
-    oesn't work in all cases. I was given sample files that consist of
-    data blocks only and have no header.
-    
-    Use a new approach to detect a .camins file by searching for pairs of
-    size high + size low blocks, either read or write. Go through the
-    entire file. If we have significantly more pairs than single, non-matching
-    blocks, this is a camins file.
-    
-    Change-Id: Ic91e7db7149b105e26896d1a89cad4a2a73d0f13
-    Reviewed-on: https://code.wireshark.org/review/19603
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 3df81a0
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Wed Jan 11 13:55:23 2017 +0100
-
-    Qt: Remove unneccessary Q_DECLARE_METATYPE
-    
-    Remove unnecessary Q_DECLARE_METATYPE macros and replace calls
-    to QVariant conversions with VariantPointer where necessary
-    
-    Change-Id: Ia4690590095f930bf94644197de7fa30b00ee7ec
-    Reviewed-on: https://code.wireshark.org/review/19611
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit d6d5168
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Thu Jan 12 15:11:33 2017 +0100
-
-    Diameter: decode Emergency-Indication AVP (1538)
-    
-    Change-Id: Ie40d61944fd47eb532b759cb122367c18840feff
-    Reviewed-on: https://code.wireshark.org/review/19615
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f8dc234
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Jan 11 00:33:46 2017 +0100
-
-    Qt: fix memleak of PointList in interface statistics
-    
-    The list of points (for interface traffic statistics) is part of the
-    interface tree model/view. Remove the pointer indirection to simplify
-    cleanup and avoid leaking a PointList.
-    
-    Note that the SparkLineDelegate is used in two different places
-    (CaptureInterfacesDialog and InterfaceTreeModel).
-    
-    Change-Id: I5fef7dadd44fdf58c07844fee269f509c712a36f
-    Reviewed-on: https://code.wireshark.org/review/19606
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 4b3b3f5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 11 19:34:38 2017 -0500
-
-    Extcap: Restore previously created preference from hash table, not preference pointer
-    
-    Change-Id: Ie68a5c6c193f362e78d4f4b1f20edf7747e2313f
-    Reviewed-on: https://code.wireshark.org/review/19614
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 805ddd1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Dec 21 11:50:47 2016 +0100
-
-    uat: add a reset callback.
-    
-    This function will free the resources allocated by the caller.
-    
-    Change-Id: Ib486c14e4fd3c321662fb71f7fd06733ce9a64a4
-    Reviewed-on: https://code.wireshark.org/review/19375
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 01c8028
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jan 11 22:36:37 2017 +0100
-
-    X2AP: upgrade dissector to v13.6.0
-    
-    Change-Id: Ie312d354cadadba693ea5320c5bbc0957bde6514
-    Reviewed-on: https://code.wireshark.org/review/19613
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 9414f56
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jan 11 19:16:12 2017 +0100
-
-    S1AP: upgrade dissector to v13.5.0
-    
-    Change-Id: Ic65ae88af37f0e82207c093827755f93934d9424
-    Reviewed-on: https://code.wireshark.org/review/19612
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d8be254
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jan 2 13:48:41 2017 -0500
-
-    packet-btatt.c: Use protocol information from dissector handle instead of pinfo data for attributes.
-    
-    Instead of using a dissector function placed in a dissector table, just use the
-    protocol information registered with the dissector table to create the desired
-    dissector tree.
-    
-    Change-Id: Ic32b15e3c05d73df6e8f69890c47172e991bda6f
-    Reviewed-on: https://code.wireshark.org/review/19509
+    Bug: 13776
+    Change-Id: I71da962950c3f1b215908674f4852afa76744343
+    Reviewed-on: https://code.wireshark.org/review/22242
     Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Simon Barber <simon.barber@meraki.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 4d90f2e092802775e5e3e457768d1c1f4760a1f0)
+    Reviewed-on: https://code.wireshark.org/review/22265
 
-commit 2d6f876
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jan 10 21:12:28 2017 +0100
-
-    OpenFlow (v4/1.3): rename dissect_openflow_payload_v4 to dissect_openflow_message_v4
-    
-    Like OpenFlow (v5/1.4) dissector
-    and include dissect_openflow_header_v4
-    
-    Ping-Bug: 13221
-    Change-Id: I123fad871bcb1c9d54946500505525d55a81f8f3
-    Reviewed-on: https://code.wireshark.org/review/19602
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 39389a1
+commit 832f62f
 Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Jan 10 21:57:53 2017 -0500
+Date:   Mon Jun 19 16:46:49 2017 -0400
 
-    Run libtoolize before aclocal.
+    Don't scroll back to the selected frame when we get name resolution updates.
     
-    libtoolize installs files in m4/ which aclocal is going to include.
+    With live or large capture files and asynchronous name resolution this can
+    cause serious scrolling issues as the name resolutions come in.
     
-    Prior to this change this sequence:
-     1) ./autogen.sh
-     2) ./configure
-     3) make
-    
-    Results in aclocal (and subsequently ./configure) being rerun in step 3
-    (because there are files in m4/ that are are newer than aclocal.m4).
-    
-    Change-Id: I70589ab3cede6b7cd48e089c8be4d4c98dab3b6a
-    Reviewed-on: https://code.wireshark.org/review/19609
+    Bug: 12074
+    Change-Id: I1a5cca410c0608927b32e9e7107885370caf14d7
+    Reviewed-on: https://code.wireshark.org/review/22245
     Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 97b3f75
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jan 8 16:10:11 2017 +0100
-
-    iso14443: use proto_tree_add_checksum()
-    
-    replace our own function for dissecting the CRC with
-    the generic proto_tree_add_checksum()
-    
-    Change-Id: I569c877836a7b771b01a37b57b6c50fc0183e9a7
-    Reviewed-on: https://code.wireshark.org/review/19601
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ebd1989
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Tue Jan 10 23:47:29 2017 +0100
-
-    Qt: check NULL before dereference (CID 1394324)
-    
-    Move the NULL check before the assignment with the dereference.
-    
-    Change-Id: Ifcd4fb89c059ad2f4b6606fc1e83dc67a7d7373d
-    Reviewed-on: https://code.wireshark.org/review/19605
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 37790e9
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jan 10 14:03:55 2017 +0100
-
-    cmake: fix empty data (Global Configuration) directory
-    
-    Color filters were somehow not loaded. It turns out that the
-    BUILD_TIME_DATAFILE_DIR macro (for filesystem.c) was empty because
-    DATAFILE_DIR was defined after adding the wsutil directory. Fix it by
-    defining the variable before wsutil (but after epan).
-    
-    Change-Id: I0d002b79499c80a90d8fcc14b06ced26c30b0453
-    Fixes: v2.3.0rc0-1830-gd5fdbef7f4 ("cmake,wslua,wsutil: load files from run/ instead of source tree")
-    Reviewed-on: https://code.wireshark.org/review/19600
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 0ecfc72
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 9 22:40:07 2017 -0800
-
-    Use tvb_new_subset_remaining() rather than tvb_new_subset_length_caplen().
-    
-    Any call of the form tvb_new_subset_length_caplen(tvb, offset, -1, -1)
-    should instead be tvb_new_subset_remaining(tvb, offset).
-    
-    Change-Id: I4bc95b028103ea4fc82453ef3460c147d7ccabd6
-    Reviewed-on: https://code.wireshark.org/review/19598
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7cd6906
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 9 22:18:49 2017 -0800
-
-    Rename tvb_new_subset() to tvb_new_subset_length_caplen().
-    
-    This emphasizes that there is no such thing as *the* routine to
-    construct a subset tvbuff; you need to choose one of
-    tvb_new_subset_remaining() (if you want a new tvbuff that contains
-    everything past a certain point in an existing tvbuff),
-    tvb_new_subset_length() (if you want a subset that contains everything
-    past a certain point, for some number of bytes, in an existing tvbuff),
-    and tvb_new_subset_length_caplen() (for all other cases).
-    
-    Many of the calls to tvb_new_subset_length_caplen() should really be
-    calling one of the other routines; that's the next step.  (This also
-    makes it easier to find the calls that need fixing.)
-    
-    Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b
-    Reviewed-on: https://code.wireshark.org/review/19597
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2a3b236
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 8 17:14:15 2017 +0100
-
-    ieee80211: Add Extreme (Zebra) Vendor Specific TLV
-    
-    Only decode subtype 1 : AP Name with unknown data (7 bytes)
-    
-    Change-Id: I4fc0c6fff1a931075ab333a8527251f12acb2827
-    Reviewed-on: https://code.wireshark.org/review/19586
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8604ed2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 9 15:13:35 2017 -0800
-
-    Consistently use tvb_reported_length_remaining().
-    
-    That's the amount of data left in the packet; perhaps not all of it was
-    *captured*, and using tvb_reported_length_remaining() will throw an
-    exception, but that's what *should* happen ("packet cut short"
-    notification and all).
-    
-    Use tvb_new_subset_remaining() to get a tvbuff with everything after a
-    certain point in the packet.
-    
-    Change-Id: I2512e58e23600f7e7bbce0126732b05997692a65
-    Reviewed-on: https://code.wireshark.org/review/19596
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2b482cd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jan 9 14:25:33 2017 -0800
-
-    Use tvb_new_subset_length(); no need to do its work ourselves.
-    
-    Change-Id: I581e14af2981c723a81e9c0340de0229b832e51a
-    Reviewed-on: https://code.wireshark.org/review/19595
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 49b2a1c
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Sun Jan 8 23:58:12 2017 +0100
-
-    Restore FCoIB frame marker handling (CID 1397701)
-    
-    It seems that somewhere in the last few years the changes for FCoIB
-    have caused it to loose its frame marker processing. This change puts
-    that back.
-    Also there is an ambiguity in EOF handling, which is solved.
-    
-    Change-Id: Iefbb42726e4e5491a50d7ce96626c906fb5ea857
-    Reviewed-on: https://code.wireshark.org/review/19594
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit d5abca0
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Sun Jan 8 02:09:23 2017 +0100
-
-    Fix TCP stream graph (throughput) reset axes logic (CID-1398438)
-    
-    The code seems to be ment to latch the reset axes flag for graph update.
-    
-    Change-Id: I7b47346c45aa7576c98a251eb3ebcd9188407000
-    Reviewed-on: https://code.wireshark.org/review/19581
-    Reviewed-by: Kevin Hogan <kwabena@google.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 21c203e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 8 19:16:59 2017 +0100
-
-    802.11(ad): Add reserved field of Grant ACK frame
-    
-    Change-Id: I0bb982403fb7f36ad166234b16dbe8ad9b8b8eb8
-    Ping-Bug: 13244
-    Reviewed-on: https://code.wireshark.org/review/19592
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f2f8f6a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 8 18:55:14 2017 +0100
-
-    802.11(ad): Remove comment about clang warning and set directly the value
-    
-    Change-Id: Ie64608597c7d6a5b9a2fec9de8e8983233e0e10e
-    Reviewed-on: https://code.wireshark.org/review/19591
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cbb5068
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 8 18:46:14 2017 +0100
-
-    802.11(ad): Fix SSW Feedback dissection when Sector Sweep Direction = Responder
-    
-    For the Sector Sweep Frame in which the Sector Sweep Direction = Responder, the format of the Sector Sweep Feedback Field should be the one in the standard (Figure 8-431d—SSW Feedback field format when not transmitted as part of an ISS) i.e. similar to the one in Sector Sweep Feedback Frame and Acknowledgement.
-    
-    Issue reported by Hany ASSASA
-    
-    bug: 13244
-    Change-Id: Ic8c6d83fc32d017fb73116a54759608498f99452
-    Reviewed-on: https://code.wireshark.org/review/19590
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9a1dfcc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 8 18:23:24 2017 +0100
-
-    802.11(ad) fix typo : ambiguous assignment (CID 1398212)
-    
-    Introducte in g62a54cb77
-    
-    Ping-Bug: 13244
-    Bug: 13309
-    Change-Id: I2e3411cfd38685c08fd669fad1313663ba879936
-    Reviewed-on: https://code.wireshark.org/review/19589
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 86a5bf5
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Dec 29 20:17:18 2016 +0100
-
-    TLS(1.3): update PSK extension for draft -18
-    
-    Removed ke_modes and auth_modes fields, add
-    identity.obfuscated_ticket_age and binders fields. (Note that binders
-    field is not dissected further at this moment due to the lack of a pcap
-    for verification.)
-    
-    Ping-Bug: 12779
-    Change-Id: I9af7d93feb2352a494be2d5bda66d124267cf464
-    Reviewed-on: https://code.wireshark.org/review/19462
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 45d967c
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sun Jan 8 21:02:46 2017 +0000
-
-    profinet: Skip comments in GSD file
-    
-    Bug: 13303
-    Change-Id: I9ab17ec25917723be06b36ab4c11fe67e6792715
-    Reviewed-on: https://code.wireshark.org/review/19593
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ffa2399
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jan 8 08:14:14 2017 -0800
-
-    [Automatic update for 2017-01-08]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I91668647c50e78b29bbb28f2348dc8e52c3a66c5
-    Reviewed-on: https://code.wireshark.org/review/19585
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 3952052
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jan 7 21:31:05 2017 -0500
-
-    Restore some MPLS registered dissectors.
-    
-    Per https://ask.wireshark.org/questions/58532/missing-dissector-pw_eth_cw
-    it appears some MPLS dissectors are still referenced by name and
-    not just for the dissector table created in
-    I1e0c3ae784b71c0145b1f1730a97feae8e9f488f.
-    
-    Change-Id: I27be132f56c879be16f78f76ac0e9688673a47c1
-    Reviewed-on: https://code.wireshark.org/review/19582
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ebd3dc6
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Jan 7 21:57:57 2017 +0100
-
-    Fix exit code for non-existent file.
-    
-    The patched command line utilities have been aligned to tshark
-    behavior.
-    
-    Change-Id: I0cb764b37792e882e182681124341893b3958c59
-    Reviewed-on: https://code.wireshark.org/review/19580
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6e29d87
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Jan 6 23:17:19 2017 +0100
-
-    Qt: fix crash on undecodable RTP stream
-    
-    When the sample rate is zero, a floating point exception (FPE) occurs in
-    QAudioDeviceInfo::nearestFormat. Detect the error condition instead and
-    show an error.
-    
-    Change-Id: Ie2eaa57847938fe15607fa26d0f4e08e7ddd23d1
-    Fixes: v2.3.0rc0-1664-gd59653f8d5 ("Qt: Make the RTP player output device selectable.")
-    Reviewed-on: https://code.wireshark.org/review/19569
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 082ba06
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jan 7 18:32:59 2017 -0800
-
-    Comments on the first nibble stuff.
-    
-    If you don't have control words - and several MPLS pseudo-wire RFCs say
-    "in these cases, a control word isn't necessary, and isn't useful, so
-    you might want to leave it out" - the first nibble values of 0, 1, 4,
-    and 6 could just be part of the packet header.
-    
-    Explain some other stuff as well.
-    
-    Change-Id: I2f1aae2ab8653bdd7f8b3b52ef450f6d43a1afcd
-    Reviewed-on: https://code.wireshark.org/review/19583
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2009dcc
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Jan 7 00:14:23 2017 +0100
-
-    extcap: fix memleak via data_file_url
-    
-    Commit v2.1.0rc0-2181-ga4e2263ac4 introduced a helppage parameter, but
-    all callers were NULL. In a later change, callers would use the
-    data_file_url() function, but this needs to be freed, so do that.
-    
-    Fixes: v2.3.0rc0-1825-ge5596b74bd ("extcap: set help page for all extcaps.")
-    Change-Id: I967c0f8c6b50d9e78ac227575de24a81f97d376a
-    Reviewed-on: https://code.wireshark.org/review/19570
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 03a8884
-Author: Eliot Lear <lear@cisco.com>
-Date:   Mon Jan 2 17:29:10 2017 +0100
-
-    Add MUD-URL manufacturer usage description certificate extension.
-    
-    See draft-ietf-opsawg-mud for details.  File changes include addition
-    of new asn1 directory and associated files, as well as edits to various
-    other files to support the change.
-    
-    Change-Id: Ib910980e1ddcafaa31aa07cf049562520b61a3aa
-    Reviewed-on: https://code.wireshark.org/review/19505
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 165c8b0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jan 4 10:57:25 2017 -0500
-
-    Refactor range preference.
-    
-    Refactored so that all handling of ranges in struct preference
-    can be internal to prefs.c
-    
-    Change-Id: I68577909f9c07b23a16ab3443a523355d4645314
-    Reviewed-on: https://code.wireshark.org/review/19577
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fb9ac50
-Author: MustBeArt <paul@mustbeart.com>
-Date:   Sun Jan 1 08:47:40 2017 -0800
-
-    DVB-S2 BB: Fix BB header CRC checks
-    
-    Fix problem with baseband header CRC check that caused almost all
-    baseband frames to show a spurious CRC error, introduced with
-    proto_tree_add_checksum.
-    
-    Change-Id: I6b2f9680507eeb79e59b825f3ac9e4cee1033976
-    Reviewed-on: https://code.wireshark.org/review/19567
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 0dcbfab
-Author: Noel Power <noel.power@suse.com>
-Date:   Fri Jan 6 16:23:18 2017 +0000
-
-    Make column size sanity check more sensible.
-    
-    The existing sanity check on column_size makes incorrect assumptions
-    about the size of the CTableColumn structure (which is an internal
-    dissector structure that contains optional data). The sanity check
-    test *always* fails. This change uses the minimum size of CTableColumn
-    structure instead which should prevent excessive allocation during fuzz
-    testing.
-    
-    Bug: 13299
-    Change-Id: Id9fcbc15a4df4c74bb7576c6fdca1000890947fd
-    Signed-off-by: Noel Power <noel.power@suse.com>
-    Reviewed-on: https://code.wireshark.org/review/19566
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ae5dbe1
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Fri Jan 6 10:10:27 2017 -0500
-
-    Add support for RROCE(v2) over IPv4 (without UDP).
-    
-    This isn't standard but has been seen in the wild, see:
-    https://ask.wireshark.org/questions/58521/cannot-decode-rocev2-traffic
-    
-    With this change users can Decode-As an IP Protocol as RROCE (by selecting
-    Infiniband (IB) as the protocol).
-    
-    Change-Id: Iec865478d056f687f2f66124d6e936f67707d2c4
-    Reviewed-on: https://code.wireshark.org/review/19572
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ea74404
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Fri Jan 6 11:14:15 2017 -0500
-
-    packet-nvme: Dissect read/write cmd and SGL
-    
-    1. Added support to dissect read and write commands.
-    2. Added support to dissect SGL fields addr, len, key.
-    3. Changed long reserved fields to decimal presentation.
-    4. Fixed typo for cqe reserved field.
-    
-    Change-Id: I63c674c68143c9c61610bada0410b49a134361d4
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/19565
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4dc983d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Jan 7 00:39:17 2017 +0100
-
-    packet: fix memleak of "short_name" for heuristics dissectors
-    
-    Change-Id: I3b954e3623473899b6039f0ff572eb56defe14cc
-    Fixes: v2.3.0rc0-1841-ga8b68205a4 ("packet: duplicate short_name to fix UAF in wslua")
-    Reviewed-on: https://code.wireshark.org/review/19571
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6a6d7ea
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Dec 22 15:12:27 2016 -0500
-
-    Convert range API to always use wmem memory.
-    
-    This is mostly to address memory leaks in range preferences (the biggest
-    user of range functionality) on shutdown.
-    Now range preferences must use epan scoped memory when referencing
-    internal preference structures to keep consistency.
-    
-    Change-Id: Idc644f59b5b42fa1d46891542b53ff13ea754157
-    Reviewed-on: https://code.wireshark.org/review/19387
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 29a7fce
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 5 22:26:59 2017 +0100
-
-    802.11(ad): Enhance dissection of Beacon Interval Control (BIC)
-    
-    You can now use bitmap on 64bits (or 48bits)
-    
-    and also add a reserved field
-    
-    Ping-Bug: 13244
-    
-    Change-Id: I2ec9412f6cfebd3a8ca5c082af5e8481e2646eaf
-    Reviewed-on: https://code.wireshark.org/review/19561
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 79fc411
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jan 1 00:22:01 2017 -0500
-
-    Convert some easily identifiable pinos.
-    
-    grepping for "Decode As" comments reveals exactly was pinos were
-    created for - distinguishing multiple dissection functions in a
-    single dissection table.
-    
-    Change-Id: Iaa9294045e9d0633563e7d763cb585c0e6dc598f
-    Reviewed-on: https://code.wireshark.org/review/19490
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f0b1099
-Author: John A. Thacker <johnthacker@gmail.com>
-Date:   Wed Jan 4 16:10:49 2017 -0500
-
-    VLAN: Support IEEE 802.1Q-2005 and -2011 changes
-    
-    Supports the recommended meanings of the priority field as
-    changed by 802.1Q-2005, and the change from the CFI to DEI
-    in 802.1Q-2011. A preference is added to use the older
-    (non-compatible) spec version. Note that 802.1Q-2011 is
-    consistent with 802.1ad and ah, which got rolled up in 802.1Q,
-    but ends up removing support for bridging Token Ring and FDDI
-    over Ethernet.
-    
-    Bug: 13294
-    Change-Id: Ieeadb0f6dda2758750f9e6649f1390609d78c50e
-    Reviewed-on: https://code.wireshark.org/review/19548
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    (cherry picked from commit 4e46352657df1d66e8f2ade8c5e3d38ecae18530)
+    Reviewed-on: https://code.wireshark.org/review/22262
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit cea1063
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 5 21:28:58 2017 +0100
-
-    802.11(ad): add reserved fields for Beam Forming
-    
-    Change-Id: I486c883b27059eb55e9fe11fcc372fc31c1e56ca
-    Ping-Bug: 13244
-    Reviewed-on: https://code.wireshark.org/review/19560
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3871df5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 5 19:54:06 2017 +0100
-
-    802.11(ad): align length of Beam Forming
-    
-    use UINT16
-    
-    Change-Id: I7f7c4e847ed6ccb6ced446d493aa27f76cc8db61
-    Reviewed-on: https://code.wireshark.org/review/19559
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b4176fd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jan 5 19:40:34 2017 +0100
-
-    802.11(ad): fix typo
-    
-    Wrong field name for Dynamic Allocation
-    
-    Issue reported by Hany ASSASA
-    
-    Bug: 13244
-    Change-Id: Idec2cb48c5b3d22d75880325d2aec0083d89ca95
-    Reviewed-on: https://code.wireshark.org/review/19558
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a8d4051
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Jan 5 09:04:59 2017 -0500
-
-    Update the preference help text to indicate the correct default RROCE port.
-    
-    I97b82fb53fd63d9107ee5d4c64b94840e743fc72 changed the default but not the
-    help text.
-    
-    Change-Id: I05375c44c01703e36686d0a16a094cb8d6b3dcd2
-    Reviewed-on: https://code.wireshark.org/review/19557
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ee5ade8
+commit e62d7ef
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jan 5 12:26:36 2017 +0100
+Date:   Mon Jun 19 20:06:06 2017 +0200
 
-    NAS EPS: NAS message container in Control Plane Service Request can be ciphered
+    PROFINET IO: define an arbitrary recursion depth limit
     
-    Change-Id: I026fc63e09c54807604c5d5a112c36dd41759c00
-    Reviewed-on: https://code.wireshark.org/review/19556
+    Bug: 13811
+    Change-Id: I52bffd4a79dcdad9da23f33e1fc6a868472390bf
+    Reviewed-on: https://code.wireshark.org/review/22232
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3979bbe
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Jan 4 17:20:19 2017 +0100
-
-    Add g_log entries to measure startup time, protected by #ifdef
-    
-    Change-Id: Ic32f89dc824a6da838643445a30335a8c73af1ee
-    Reviewed-on: https://code.wireshark.org/review/19540
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0782a7a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jan 4 08:28:51 2017 -0800
-
-    More make-version.pl fixups.
-    
-    Don't add extra \n's. Change ".*([\r\n]+)$" matches to ".*?([\r\n]+)$"
-    so that we don't greedily match the wrong line ending.
-    
-    Change-Id: I916ee49207eaac17e1e4c4f677558f7be13a099a
-    Reviewed-on: https://code.wireshark.org/review/19541
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 29aa889
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 20:03:35 2017 -0800
-
-    Do RA_DISSECTORS in the Qt UI.
-    
-    It looks as if a fair bit of work is done under RA_DISSECTORS before we
-    register any individual items, so add it to the splash screen update
-    with the Qt UI - it's used in the GTK+ UI.
-    
-    Update a comment to explicitly indicate what action transactions are
-    being counted (other than the individual-item ones, where we have to
-    call routines that give us a count of items).
-    
-    Change-Id: I3ec5e5fbfdcf523d693bcf1b0f0ffbe0d05d61ae
-    Reviewed-on: https://code.wireshark.org/review/19553
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 31c9037
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 18:51:36 2017 -0800
-
-    Fix comment.
-    
-    Change-Id: I5c18130dc22220ddd85109235383fcf61e543d89
-    Reviewed-on: https://code.wireshark.org/review/19552
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 229f573
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 18:45:21 2017 -0800
-
-    Remove RA_CONFIGURATION.
-    
-    It's not used at all in the Qt UI, and the point at which it's used in
-    the GTK+ UI doesn't involve reading configuration files - between it and
-    RA_INTERFACES, some mostly quick command-line argument processing is
-    done.
-    
-    Change-Id: Ib4de97c8b6dba658a6e9d8f596b551f7c45739d2
-    Reviewed-on: https://code.wireshark.org/review/19551
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3f176f9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jan 4 21:06:06 2017 +0100
-
-    QUIC: fix typo on ACK num revived field description
-    
-    Found in https://ask.wireshark.org/questions/58396/some-question-about-quic-decode-result
-    
-    Change-Id: Ic7fc2c2318186eabb5047f816987d2553a6fd449
-    Reviewed-on: https://code.wireshark.org/review/19547
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c1f7cbf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 14:14:21 2017 -0800
-
-    Clean up indentation.
-    
-    Change-Id: Ie5a2cc5650840a40fe3a84c04598e1f35dc47f4a
-    Reviewed-on: https://code.wireshark.org/review/19550
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 26430ff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 14:10:16 2017 -0800
-
-    Include extcap binaries in the count of things to point out during startup.
-    
-    The GTK+ version, at least, crashes if there are more "doing XXX..."
-    items put up than the calculated count, so, now that we're putting up
-    items for extcap binaries, we need to count the extcap binaries.
-    
-    Clean up some stuff we found doing this (indentation, a _U_ on something
-    that's used).
-    
-    Change-Id: I1f88042b64ce4b9ae352de37689677c694e3770b
-    Reviewed-on: https://code.wireshark.org/review/19549
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f7124f6
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 19 11:04:09 2016 -0800
-
-    Escape opening curly braces in gen-bugnote.
-    
-    Curly braces are used for attribute replacement in AsciiDoc.
-    
-    Change-Id: I1461ee26543dd20a9f799084a01710faef78f2d0
-    Reviewed-on: https://code.wireshark.org/review/19517
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 9e7e30e
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Jan 4 10:53:29 2017 +0100
-
-    Add a startup message for Initializing extcap.
-    
-    Change-Id: I06262e98bb4a55ee1eacd7a36b938b45eaffaf76
-    Reviewed-on: https://code.wireshark.org/review/19535
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 79d1ac9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 11:11:18 2017 +0000
-
-    Revert "Another change required for that."
-    
-    This reverts commit 3cfa4f760276bf995aca2479166a2128451fd402.
-    
-    Nope, *not* needed, and not wanted, either.
-    
-    Change-Id: I71ac174a9b9b19980d0a6f44088d0a66f71ef99b
-    Reviewed-on: https://code.wireshark.org/review/19538
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3cfa4f7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 03:08:07 2017 -0800
-
-    Another change required for that.
-    
-    Bug: 13270
-    Change-Id: I86e779c8f7b89ca928556d8b1acc1015b96f9100
-    Reviewed-on: https://code.wireshark.org/review/19537
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2cc215c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 03:05:14 2017 -0800
-
-    Running Wireshark through a symlink doesn't work.
-    
-    We can't just symbolically link to the executables, as that means that
-    the executable won't be in Contents/MacOS, which means that all
-    @executable_path-relative references will go to the wrong place if we
-    run the executables using the symlink, which means that the executables
-    could fail (they *do* fail to find the Cocoa Qt plugin, for example).
-    
-    So, instead, we go back to the old version of the utility launcher, and
-    put that in Contents/Resources/bin as well as, if the user requests the
-    CLI utilities, /usr/local/bin.  Maybe PackageMaker will find that
-    acceptable and include them in the installer package.
-    
-    Bug: 13270
-    Change-Id: I4016b58c9ce0df05d78525d35e53431750c2b4d9
-    Reviewed-on: https://code.wireshark.org/review/19536
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0aba97a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 01:29:41 2017 -0800
-
-    Oops, source and target are the other way around.
-    
-    Bug: 13270
-    Change-Id: Ibeddb435acca298c90f2d6b9c0228e8a9a747b38
-    Reviewed-on: https://code.wireshark.org/review/19534
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 880580c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jan 4 00:07:46 2017 -0800
-
-    Create the Content/Resources/bin directory if necessary.
-    
-    Bug: 13270
-    Change-Id: Idc4223a24d6d2037d13a85331ce63e5a24168d3a
-    Reviewed-on: https://code.wireshark.org/review/19533
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3fae136
-Author: Kevin Hogan <kwabena@google.com>
-Date:   Thu Dec 22 13:03:03 2016 -0800
-
-    Qt: add SACK graphs to tcptrace graph
-    
-    Primarily, this adds visual indication of SACK blocks to tcptrace.
-    In addition:
-     - cleaned up focus behavior for graph selector and spinboxes
-     - added time-delay update to streamNumber spinBox
-        (similar to behavior of maWindow spinBox)
-     - changed ACK selection to select only SACKed responses
-        (rather than all ACKs - SACKs seemed more useful to look at)
-    
-    Change-Id: I47d9e98d54f14e4955008ecea791b77f805c8ba9
-    Reviewed-on: https://code.wireshark.org/review/19388
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 15ad25e
-Author: Juanjo Martin <juanjo@rti.com>
-Date:   Thu Dec 29 15:24:28 2016 +0100
-
-    RTPS: Added dissection for Parametrized user data
-    
-    Before we were showing an expert warning saying that it was not
-    supported. Now we show the parametrized data dissected in the form
-    
-    sequence of (id, length, value)
-    
-    Added also filters so it is possible to filter on the ids (useful
-    in RTPS)
-    
-    Bug: 13278
-    Change-Id: I8569830305bc303febe6f3460221e7a52867a34d
-    Reviewed-on: https://code.wireshark.org/review/19458
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6609801
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jan 3 23:01:39 2017 +0100
-
-    RRC: upgrade dissector to v13.5.0
-    
-    Change-Id: I95323ed8aabff7a20442c848fa0dc39854297584
-    Reviewed-on: https://code.wireshark.org/review/19527
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7b17883
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 3 20:43:54 2017 -0800
-
-    Remove trailing whitespace.
-    
-    Change-Id: Ifdea8516ccce7a72c88470913ce36b9226dfcb54
-    Reviewed-on: https://code.wireshark.org/review/19532
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2cc2c2f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 3 20:42:12 2017 -0800
-
-    Put symlinks to the executables in Contents/Resources/bin.
-    
-    PackageMaker appears not to put them into the installer package, so
-    construct them in the Wireshark post-install script.
-    
-    Bug: 13270
-    Change-Id: Idfa10d4d123d2c0e2f7b3ad65888e075fbfd27a7
-    Reviewed-on: https://code.wireshark.org/review/19531
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a2d6fb9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jan 3 18:09:49 2017 -0800
-
-    No reason not to use etype_vals for an Ethertype field.
-    
-    Maybe there was an issue on Windows back in the old days, when 1) we
-    didn't have a shared libwireshark library from which to import functions
-    and data variables and thus you couldn't get variables such as
-    etype_vals in a plugin and 2) the Infiniband dissector was a plugin, but
-    neither of those are the case any more.
-    
-    Change-Id: Id8b82886317bd36a32ad1e1591673623696d4808
-    Reviewed-on: https://code.wireshark.org/review/19530
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ab28624
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Jan 3 14:23:13 2017 -0800
-
-    Ensure that tcp.reassembled_in is added to the tree for first segment.
-    
-    Bug: 3264
-    Change-Id: I9fa8cfaf1e21a8a984941ee40e2e404ae21e55c9
-    Reviewed-on: https://code.wireshark.org/review/19528
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 564051d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Jan 3 14:36:56 2017 +0100
-
-    infiniband: remove offset variable.
-    
-    Change-Id: Ie86c2aece05ebbc35eb15a54d8c3f2c455ff53cf
-    Reviewed-on: https://code.wireshark.org/review/19516
+    (cherry picked from commit fbfb87a2439dd18f2318586b8e5a2f6db410ba6a)
+    Reviewed-on: https://code.wireshark.org/review/22254
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 8c86f3b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Jan 3 12:07:58 2017 +0100
-
-    infiniband: fix error for clobbered variable.
-    
-    Given by gcc-4.9.2 on arm:
-    
-    epan/dissectors/packet-infiniband.c:2708:9: error: variable ‘offset’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
-         int offset = 0;
-             ^
-    cc1: all warnings being treated as errors
-    
-    Change-Id: I12066031093c1fa638792ff8be8f3f5457e3feda
-    Reviewed-on: https://code.wireshark.org/review/19515
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 13851f3
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Mon Jan 2 22:39:13 2017 +0100
-
-    ISAKMP: add Reserved fields
-    
-    Add Reserved fields as defined by:
-    * RFC 7296 for IKEv2
-    * RFC 2408 for IKEv1
-    * draft-ietf-ipsec-isakmp-mode-cfg-05 for the IKEv1 Attributes Payload
-    
-    Change-Id: I0c25de6e543aa5461650fb4cd2c103a6a3a8c392
-    Reviewed-on: https://code.wireshark.org/review/19480
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ab075d3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jan 2 16:24:41 2017 -0500
-
-    Use g_slist_find_custom instead of g_slist_nth when just looking for item in list.
-    
-    Change-Id: Ida3c5d5826f0ca01a25052a67f1460ff4686008f
-    Reviewed-on: https://code.wireshark.org/review/19513
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c950ebd
-Author: Gerald Combs <gerald@zing.org>
-Date:   Mon Jan 2 09:21:37 2017 -0800
-
-    make-version.pl: Fixup library version updates.
-    
-    When updating {epan,wiretap}/{Makefile.am,CMakeLists.txt} make sure we
-    use an absolute path to each file and that we preserve the file's line
-    ending style.
-    
-    Change-Id: Iee62a3ef8e89ca1ddae2569df62025805ee9a238
-    Reviewed-on: https://code.wireshark.org/review/19508
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6f9c4c8
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Mon Jan 2 15:14:07 2017 +0100
-
-    ISAKMP: Fix size of ID in IKEv1 Attributes Payload
-    
-    Fix the size of the Identifier field in the IKEv1 Attributes Payload.
-    Reference: draft-ietf-ipsec-isakmp-mode-cfg-05, section 3.2
-    
-    Change-Id: I30bfde9caa6750b342f7dfbad39e63341614a45b
-    Reviewed-on: https://code.wireshark.org/review/19502
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 6af7425
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Mon Jan 2 13:45:24 2017 +0100
-
-    ISAKMP: fix dissection of IKEv2 ID Payload
-    
-    Fix dissection of the IKEv2 Identification Payload.
-    Unlike IKEv1, it does not have Protocol and Port fields.
-    
-    References:
-    * RFC 2407, section 4.6.2
-    * RFC 7296, section 3.5
-    
-    Change-Id: I968e378abd49363785dd7308a4f27908c1c05a8a
-    Reviewed-on: https://code.wireshark.org/review/19497
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit b358b87
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Jan 1 04:35:57 2017 -0800
-
-    Snort: without explicit disable, expand preference to switch off
-    
-    Change-Id: I5fd3b0cc6f19c4c873aaaae8c9e257a8b53a8419
-    Reviewed-on: https://code.wireshark.org/review/19489
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit b380013
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jan 1 08:10:23 2017 -0800
-
-    [Automatic update for 2017-01-01]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I397e20ffbc5227cb22d838c9eec68fae0e216162
-    Reviewed-on: https://code.wireshark.org/review/19492
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 4b7c278
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Dec 29 16:02:49 2016 +0100
-
-    OpenFlow (v4/1.3): Add complete dissection of error messages
-    
-    Bug: 13221
-    Change-Id: Ide3e734fca280a294a993afade2503cd751d78a2
-    Reviewed-on: https://code.wireshark.org/review/19459
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d7ac90b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jan 1 00:00:01 2017 +0100
-
-    Happy new Year 2017 !
-    
-    Change-Id: I8ae8a1fdc8d0df0779ef119c527f41dac9e0dbdb
-    Reviewed-on: https://code.wireshark.org/review/19476
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4e5408c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 31 21:45:51 2016 -0800
-
-    Fix backwards #if defined.
-    
-    Left over from some stuff I was fiddling with.
-    
-    Bug: 11785
-    Change-Id: Ifb06e8b65db65037b336c46e5e180012ae5b7a59
-    Reviewed-on: https://code.wireshark.org/review/19487
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a6ce00f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 31 21:43:43 2016 -0800
-
-    Squelch a compiler warning from Xcode 8 clang.
-    
-    Unless I'm missing something, that code can't be reached, so local_proto
-    should always be set.
-    
-    Change-Id: Idf765552d66cce684eb0de8dc8da57382aaf8444
-    Reviewed-on: https://code.wireshark.org/review/19486
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8909dff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 31 18:45:00 2016 -0800
-
-    Always use the Windows time zone code on Windows.
-    
-    We *have* to use the Windows code on Windows for the reasons given in
-    the comment.  However, some versions of Visual Studio have a time.h that
-    CMake thinks defines tzname[] (which the header will do under some
-    circumstances), so HAVE_TZNAME gets defined on Windows.  We check for
-    Windows *before* checking for HAVE_TZNAME - or HAVE_STRUCT_TM_TM_ZONE.
-    
-    Bug: 11785
-    Change-Id: I61360daf08203dbd9d109a87c05727b4dbecea66
-    Reviewed-on: https://code.wireshark.org/review/19483
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f30b1e3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Dec 29 13:31:44 2016 -0500
-
-    Make TCP options into a dissector table.
-    
-    This provides external access for dissectors and plugins to provide their
-    own implementation of TCP options.
-    
-    Bug: 13141
-    Bug: 4452
-    Change-Id: I2fa6290616a4d8a8b421dd6daf98a23ce55479b9
-    Reviewed-on: https://code.wireshark.org/review/19461
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a0be5ad
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Dec 29 19:41:33 2016 -0500
-
-    Add interface for "pinos" (Protocols in name only)
-    
-    This is for dissectors that need distinguishing names either for registering
-    multiple dissection functions in a single dissector table or for "internal"
-    dissectors whose just need a name associated with the dissection function.
-    Features like enable/disable are handled by the "parent" protocol.
-    This avoids clutter in the "official" protocol list.
-    
-    Change-Id: I69e7d27d332ae85286f254e95e8d79920da7a9e2
-    Reviewed-on: https://code.wireshark.org/review/19464
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 6a5fcc5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Nov 12 17:04:14 2016 +0100
-
-    TLS(1.3): Add PSK Key Exchanges Modes (45) hello extension
-    
-    Ping-Bug: 12779
-    Change-Id: Ie797a437240e5530d74e3039f12a60a6f0395d0a
-    Reviewed-on: https://code.wireshark.org/review/18916
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f4b0abc
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 16 20:06:11 2016 -0500
-
-    Dissectors don't need a journey of self discovery.
-    
-    They already know who they are when they register themselves.  Saving the
-    handle then to avoid finding it later.
-    Not sure if this will increase unnecessary register_dissector functions
-    (instead of using create_dissector_handle in proto_reg_handoff function)
-    when other dissectors copy/paste, but it should make startup time
-    a few microseconds better.
-    
-    Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43
-    Reviewed-on: https://code.wireshark.org/review/19481
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1396459
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 30 12:26:34 2016 -0500
-
-    Add BASE_NO_DISPLAY_VALUE to allow field value to not be shown.
-    
-    There are times when byte arrays don't want to show their value
-    in the packet tree or there is a field that is the "header" of
-    a subtree where showing the field value distracts from the tree
-    display.  For these cases, BASE_NO_DISPLAY_VALUE can be used
-    to not display the value.
-    
-    Change-Id: I8c9f1f57cd2e663dbee07e2289e7f5e1f22d1e32
-    Reviewed-on: https://code.wireshark.org/review/19479
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2d86159
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 30 16:01:16 2016 +0100
-
-    ENC: fix parsing of header broken by gee242bd
-    
-    From the code before change, it appears that only SPI field is in network byte order.
-    
-    Bug: 13279
-    Change-Id: Ia157b43a9da30d61dc9cb7607c66d44c8f607498
-    Reviewed-on: https://code.wireshark.org/review/19477
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0acd503
-Author: Paul Williamson <paul@mustbeart.com>
-Date:   Wed Dec 28 23:41:22 2016 +0000
-
-    Revert "Support all MA modes, fix BB CRC and frag edge cases"
-    
-    Supporting all MA modes this way makes the dissector useless as a heuristic dissector; it always matches. I just didn't understand about heuristic dissectors, and will look for a better solution.
-    
-    The fragmentation edge cases were also misunderstood. On closer reading of the spec, these are not valid edge cases to be handled smoothly, but packet formatting errors to be diagnosed.
-    
-    The BB CRC fix is valid AFAIK, and will be resubmitted separately.
-    
-    This reverts commit 2563503301aa4321a9a7a1ed392c9cbbe147fd2f.
-    
-    Change-Id: I842f4eca59193b24f41a67ce7d081c681b70f449
-    Reviewed-on: https://code.wireshark.org/review/19449
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2f09610
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Wed Dec 28 22:59:50 2016 +0300
-
-    cms: don't assert if eContent fails to be dissected
-    
-    If eContent is not an octet string, content_tvb will be null, and
-    attempting to use it will trigger an assertion. Besides ill-formed
-    files, this can also occur in old-style PKCS #7 files, since in PKCS #7
-    the corresponding field has the ANY type, rather than OCTET STRING.
-    
-    Change-Id: I9a5bce983aa82107a9602317737c183461cac7f3
-    Reviewed-on: https://code.wireshark.org/review/19448
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e7a4c82
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 30 10:00:02 2016 +0100
-
-    QUIC: Add SMHL (Support Max Header List Size) tag
-    
-    Change-Id: I093f71d3ca409e048211fedf671551721b94d535
-    Reviewed-on: https://code.wireshark.org/review/19474
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f1fb896
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 30 09:54:17 2016 +0100
-
-    QUIC: fix link to error code
-    
-    Change-Id: If5a0e547c1fb952584f7e661ae5ad1abfdf4bec3
-    Reviewed-on: https://code.wireshark.org/review/19473
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5c356aa
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 30 09:48:25 2016 +0100
-
-    enc (openBSD): Add reserved/unused field for flags
-    
-    and fix also bitmap (32 bits)
-    
-    Change-Id: I04b7cb64bf7d593648131c09d05eb8e9b1eca8ca
-    Reviewed-on: https://code.wireshark.org/review/19471
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b4afbb2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 30 09:16:13 2016 +0100
-
-    enc (openBSD): fix flags field description
-    
-    Change-Id: I5b17d4bfea82770458b002aacfca0fc941639899
-    Reviewed-on: https://code.wireshark.org/review/19470
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3761ef3
-Author: Baruch Siach <baruch@tkos.co.il>
-Date:   Thu Dec 29 20:16:53 2016 +0200
-
-    androiddump: add missing sys/time.h header
-    
-    struct timeval requires sys/time.h. Fixes the following musl libc build error:
-    
-    androiddump.c: In function 'useSndTimeout':
-    androiddump.c:262:18: error: variable 'socket_timeout' has initializer but incomplete type
-         const struct timeval socket_timeout = {
-                      ^
-    
-    Change-Id: I52e204f32a012aabea2e54877e564576c072fe08
-    Reviewed-on: https://code.wireshark.org/review/19460
-    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 9312538
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Thu Dec 29 22:59:13 2016 +0100
-
-    UDLD: Use correct flag bits
-    
-    Assigned flag bits are the least significant bits of the flags field,
-    not at the most significant end.
-    
-    Bug: 13280
-    Change-Id: Ie568df6ca137c491fedb32cf2316a0240270b3d6
-    Reviewed-on: https://code.wireshark.org/review/19463
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bd9d8b7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 29 20:15:48 2016 -0800
-
-    Three count 'em three different names for the OS.
-    
-    Change-Id: Icb53c200e95a55b648297bbf5237662c3adaeb84
-    Reviewed-on: https://code.wireshark.org/review/19465
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a76c6cf
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 28 16:15:02 2016 +0100
-
-    lemon: Fix Dereference of null pointer found by Clang analyzer
-    
-    lemon.c:877:10: warning: Access to field 'lhs' results in a dereference of a null pointer (loaded from field 'startRule')
-    lemon.c:1141:22: warning: Access to field 'lhs' results in a dereference of a null pointer (loaded from field 'startRule')
-    
-    it is false positve lem.nrule==0 implies lem.rule==NULL
-    
-    Change-Id: Id63086990762fbf5195bce34a28f25aeb7a246f7
-    Reviewed-on: https://code.wireshark.org/review/19445
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 255722c
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Dec 29 10:20:01 2016 +0100
-
-    Fix Interface Selection List
-    
-    Fixes issue introduced with Ib82519362454094f64abf1cbe6d7bc917990d7ac
-    
-    Change-Id: I9fbf376c03f2ead1575ca30e8ff89dc36d99109f
-    Reviewed-on: https://code.wireshark.org/review/19450
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 7f576aa
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 28 16:22:54 2016 +0100
-
-    zvt: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I0f7a620e5fbdab4a4c6b62b1b7bc884073bc0f45
-    Reviewed-on: https://code.wireshark.org/review/19447
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 763d7f3
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Dec 24 14:01:16 2016 +0100
-
-    zvt: mark some functions as inline
-    
-    Change-Id: I2637fc18b1eeda5e567ee62c8ed53c6757c259bd
-    Reviewed-on: https://code.wireshark.org/review/19457
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit d05be43
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Dec 16 17:47:02 2016 -0500
-
-    zvt: dissect card type and result code bitmaps
-    
-    Change-Id: I26a7821642224c707dc4542a35b2b5b5aee159d5
-    Reviewed-on: https://code.wireshark.org/review/19456
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 4eb5836
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Dec 14 12:50:58 2016 -0500
-
-    zvt: dissect the text lines TLV data object
-    
-    Change-Id: I3d54b4568b883b95294e29347bde0736b78157e1
-    Reviewed-on: https://code.wireshark.org/review/19455
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit af1a148
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Dec 13 18:28:43 2016 -0500
-
-    zvt: dissect the status apdu, add some more bitmaps
-    
-    Change-Id: If74221dd55d61c5794f570daf38c88771f4a2f38
-    Reviewed-on: https://code.wireshark.org/review/19454
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 8f28a52
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Dec 2 20:13:25 2016 +0100
-
-    zvt: add some more tag names
-    
-    Change-Id: If181a22f2794fb9fe812719593f8a7eb642bce42
-    Reviewed-on: https://code.wireshark.org/review/19453
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 9658c0d
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Dec 2 19:13:10 2016 +0100
-
-    zvt: print the tag name in the tree header
-    
-    Change-Id: Iac0744f830020a54790a39820abab9fb756ffa9f
-    Reviewed-on: https://code.wireshark.org/review/19452
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 9bcf111
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Wed Dec 28 14:56:52 2016 +0100
-
-    ISAKMP: add Reserved fields for Fibre Channel
-    
-    Add Reserved fields for Fibre Channel Traffic Selectors.
-    Reference: RFC 4595, section 4.4
-    
-    Change-Id: Iba0b3d9a4d3d96918971a9a597fa313b022b5ca2
-    Reviewed-on: https://code.wireshark.org/review/19444
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3187265
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Dec 17 23:12:11 2016 +0100
-
-    CMake,autotools: enable -Werror=implicit by default
-    
-    The -Wimplicit error covers two warnings, trying to catch these cases:
-    
-    Setting a global variable without declaring its type (-Wimplicit-int):
-    
-        undeclared_type = 1;
-    
-    More importantly, -Wimplicit-function-declaration catches the case where
-    a function is not declared (missing header, programming error, etc.).
-    
-    Turn these warnings into errors, most likely it will be a programming
-    error that results in a link failure anyway. See also
-    https://fedoraproject.org/wiki/Changes/Fedora26CFlags
-    
-    Also fix autotools checks not to trigger -Wimplicit-int and
-    -Wimplicit-function-declaration (in krb5 check due to missing include).
-    Tested on Ubuntu 16.04 (autotools & cmake) and Arch Linux (cmake),
-    configure/cmake output and config.h are identical.
-    
-    Change-Id: I137284263f3b1223df6e6a893111c3640802631f
-    Reviewed-on: https://code.wireshark.org/review/19331
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 52d38a1
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Dec 28 11:11:36 2016 +0100
-
-    Qt: Remove "Extcap" from window title.
-    
-    An average user does not need to know that an interface is of type extcap.
-    Remove "Extcap" from the "Extcap Interface Options" dialog.
-    
-    Change-Id: Iafadf2d312a4ffd5530deeac63194151571fc7d3
-    Reviewed-on: https://code.wireshark.org/review/19443
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit f3df81b
+commit 7da750c
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Dec 28 10:55:32 2016 +0100
+Date:   Mon Jun 19 16:26:45 2017 -0400
 
-    Qt: Fix open extcap help URL.
-    
-    The return value from QString::compare() is equal to zero when the
-    strings are equal.  Fix the code for checking and opening the extcap
-    help URL if not matching "file".
+    Qt: Turn off auto scroll when going to a packet
     
-    This bug was introduced in g46caff30.
+    When going to a packet (first, last, next, prev and specific) during
+    capture we must turn off auto scroll to let the packet be shown
+    in the packet list.
     
-    Ping-Bug: 13218
-    Change-Id: I2a84e61f0191b57269f8ce829ff82200bf19a7ac
-    Reviewed-on: https://code.wireshark.org/review/19442
+    Change-Id: If1c615eb4d422c3b4c0418114064f7a4a0b75b35
+    Reviewed-on: https://code.wireshark.org/review/22244
     Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 40c618e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 27 23:16:19 2016 -0500
-
-    Infiniband: Use base of packet tree (top_tree) for "infiniband.mad.cm.private" heuristic dissector.
-    
-    The "infiniband.payload" heuristic dissector was converted to use the base
-    of the packet tree so that subdissectors could show their protocol as the
-    base layer.  Since many of the subdissectors use the same dissection function
-    for both "infiniband.payload" and "infiniband.mad.cm.private", ensure that
-    both use the same "tree level", but still pass in the "payload tree" as part
-    of the dissector data in case a subdissector wants to use it (currently used
-    by InfinibandSDP)
-    
-    Ping-Bug: 13259
-    Change-Id: I899e8348f6b23d8eee9e74764d8ca32d7bf6e625
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/19441
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Parav Pandit <paravpandit@yahoo.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0e3841c
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Wed Dec 21 21:28:39 2016 +0100
-
-    ISAKMP: add traffic selector subtree
-    
-    Create a new subtree for each traffic selector.
-    
-    Use the length field to find the next traffic selector
-    rather than accumulating the individual TS field sizes.
-    
-    Split dissect_ts() to introduce separate offset variables.
-    After adding the final field, do not advance offset again
-    to avoid unused variable warnings.
-    
-    Change-Id: I9951662c1bb3958994162b25b70b43ec1da103a7
-    Reviewed-on: https://code.wireshark.org/review/19440
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c27ff1d
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Mon Dec 26 12:29:45 2016 -0500
-
-    macosx: Update Read me first.rtf with some additional install/deinstall notes
-    
-    Report that files /etc/paths.d/Wireshark and /etc/manpaths.d/Wireshark
-    are added and should be removed.
-    
-    Change-Id: I2f9d3aea0dd4f86cb9a86065108a3948e28d3001
-    Reviewed-on: https://code.wireshark.org/review/19436
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dd73497
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Mon Dec 26 00:47:57 2016 -0500
-
-    Added basic support for NVM Express over Fabrics for RDMA.
-    
-    NVM Express is high speed interface for accessing solid state drives.
-    NVM Express specifications are maintained by NVM Express industry
-    association at http://www.nvmexpress.org.
-    
-    Bug: 13201
-    Change-Id: Id40edaf72838eea9f4087c8ddba9518a9374efab
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/19063
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Parav Pandit <paravpandit@yahoo.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e5a3992
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Sun Dec 18 00:55:14 2016 +0300
-
-    Move DigestInfo from pkcs12 to cms
-    
-    This type is originally from PKCS #7, the predecessor of CMS, so it makes
-    more sense for it to be there.
-    
-    Change-Id: I3a146f1d000a3bcbcd0d8f1cfe2fc27ed80cc69d
-    Reviewed-on: https://code.wireshark.org/review/19335
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9d47bf9
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Tue Dec 27 10:14:32 2016 +0100
-
-    InterfaceList: Add check for remote interface
-    
-    Add a check, to allow the filtering of remote only interfaces. Also
-    add the necessary options to the type menu.
-    
-    Change-Id: Ib82519362454094f64abf1cbe6d7bc917990d7ac
-    Reviewed-on: https://code.wireshark.org/review/19438
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 8e6953a
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Mon Dec 26 14:40:14 2016 +0100
-
-    Replace assignment with structure assignment (CID 1397183)
-    
-    Replace the individual field assignment with struct assignement to
-    - Reduce code (only single line, but he),
-    - (Hopefully) show Coverity this is as intended.
-    
-    Change-Id: I9400b6e38f86acf57018ee7993e66d5b06d1c39c
-    Reviewed-on: https://code.wireshark.org/review/19434
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fc29f28
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Dec 26 09:34:13 2016 -0500
-
-    Merge AIM files into single dissector file.
-    
-    These are probably obsolete dissectors anyway, but they are a
-    bunch of very small files causing unnecessary file pollution.
-    
-    Change-Id: I03976484996b4bf987d6743ed379534456809c2c
-    Reviewed-on: https://code.wireshark.org/review/19437
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6427edb
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Dec 23 19:06:24 2016 +0100
-
-    zvt: dissect the TLV container's payload
-    
-    add a function to dissect the sequence of TLV elements
-    use a hash table for payload functions like we do for the bitmaps
-    add two tags whose payload is another TLV sequence
-    
-    Change-Id: Ibb19fd7af2f58e201174d07d410557dc315c652a
-    Reviewed-on: https://code.wireshark.org/review/19435
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit e41201c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Dec 26 08:04:12 2016 -0500
-
-    Don't claim packet as MATE if there is no MATE configuration
-    
-    This prevents MATE from (falsely) being included in the list of
-    protocols for any given frame.
-    
-    Change-Id: I9ffdfb52cf31dfda89b674a41bcc0992e17de5e8
-    Reviewed-on: https://code.wireshark.org/review/19432
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 730b2ed
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 25 08:34:52 2016 -0800
-
-    [Automatic update for 2016-12-25]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I8fd8115fdfd4623bdf94602b6fd55a724e09cec3
-    Reviewed-on: https://code.wireshark.org/review/19429
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 96d1510
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 24 21:00:36 2016 -0500
-
-    Remove individual post-dissect enable preferences.
-    
-    Use Analyze -> Enabled Protocol dialog interface.  Added support
-    for backwards compatibility of preference.
-    
-    Change-Id: I32b3fce9d18083d9324197e3fd7ddc7eb888d1fb
-    Reviewed-on: https://code.wireshark.org/review/19422
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4270b48
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Dec 23 00:20:13 2016 +0100
-
-    DVB-CI: simplify dissection of the resource id
-    
-    Now that proto_tree_add_bitmask_value_with_flags() works for tvb==NULL,
-    we can use it to simplify the dissection of DVB-CI's resource id.
-    
-    Change-Id: Ia09d5668bf0a61161ecd0cb412680838a67d7a7a
-    Reviewed-on: https://code.wireshark.org/review/19409
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 68fc3e0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 25 01:39:34 2016 -0800
-
-    Wireshark doesn't require X11 any more.
-    
-    Change-Id: Ib5ba38e5103f31f115608b92dd32f3ce1e5eec67
-    Reviewed-on: https://code.wireshark.org/review/19424
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 14603ea
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 25 00:22:31 2016 -0800
-
-    Fix some narrowing warnings.
-    
-    Don't narrow values until it's necessary, and then put in explicit casts
-    to indicate that the narrowing is intentional.
-    
-    Change-Id: I8afc2a457822febbed33cee573953993013a7185
-    Reviewed-on: https://code.wireshark.org/review/19423
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 45553db
-Author: Francois Schneider <francois.schneider@airbus.com>
-Date:   Wed Feb 17 21:34:52 2016 +0100
-
-    packetbb: Add decoding for TLV with single value
-    
-    Bug: 4118
-    Change-Id: I282fb8da657701c5b855dafe1568a5f226d3c12b
-    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/13985
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3a55ec3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 15:43:29 2016 +0100
-
-    rtp_analysis_dialog (Qt): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I48dd8af83c97301b6bd314801ca36ac13c790eaa
-    Reviewed-on: https://code.wireshark.org/review/19413
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 78d56e5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 24 17:54:36 2016 -0500
-
-    Cleanup transum post-dissector.
-    
-    1. Enable/disable preference not needed - just use Enabled Protocol
-    dialog interface.  Added support for backwards compatibility of preference.
-    2. Add value_string for calculation values
-    3. Create an structured array of "hfs of interest" so they can more easily
-    be extended.
-    4. Convert a bunch of arrays into hash tables and lists.  For the amount
-    of wasted space they were taking up, we can live with the very slight
-    performance degrade.  Also puts less limits on number of things to process.
-    
-    Change-Id: I7399789d62432b507062ed9cdc20ad974b9dde1b
-    Reviewed-on: https://code.wireshark.org/review/19406
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2563503
-Author: MustBeArt <paul@mustbeart.com>
-Date:   Mon Dec 19 09:59:26 2016 -0800
-
-    Support all MA modes, fix BB CRC and frag edge cases
-    
-    Support all four mode adaptation interface formats. Add a user preference to
-    specify which format is in use, or to request that the format be guessed.
-    Guessing is improved, but can never be reliable.
-    
-    Fix problem with baseband header CRC check that caused almost all packets to
-    show a spurious CRC error, introduced with proto_tree_add_checksum.
-    
-    Fix problem with GSE PDU fragmentation CRC beginning in one fragment and
-    ending in another. Any GSE frames following the fragment containing the
-    end of the CRC would be parsed at the wrong offset.
-    
-    Fix problem with IPv4 or IPv6 starting exactly on a fragmentation boundary,
-    so that one baseband frame contains the complete GSE header but zero bytes
-    of the IP payload. Trying to further dissect the zero-length payload led to
-    a "malformed packet" display.
-    
-    Standardize spelling per governing document: adaption -> adaptation
-    
-    Change-Id: I69e64e74e4b4f02515411471e1d76b0eeb02fef1
-    Reviewed-on: https://code.wireshark.org/review/19421
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 802362e
-Author: Mikael Kanstrup <mikael.kanstrup@gmail.com>
-Date:   Sat Mar 19 09:36:57 2016 +0100
-
-    Avoid recursive scan_local_interfaces operation
-    
-    When the local networks interfaces changes quickly or when refreshing the
-    list of network interfaces there's a risk of recursive calls into
-    scan_local_interfaces. The recursive calls are a result of calling
-    update_cb to process UI events during function operation which in turn
-    again discover a network interface change. This results in strange
-    duplicate entries of network interfaces and crashes.
-    
-    To avoid recursive calls a check is added to stop running the function while
-    already updating. This patch is really just a workaround for the problem.
-    Ideally some asynchronous operation should be implemented instead to avoid
-    the UI update_cb callback alltogether.
-    
-    Bug: 11553
-    Bug: 12263
-    Change-Id: I3b74d8f196677e0e261a395aff558dd9f685b538
-    Reviewed-on: https://code.wireshark.org/review/14492
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 194433a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Dec 22 14:19:30 2016 +0100
-
-    udpdump: remove libwireshark dependancy.
-    
-    Export pdu routines have been rewritten here on purpose.
-    
-    Change-Id: If4879de4c98b6f20a75df158cae0cf9a80ffae57
-    Reviewed-on: https://code.wireshark.org/review/19384
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b58c98b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 19:19:53 2016 +0100
-
-    802.11(ad): split Sector Sweep Feedback in 2
-    
-    one from ISS and other to ISS
-    
-    Add also reserved field
-    
-    Issue reported by Hany ASSASA
-    
-    Bug:13244
-    Change-Id: Ib20cf6ae455664b87ea3470ebb6d5386a97b0f48
-    Reviewed-on: https://code.wireshark.org/review/19420
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4515a7e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 18:09:39 2016 +0100
-
-    802.11(ad): fix typo
-    
-    Acknoledgment => Acknowledgment
-    
-    Ping-Bug: 13244
-    Change-Id: Ia2e8eedec05c39ed0ebc38235cc52d43488e00d4
-    Reviewed-on: https://code.wireshark.org/review/19419
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 62a54cb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 16:53:49 2016 +0100
-
-    802.11(ad): Enhance dissection of Beam Refinement
-    
-    You can now use bitmap on 64bits (or 40bits)
-    
-    and also add a reserved field
-    
-    Change-Id: Ibc68b56477e76c2b13624920eb7a9a49f8f887f3
-    Ping-Bug: 13244
-    Reviewed-on: https://code.wireshark.org/review/19418
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bdc8844
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 16:11:37 2016 +0100
-
-    802.11(ad): Add reserved field for BRP Request
-    
-    Change-Id: Iee6012e841007b731dc16545a1d9bf6f17377580
-    Ping-Bug: 13244
-    Reviewed-on: https://code.wireshark.org/review/19417
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1bd6288
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 15:58:39 2016 +0100
-
-    802.11(ad): fix wrong bitmask for BRP TX Antenna
-    
-    Missing a zero
-    
-    Change-Id: I43097bc62fb66dea849c5ed7882d01a6de768c82
-    Ping-Bug: 13244
-    Reviewed-on: https://code.wireshark.org/review/19416
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 60551ea
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jun 18 00:20:54 2016 +0200
-
-    Lemon: resync with upstream
-    
-    lemon: Tue Aug 16 16:46:40 2016
-    lempar: Tue Dec 6 17:59:05 2016 +0000
-    
-    a copy of all Wireshark changes are available https://github.com/alagoutte/sqlite/tree/wireshark
-    
-    Change-Id: I144d0f983e4ac960b5a7a2fd8cd379f6282579f8
-    Reviewed-on: https://code.wireshark.org/review/15987
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d98a3cb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 18:07:44 2016 +0100
-
-    AFP: fix indent (use tabs)
-    
-    Change-Id: I3d1078ddff6ec7b9c7efc5cda9a1821ef52b46ce
-    Reviewed-on: https://code.wireshark.org/review/19415
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d82b9f6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 15:35:41 2016 +0100
-
-    ppi-vector: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I44ae8a9cc6b09ad205b9c90e7d9595768fcac71b
-    Reviewed-on: https://code.wireshark.org/review/19412
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5aac1e7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 15:34:44 2016 +0100
-
-    bthci_evt: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: Ic9962a1824b9f9d137177c81cb15d7ef4bc7bfc2
-    Reviewed-on: https://code.wireshark.org/review/19411
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2d25e4f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 24 17:54:58 2016 +0100
-
-    disabled_protos: fix no previous prototype for function 'read_protos_list' [-Wmissing-prototypes]
-    
-    Change-Id: I5bfa11213ca27308204a1d8b6073661161c9151e
-    Reviewed-on: https://code.wireshark.org/review/19414
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0c4d074
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Dec 24 13:16:38 2016 +0100
-
-    extcap_options_dialog: fix compilation with Qt4
-    
-    Qt4's QFileInfo::exist() can only be used with an existing QFileInfo
-    object. The version that accepts the file name as paramter was
-    introduced in Qt5.
-    
-    Create a temporary QFileInfo object and call exists() on this object.
-    
-    Change-Id: I162cc22ecba61b2c2f16f9f0916b0db7969abb51
-    Reviewed-on: https://code.wireshark.org/review/19408
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 55549f5
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Nov 27 15:30:48 2016 +0100
-
-    zvt: len is used in dissect_zvt_int_status()
-    
-    Change-Id: I8937dc605abf0414159acfc75ee05ccac89658fb
-    Reviewed-on: https://code.wireshark.org/review/19410
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit ad7caed
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 23 22:24:05 2016 -0500
-
-    [TRANSUM] smb2.msg_id is now a FT_UINT64.
-    
-    Per bug 12915, SMB2 message ID should be treated as a unsigned 64bit value.
-    Have transum logic match that as it was assuming SMB2 message ID was a
-    signed 64bit value
-    
-    Change-Id: Ide0c12b505d1eef2aeb89d165a3ea59058e6be34
-    Reviewed-on: https://code.wireshark.org/review/19407
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c302812
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 23 15:20:31 2016 -0500
-
-    Add enabled protocol list for dissectors who are disabled by default
-    
-    We save a list of dissectors that are disabled through the Enabled Protocols
-    dialog.  This is because we assume dissectors are enabled by default.
-    
-    For dissectors that are disabled by default, we have no way to keep them
-    enabled through the Enabled Protocols dialog.  A dissector that defaults
-    to being disabled has to be reset to enabled each time Wireshark is launched.
-    
-    Add a list similar to the disabled list for enabling dissectors that are
-    disabled by default.
-    This mostly applies to post-dissectors.
-    
-    Change-Id: I31a8d97a9fdbc472fe2a8666384e0f8786bb8e9f
-    Reviewed-on: https://code.wireshark.org/review/19405
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fb9a4d7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 23 09:06:44 2016 -0500
-
-    Set BCP BPDU to size of bytes used by the protocol, not whole packet.
-    
-    Bug: 13188
-    Change-Id: I29b2712d4d6ae57e4b0ea4bc0ec126cb80172779
-    Reviewed-on: https://code.wireshark.org/review/19400
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ec54234
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 23 13:16:20 2016 +0100
-
-    bthci_cmd: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I84472632e715a6f13e2fa5b58ae95f9dc9d16776
-    Reviewed-on: https://code.wireshark.org/review/19399
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a1ecbc9
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Dec 23 00:20:56 2016 +0100
-
-    make proto_tree_add_bitmask_value_with_flags() work for tvb==NULL
-    
-    proto_tree_add_bitmask_value_with_flags() eventually calls
-    proto_tree_add_XXX() for the main hf and for the field elements.
-    
-    These functions work for tvb==NULL if the length is also set to 0.
-    Otherwise, we'll end up in proto_tree_add_pi(), get_hfi_length() and
-    run into the DISSECTOR_ASSERT() there.
-    
-    proto_tree_add_bitmask_value...() are meant for cases where the data is
-    passed directly and not read from a tvb. If tvb==NULL, set our length to
-    0 instead of using the field length from the main hf.
-    
-    Change-Id: Ia55b068e9842ba4a1ae8be8692320a8e93ea8631
-    Reviewed-on: https://code.wireshark.org/review/19394
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 46caff3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Dec 9 15:01:54 2016 +0100
-
-    Qt: add local file existence check for extcap help.
-    
-    The extcap help pages point to local manpages. Check the existence
-    of local file before attempting to open them, and if it fails, give
-    the user an error.
-    
-    Ping-Bug: 13218
-    Change-Id: I0e0ff1e66e439d3ff8c992dbb42652782c047bb5
-    Reviewed-on: https://code.wireshark.org/review/19180
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit f15b3a0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 23 01:00:44 2016 -0800
-
-    Make sure we know that a RNG_RSP_DL_FREQ_OVERRIDE item is present.
-    
-    Set a variable that we were supposed to be setting.
-    
-    Also, note some items that should probably be expert info items instead
-    of, or in addition to, additional text at the end of protocol tree items.
-    
-    Addresses CID 1397702.
-    
-    Change-Id: I2ff0c2549f229546035964efa6af19b77646f7d2
-    Reviewed-on: https://code.wireshark.org/review/19397
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 933a731
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Dec 22 22:16:43 2016 +0100
-
-    DVB-CI: don't call proto_tree_add_subtree_format() with tvb==NULL
-    
-    When I first implemented this, proto_tree_add_subtree_format() worked
-    for tvb==NULL if len was also 0. The bounds check added in
-    56706427f53cc64793870bf072c2c06248ae88f3 breaks this use case and makes
-    DVB-CI spill out dissector asserts.
-    
-    Warn Dissector bug, protocol DVB-CI, in packet 625:
-    ../epan/tvbuff.c:532: failed assertion "tvb && tvb->initialized"
-    
-    Create a proto_item first and link the subtree to this item. This will
-    work as long as proto_tree_add_uint() accepts tvb==NULL.
-    
-    Thanks to Kay Katzorke for reporting this bug.
-    
-    Change-Id: I25a071c21925f7d362c92852fd5a8136e4d361c8
-    Reviewed-on: https://code.wireshark.org/review/19389
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit abe78e9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 23 09:44:38 2016 +0100
-
-    GSM A GM: align protocol / container id filter format with displayed one
-    
-    Change-Id: If5dcee6a2a9dd6de304e78f84456903c932ad452
-    Reviewed-on: https://code.wireshark.org/review/19393
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c1e1f62
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 23 09:34:42 2016 +0100
-
-    GSM A GM: use same spelling as the 3GPP specification
-    
-    Change-Id: I706b64bb3875a15d8be0e486a03784e19ab5af23
-    Reviewed-on: https://code.wireshark.org/review/19392
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit b013d5c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 22 19:29:46 2016 -0800
-
-    Initialize the dissection options along with the other command-line options.
-    
-    Change-Id: I35ff8f36d12831d408666c3422444371a2ac0c25
-    Reviewed-on: https://code.wireshark.org/review/19391
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5c1b898
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Thu Dec 22 11:37:19 2016 +0100
-
-    packet-rtp.c: Fix of decoding RTP over TCP
-    
-    During patch modification in https://code.wireshark.org/review/#/c/19293/ we made mistake :-(
-    
-    Change-Id: I2ff65170dbcf3b5c4d27d6d7c629092d5080ed28
-    Reviewed-on: https://code.wireshark.org/review/19382
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b97af3a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Dec 22 11:43:05 2016 +0100
-
-    udpdump: set default value for payload
-    
-    Change-Id: Iad8624cbb9102611f806cdcce152b8ed14ce4474
-    Reviewed-on: https://code.wireshark.org/review/19383
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8c70558
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Dec 22 15:14:47 2016 +0100
-
-    RPC: fix crash when using "Dissect unknown RPC program numbers" option
-    
-    When using this option, rpc_prog_info_value structure is not fully initialized.
-    Depending on the memory allocator used, this can lead to a NULL pointer
-    dereference or an access to a random memory block.
-    Ensure that the structure if fully initialized and test pointer before
-    dereferencing it.
-    
-    Bug: 13266
-    Change-Id: Ifdc54b31c8dd3b2b6220dbe9ee27272758ff60ca
-    Reviewed-on: https://code.wireshark.org/review/19385
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 541beaa
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Dec 22 09:36:18 2016 +0100
-
-    Qt: use references on tap_rtp_stat_t private members (CID 1397703 and 1397704)
-    
-    This should solve the "passing parameter statinfo of type "tap_rtp_stat_t"
-    (size 5040 bytes) by value" warnings reported by Coverity.
-    
-    Change-Id: I327906f7925ab21a914b8a98ff8481a0af9f7a2f
-    Reviewed-on: https://code.wireshark.org/review/19380
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit be4dbf840b164ab9b788ee8c3a9466e2da1393d2)
+    Reviewed-on: https://code.wireshark.org/review/22259
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 61d2c8f
+commit 1c4b185
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Dec 22 09:49:56 2016 +0100
+Date:   Mon Jun 19 22:12:22 2017 +0200
 
-    RTP: fix a possible NULL pointer dereference (CID 1397705 & 1397706)
+    AMQP: workaround some proto_tree_add_none_format() asserts
     
-    As those dissectors are registered by name, let's not make the assumption
-    that rtp_info is always present.
+    Previously proto_tree_add_none_format() could be called with any type
+    of field type, not FT_NONE only.
     
-    Change-Id: I959b8c71485471b3be4cd2e71a6d96c2d4b278ff
-    Reviewed-on: https://code.wireshark.org/review/19381
+    Change-Id: I78976a168fc1bf606b72ad38d284bb0bd1794b03
+    Ping-Bug: 13780
+    Reviewed-on: https://code.wireshark.org/review/22243
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b3b23ff
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Dec 22 09:28:05 2016 +0100
-
-    Gtk: add initializers.
-    
-    As per coverity multiple CIDs.
-    
-    Change-Id: I30b5a5e45de2fc9b3c563c56151bd33483c754cd
-    Reviewed-on: https://code.wireshark.org/review/19379
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-
-commit 1a38cde
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Wed Dec 14 22:55:05 2016 +0100
-
-    RTSP dissector: Decode RTP/AVP/TCP and configure RTP session for it
-    
-    rtsp_create_conversation was modified significantly:
-    - ignore non response calls => process only the complete information
-    - distinguish between UDP, TCP and RTSP interlaced media
-    - supports ED137 recording with RTP/UDP or RTP/TCP
-    
-    It was tested on many samples from bugzilla and from my library.
-    Tests noted in bug 13257
-    
-    Bug: 13257
-    Change-Id: I054505bcb9334c3abfff6d61c18c9cb6d2a6d56e
-    Reviewed-on: https://code.wireshark.org/review/19341
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 2de483c0925a5a93cdaee168997f3f3c7949d2d4)
+    Reviewed-on: https://code.wireshark.org/review/22257
 
-commit 32a31c5
+commit c558379
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 21 22:26:37 2016 +0100
+Date:   Mon Jun 19 20:40:52 2017 +0200
 
-    GTK: fix Export Objects sub menu warning
+    MQ: check fragment length before trying to perform reassembly
     
-    Change-Id: I513fd643a8c4849462ee6c4b296d86d04517b3db
-    Reviewed-on: https://code.wireshark.org/review/19378
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Bug: 13792
+    Change-Id: Id0c116655288c5a3347911281a932ae80250c24f
+    Reviewed-on: https://code.wireshark.org/review/22233
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 5a3d31b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 21 21:46:02 2016 +0100
-
-    NAS EPS: upgrade dissector to v13.8.0
-    
-    Change-Id: Ifad1fbd22984ad777278c7cc90622b205405cf1f
-    Reviewed-on: https://code.wireshark.org/review/19377
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 41951f9
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Dec 20 13:22:15 2016 +0100
-
-    [rpm-build] Add an option to exclude extcap.
-    
-    Change-Id: Ibe16ad31986818fcd6e1bfbcfdd38ecc7663dd39
-    Reviewed-on: https://code.wireshark.org/review/19360
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit d70d32e
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Wed Dec 21 10:13:53 2016 -0500
-
-    CIP: More attribute updates
-    1. CIP Safety: SERCOS Safety Network Number attribute should be 6 bytes. Don't just use all remaining bytes
-    2. Remove cip_byte_array type. The last remaining usage was #1 above and it really shouldn't be used in the future. Any attribute that would eat up all remaining bytes would have issues with Get Attribute List responses and Set Attribute List requests.
-    3. Optional Attribute List: Display the attribute name if known.
-    4. Port: Display Port Number name
-    5. Port: Associated Communication Objects attribute
-    
-    Change-Id: I94d99bb1f07aa4b8c44949b2ffb5d75e72483459
-    Reviewed-on: https://code.wireshark.org/review/19374
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    (cherry picked from commit bb58b3a2643ab81560d84b00be3a9b9e86f0393c)
+    Reviewed-on: https://code.wireshark.org/review/22251
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 5b1b136
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Mon Dec 19 14:59:39 2016 -0500
-
-    packet-rpcrdma: Fix Reply chunk selection size
-    
-    When a Reply chunk is not present, selecting the "Reply chunk" in
-    the protocol tree should also select the four bytes of zeroes in
-    the header. This should work the same way as for the Read list and
-    Write list.
-    
-    Change-Id: I0a9b7f927cad21e39189cfc1f2b619537ba26a30
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19376
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a5f1afe
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 21 13:56:45 2016 +0100
-
-    decoders(transum): fix redundant redeclaration of 'add_detected_tcp_svc’ [-Wredundant-decls]
-    
-    Change-Id: I70ccf182160086a4c04467eec214857a461a2869
-    Reviewed-on: https://code.wireshark.org/review/19373
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c7a4647
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 21 13:51:29 2016 +0100
-
-    transum: fix no previous prototype for ‘proto_register_transum’ [-Wmissing-prototypes]
-    
-    the last one
-    
-    Change-Id: I8b279d11b61645a19b0b356d52cf66eed0180700
-    Reviewed-on: https://code.wireshark.org/review/19372
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fcae13f
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Dec 21 12:46:15 2016 +0100
-
-    Lua: Fix some typos.
-    
-    Change-Id: I4d1cf878245b03665207a500fb7593be1435c3d3
-    Reviewed-on: https://code.wireshark.org/review/19371
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 031db50
-Author: chinarulezzz <s.alex08@mail.ru>
-Date:   Wed Dec 21 06:20:55 2016 +0200
-
-    packet-tns.c: add Version and Services parsing for SNS messages.
-    
-    Tested with pcaps from SampleCaptures wiki.
-    
-    Change-Id: I13656ec484f276024160c8994a6750704058b2db
-    Reviewed-on: https://code.wireshark.org/review/19367
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 56cf699
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 21 08:05:12 2016 +0100
-
-    transum: fix no previous prototype for '...’ [-Wmissing-prototypes]
-    
-    Part 2...
-    
-    Change-Id: Id219bd2b04de2003b5bfa4a33893d0310856275d
-    Reviewed-on: https://code.wireshark.org/review/19368
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2ff7f36
+commit c3c2e84
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 21 10:39:41 2016 +0100
+Date:   Mon Jun 19 21:23:47 2017 +0200
 
-    gsm_abis_om2000: restore offset increment removed by g1643e37
+    AMQP: fix a stack overflow when offset goes back and forth
+    
+    Previous code assumed that list decoding was successful and that some
+    bytes were consumed. Let's explicitly check this.
     
-    Change-Id: I34666a74f8769c63ecc982bd034b2563ba0298ff
-    Reviewed-on: https://code.wireshark.org/review/19370
+    Bug: 13780
+    Change-Id: I3546b093f309f2b8096f01bc9987ac5ad9e029eb
+    Reviewed-on: https://code.wireshark.org/review/22235
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8cc9fd6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 21 08:07:29 2016 +0100
-
-    gsmtap_log: fix no previous prototype for function 'proto_register_/reg_handoff_gsmtap_log' [-Wmissing-prototypes]
-    
-    Change-Id: I5fbd79f056cff330dafbe57ea350768acd820b65
-    Reviewed-on: https://code.wireshark.org/review/19369
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a8b6820
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Dec 21 02:23:35 2016 +0100
-
-    packet: duplicate short_name to fix UAF in wslua
-    
-    The "short_name" parameter of heur_dissector_add is defined as const
-    (and was assumed to be a string literal). This was no longer the case
-    though since a change in Lua where "short_name" is a dynamically
-    allocated string.
-    
-    This "simple" fix clones the memory for internal use to avoid a
-    heap-use-after-free when heur_dissector_delete tries to access
-    "short_name".
-    
-    An alternative option is to make Proto_register_heuristic track the
-    memory, but since there are multiple possible heuristics lists for a
-    protocol, the Proto (struct _wslua_field_t) structure is not
-    appropriate. A possible working alternative is to store the string into
-    lua_heur_dissectors_table_ref (replacing the value (function) by a tuple
-    {function,short_name}).
-    
-    Change-Id: I6c6b393f4d304dd847e864da6ad17b54c8cd80e2
-    Fixes: v2.3.0rc0-1474-g7f2a838922 ("lua: Allow proto:register_heuristic to be used on multiple list names")
-    Reviewed-on: https://code.wireshark.org/review/19365
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Franklin Mathieu <snaipe@diacritic.io>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 92cd2c3
-Author: Etienne Dechamps <etienne@edechamps.fr>
-Date:   Sun Oct 23 11:32:29 2016 +0100
-
-    X-Rite i1 Display Pro USB protocol dissector.
-    
-    This commit introduces a new dissector aimed at decoding the USB
-    protocol used by X-Rite i1 Display Pro (and derivatives) colorimeter. It
-    is based on reverse engineering work by Graeme Gill from the ArgyllCMS
-    project.
-    
-    Change-Id: Icdfd0c3f75499d0df4360c6eb6856078de30ba56
-    Reviewed-on: https://code.wireshark.org/review/18901
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4c50e4b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 20 08:58:49 2016 -0500
-
-    Improve Infiniband heuristic subdissection.
-    
-    Add preference in Infiniband dissector to distinguish between
-    heuristic and non-heuristic dissection (that uses Decode As).
-    Remove all of the preferences in the Infiniband subdissectors that
-    tried to put in "manual" heuristics and direct users to just use
-    Decode As.  Most subdissectors still kept some basic heuristics in
-    their heuristic functions, but now also register with the Infiniband
-    dissector table for "manually" forcing dissection with Decode As.
-    
-    Ping-Bug: 13259
-    Change-Id: I20d56eee38887664b439e52ec5f5b8f962c45ef1
-    Reviewed-on: https://code.wireshark.org/review/19362
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit caadaaf
-Author: Ethan Young <imfargo@gmail.com>
-Date:   Sun Dec 18 15:37:56 2016 -0500
-
-    Make EAPOL packet types into a dissector table.
-    
-    This decouples EAPOL from the few dissectors it needs to call based
-    on packet type and moves registration to the dissectors themselves.
-    
-    Change-Id: Ia8412fe33370f4aeece52c2c80cda7f140a950cf
-    Reviewed-on: https://code.wireshark.org/review/19328
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b7ee557
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 9 17:03:45 2016 -0500
-
-    Add HomePNA dissector
-    
-    Ping-Bug: 12759
-    Change-Id: Ic4d47155168978541fb8c3670fcabaf3c35f8aad
-    Reviewed-on: https://code.wireshark.org/review/19187
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5672929
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 20 20:07:08 2016 +0100
-
-    ICMP: fix typo
-    
-    Change-Id: Iffa10a3a14ec2ff32e51d92a1936d7e110a76bd4
-    Reviewed-on: https://code.wireshark.org/review/19364
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c01d8b7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 20 20:06:53 2016 +0100
-
-    ICMP: fix indent (use always tab)
-    
-    Change-Id: I939bf83ef6f6385dbad642aeef38673862c04bf0
-    Reviewed-on: https://code.wireshark.org/review/19363
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 98d350a
-Author: Your Name <you@example.com>
-Date:   Mon Dec 19 22:05:36 2016 -0500
-
-    Cast larger types to time_t
-    
-    Resolves truncation warnings on the x86 clang build
-    
-    Change-Id: I14ebbe39b8235bd1b909c488c0402b77deb6dde1
-    Reviewed-on: https://code.wireshark.org/review/19354
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 795f4eb
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 13 10:33:02 2016 -0800
-
-    Qt+Win32: Make software updates more friendly.
-    
-    Add WinSparkle can_shutdown and shutdown_request callbacks which are
-    called prior to running the installer. Reject updates when we have
-    unsaved information. Add notes about possible improvements.
-    
-    Ping-Bug: 9687
-    Ping-Bug: 12989
-    Change-Id: Ia126244b311417aa3105ea8136f186adc2745445
-    Reviewed-on: https://code.wireshark.org/review/19244
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0de990e
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Tue Dec 20 12:04:05 2016 +0100
-
-    packet-rtp.c: Fixed problem - when ED137 header was decoded with tshark, no ED137 headers were shown.
-    
-    Change-Id: Ic072212497ff084778f74d19be294a5b8ff8cbd5
-    Reviewed-on: https://code.wireshark.org/review/19359
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e9b4153
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Dec 18 19:03:44 2016 +0100
-
-    Lua: Add string types and byte seperators support.
-    
-    Add handling of STR_ASCII and STR_UNICODE as base types for string
-    and stringz.  Add handling of SEP_DOT, SEP_DASH, SEP_COLON and
-    SEP_SPACE for bytes and uint_bytes.  Add SEP_NONE for completeness.
-    
-    Change-Id: Ida46c215fee7ec7132ec91ab5dd6cb3de4628920
-    Reviewed-on: https://code.wireshark.org/review/19337
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit d5fdbef
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Dec 18 16:49:24 2016 +0100
-
-    cmake,wslua,wsutil: load files from run/ instead of source tree
-    
-    Fixes Lua on macOS, tested with an out-of-tree build:
-    
-        WS_BIN_PATH=$PWD/run ../wireshark/test/test.sh -s wslua
-    
-    Previously programs that were ran from the build directory would load
-    data files (radius/, diameter/, init.lua) from the source directory.
-    Then in the case of Lua, files were loaded from the program directory
-    ($BUILDDIR/run/init.lua on Linux) or source directory
-    (sSOURCEDIR/epan/wslua/console.lua).
-    
-    On macOS, this does not work for Lua since files are installed into
-    $BUILDDIR/run/Wireshark.app/Contents/Resources/share/wireshark/init.lua
-    instead. Since CMake always copies data files (radius, console.lua,
-    etc.) into the build directory, make get_datafile_dir() return this
-    "run" directory instead.
-    
-    Change-Id: If97d2f5686271caf9ad4d4e4fc58e902dc592a98
-    Reviewed-on: https://code.wireshark.org/review/19330
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit bd0fa39
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Dec 20 13:32:53 2016 +0100
-
-    Lua: Remove an obsolete comment.
-    
-    Change-Id: I6a946eb44f4a574d6d9add3604b2dac924c33a9f
-    Reviewed-on: https://code.wireshark.org/review/19361
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 24ecc1c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Dec 20 09:41:20 2016 +0100
-
-    Gtk: don't use GTimeZone/GDateTime
-    
-    Use struct tm instead.
-    
-    Change-Id: I678797b93062305849875b33867faa52379c3dcb
-    Reviewed-on: https://code.wireshark.org/review/19356
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 246cbbc2ea6dd0a3a69a1aaa94db244a77565353)
+    Reviewed-on: https://code.wireshark.org/review/22248
 
-commit d4eeeaf6
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Dec 17 10:08:54 2016 +0100
-
-    Lua: Add unit names support.
-    
-    Add support for using unit names in ProtoField integer types by
-    using base.UNIT_STRING.
-    
-    Add unit name table argument in ProtoField.float() and
-    ProtoField.double() (and made backward compatibility).
-    
-    The use of base.UNIT_STRING is not really the best API for adding
-    unit names in Lua, but is the simples solution without adding new
-    arguments to ProtoField.
-    
-    Change-Id: Ib5d064480cffd970a41db1764440642f6c593bb2
-    Reviewed-on: https://code.wireshark.org/review/19313
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit d9cc2b5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 20 00:44:31 2016 -0800
-
-    Update comments and messages for the new name for Apple's OS for Macs.
-    
-    Change-Id: I96be861220f6052cb1bc61f5f4e74e76821ff565
-    Reviewed-on: https://code.wireshark.org/review/19358
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e5596b7
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Dec 9 11:52:42 2016 +0100
-
-    extcap: set help page for all extcaps.
-    
-    They've been set to the manpage of the local filesystem.
-    
-    Ping-Bug: 13218
-    Change-Id: Iacd5d2ba7ae39ee1718b59747c245d1c07785e8f
-    Reviewed-on: https://code.wireshark.org/review/19179
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 87a9a29
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 19 15:40:59 2016 +0100
-
-    btle: Add a convenience btle.length field
-    
-    Add a convenience btle.length field for easier filtering of BTLE
-    packets without data and with specific length ranges.
-    
-    Change-Id: If56eac9c86ccf40741a6ceb50d13a1733132f448
-    Reviewed-on: https://code.wireshark.org/review/19348
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 1656261
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 19 21:29:27 2016 -0800
-
-    Use -bbigtoc for libwireshark on AIX (if we're using GCC or Clang).
-    
-    This will have to be done differently with xlc if it's necessary.
-    
-    While we're at it, fix the spelling of "Cygwin" (no InterCaps).
-    
-    Bug: 13262
-    Change-Id: If3084cfb58f4abd9048afafecdd24c13645c2776
-    Reviewed-on: https://code.wireshark.org/review/19355
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 23d80b0
+commit d9cbe24
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 19 10:54:50 2016 -0800
+Date:   Mon Jun 19 12:46:42 2017 -0700
 
-    Don't use PCAP_ERROR if it's not known to be defined.
+    Register for SFLOW_245_HEADER_FDDI.
     
-    The introduction of pcap_list_datalinks() predates the introduction of
-    PCAP_ERROR, so the presence of pcap_list_datalinks() doesn't guarantee
-    that PCAP_ERROR is defined.  Change the use of PCAP_ERROR when checking
-    the result of pcap_list_datalinks() to just check for -1.
+    In 609ea4baa62a523434cdd8ff350d56d135d588ae
+    (I459249b98741cc069495c84ad4c47c0aa6768096) I unintentionally removed
+    the registration.  Put it back.
     
-    Change-Id: Id8229b7aebd02eaf3701983f9343503397af4fb3
-    Reviewed-on: https://code.wireshark.org/review/19351
+    Change-Id: I4769fc10d74fe7358f9794b9697591c61324e883
+    Reviewed-on: https://code.wireshark.org/review/22239
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 051921854d8720123bd671af3ba3a123da2cfab3)
+    Reviewed-on: https://code.wireshark.org/review/22240
 
-commit d7ce60b
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Dec 18 19:00:52 2016 +0100
-
-    Lua: Include all BASE_PT_* to base table.
-    
-    Also added a note above field_display_e enum to indicate that this
-    values are parsed in make-init-lua.pl to build init.lua.
-    
-    Change-Id: Ibd125684f9a68e1b8116fae0ccbc72147825d75d
-    Reviewed-on: https://code.wireshark.org/review/19336
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit a942468
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 17 11:20:38 2016 -0500
-
-    Make more infiniband subdissectors heuristic.
-    
-    1. Convert the Mellanox encapsulation header into a heuristic dissector.
-    2. Convert EtherType header dissection into a heuristic dissector.
-    3. Convert "heuristic preferences" to use deprecated_heur_dissector_pref.
-    
-    Ping-Bug: 5061
-    Ping-Bug: 2672
-    Change-Id: Iabcac1af8e07f3f6f25f825ed56b2036c3285783
-    Reviewed-on: https://code.wireshark.org/review/19317
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cf0f6ae
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 19 08:54:11 2016 +0100
-
-    transum: add Modelines info
-    
-    Change-Id: I9d9ffdb7d32a940dbe155e82946d59f649cafe09
-    Reviewed-on: https://code.wireshark.org/review/19345
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 562954b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 19 08:51:13 2016 +0100
-
-    transum: fix no previous prototype for '...’ [-Wmissing-prototypes]
-    
-    Comment set_pkt_rrpd (not used)
-    
-    Change-Id: I8d571f3cd45c51b07969132718a43244003c0f59
-    Reviewed-on: https://code.wireshark.org/review/19344
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dd143ca
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Dec 18 23:38:53 2016 -0500
-
-    [SMTP] Bugfix BDAT command handling
-    
-    BDAT handling takes the whole packet to add to its count of necessary
-    bytes, but wasn't updating the offset, so if a BDAT "data packet" had
-    multiple CRLF segments in it, the BDAT byte counter became inaccurate.
-    
-    Bug: 13030
-    Change-Id: Idd44ccb95a8f4710db4546a918661c63a343260c
-    Reviewed-on: https://code.wireshark.org/review/19343
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 36ec624
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Mon Dec 12 10:48:37 2016 +0100
-
-    Added decoding of RAN/NAS cause IE/AVP
-    
-    Change-Id: I889820405528be5e17edf85e52291d642a98cce6
-    Reviewed-on: https://code.wireshark.org/review/19216
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 047023d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Dec 4 23:30:46 2016 +0100
-
-    tools: add rpm-setup.sh.
-    
-    This script mimics tools/debian-setup.sh for RPM based systems.
-    It installs all the required and optional packages to compile
-    Wireshark. Tested on Centos 7, Fedora 25, openSUSE Leap 42.1.
-    
-    Change-Id: Ifc55f45608e5f5a74188d4fb5612bedb6437fcb1
-    Reviewed-on: https://code.wireshark.org/review/19088
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 3a6c5f0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 13 11:39:16 2016 +0100
-
-    tap-rtp-common.c: set STAT_FLAG_WRONG_TIMESTAMP when timestamp sequence is wrong
-    
-    Set STAT_FLAG_WRONG_TIMESTAMP for RTP sequence when newer packet has lower timestamp than previous one.
-    
-    Change-Id: Ib18830eea33ddb3dbbdf3beba279131c0fc5a948
-    Reviewed-on: https://code.wireshark.org/review/19292
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0e6333c
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Sun Dec 18 21:08:16 2016 +0100
-
-    RTP analyzis dialog/Qt: fix - when dialog is called from RTP stream dialog, G (select packet) signal is not passed to parent dialog
-    
-    Problem is in 2.0 and master. It is probably in 2.2 too.
-    
-    Change-Id: Iaa8adea788dcd5da7cff32d56d483a1e7d52d226
-    Reviewed-on: https://code.wireshark.org/review/19340
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5f6732d
-Author: Kevin Hogan <kwabena@google.com>
-Date:   Mon Dec 5 23:50:45 2016 -0800
-
-    Qt: minor updates to TCP stream dialog and throughput moving average
-    
-    The time-based moving average code should use a constant window size
-      as the denominator when calculating throughput.
-    Added QDoubleSpinbox widget to choose the time-based moving average size.
-    Also added (optional) ability to select ACK (reverse) packets as well as data
-      packets when clicking on the base graph.
-      (useful, for example, when examining SACK or DSACK packets)
-    Added CheckBox widget (with tooltip) for user to choose ACK selection
-    
-    Change-Id: Ib3ba4f9be9e30aa8f3088b0b2d48b4ca214f7cc3
-    Reviewed-on: https://code.wireshark.org/review/19108
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 05b3c06
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Sun Dec 18 23:45:06 2016 +0100
-
-    RTSP: Decode XML data in ED-137 messages
-    
-    Based on EUROCAE ED-137B specification: ED-137B, Part 4: RADIO, INTEROPERABILITY STANDARDS FOR VOIP ATM COMPONENTS
-    https://boutique.eurocae.net/eshop/catalog/index.php
-    
-    Can be verified with sample from Bug 13257, #18, #58, #64, #100
-    
-    Change-Id: I91b7ec84b8cee8797306be1d1c0bd2af8f7b8f45
-    Reviewed-on: https://code.wireshark.org/review/19342
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8e19794
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 18 19:57:32 2016 +0100
-
-    decoders(transum): fix no previous prototype for ‘decode_*’ [-Wmissing-prototypes]
-    
-    Change-Id: I93b24285443d99799f83c40f61f413c2d106c85f
-    Reviewed-on: https://code.wireshark.org/review/19338
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2612f23
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Dec 17 23:19:10 2016 +0100
-
-    Lua: Fix some memory leaks in error paths.
-    
-    Because luaL_argerror() does a longjmp all memory free must be done
-    before calling this.
-    
-    Also rewrote true_false_string_from_table() to be a bit simpler
-    and to give argument error when too many strings in the table.
-    
-    Change-Id: Ied0fa468f1274155c746fe2e086dacf1a8582b08
-    Reviewed-on: https://code.wireshark.org/review/19325
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7d1b8de
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Sat Dec 17 17:45:40 2016 +0100
-
-    Call Flow: Fix - Duration of segment of RTP flow is wrong in call flow.
-    
-    But is observed in 2.0 and later branches.
-    
-    Change-Id: I46fcbb33824d30bac1999e1b61d9c249972d17f0
-    Reviewed-on: https://code.wireshark.org/review/19316
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4b613a1
-Author: Jakub Pawlowski <jpawlowski@google.com>
-Date:   Tue Dec 13 17:03:55 2016 -0800
-
-    Bluetooth: BTLE: Add new commands parsing
-    
-    Add "LE Set Extended Advertising Data",
-    "LE Set Extended Scan Response Data", and
-    "LE Set Extended Advertising Enable" command parser.
-    
-    Change-Id: I3027dc9c213c15f503fa5495829726db3a207300
-    Reviewed-on: https://code.wireshark.org/review/19251
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 527eefa
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 18 08:13:10 2016 -0800
-
-    [Automatic update for 2016-12-18]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I3c720c31d7ddfbef001bda47eca49ab4804e8e74
-    Reviewed-on: https://code.wireshark.org/review/19332
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 81fc27f
-Author: AdrianSimionov <daniel.simionov@gmail.com>
-Date:   Sun Dec 18 13:00:17 2016 +1100
-
-    [docsis->type2ucd] Fix issue with decoding
-    
-    Burst 4 and Burst 5 values are now properly decoded.
-    
-    Change-Id: I6232a19eb849a419825be69435069e4be721cbc1
-    Reviewed-on: https://code.wireshark.org/review/19327
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 92c725c
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Fri Dec 16 11:49:56 2016 +0100
-
-    SIP/SDP, RTP: Dissectors shows information about ED-137 related states of radio in info column/VoIP call flow
-    
-    Based on EUROCAE ED-137B specification:
-    ED-137B, Part 1: RADIO, INTEROPERABILITY STANDARDS FOR VOIP ATM COMPONENTS
-    https://boutique.eurocae.net/eshop/catalog/index.php
-    
-    Bug: 13252
-    Change-Id: Ifab1aaf47e3405fcd46309167237f11ce2d7e2ff
-    Reviewed-on: https://code.wireshark.org/review/19302
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b4ea3c5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 17 22:34:29 2016 +0100
-
-    S1AP: use unit strings
-    
-    Change-Id: I53a639b210592b36fc3f5aaf45db3932a469b49f
-    Reviewed-on: https://code.wireshark.org/review/19321
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7eee48a
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Wed Dec 14 22:55:05 2016 +0100
-
-    RTP: RTP dissector is able to decode RTP over TCP (RFC 4571)
-    
-    Bug: 13251
-    Change-Id: I56a01e779f7f0eadc8a078f88543269a91148f00
-    Reviewed-on: https://code.wireshark.org/review/19293
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5696b84
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 17 22:49:29 2016 +0100
-
-    X2AP: use unit strings
-    
-    Change-Id: Icac054fda0b1e1b8d79c33fc967345a7497e812b
-    Reviewed-on: https://code.wireshark.org/review/19322
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 667b700
+commit 29c0bc8
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 17 22:51:43 2016 +0100
+Date:   Sun Jun 18 22:16:42 2017 +0200
 
-    M2AP: use unit strings
+    DAAP: define an arbitrary recursion depth limit
     
-    Change-Id: Id9aa6a48faaf749a439f0f61b5ad8d2920c56ac7
-    Reviewed-on: https://code.wireshark.org/review/19323
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6292d14
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 17 22:55:59 2016 +0100
-
-    M3AP: use unit strings
-    
-    Change-Id: I433b6357914063ba7dbbe119771770e98e019091
-    Reviewed-on: https://code.wireshark.org/review/19324
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 934f255
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 17 21:40:49 2016 +0100
-
-    LTE RRC: use unit strings
-    
-    Change-Id: Ib18301246f051f1362ba93621c533044a118189f
-    Reviewed-on: https://code.wireshark.org/review/19320
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ced54ae
-Author: Dmitry Lazurkin <dilaz03@gmail.com>
-Date:   Sat Dec 10 16:45:10 2016 +0300
-
-    kafka: add expert info about unsupported api key and version
-    
-    Change-Id: I622e6f06529377e089cbeeb83d926135f983d3f3
-    Reviewed-on: https://code.wireshark.org/review/19194
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit a5374d8
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 17 23:23:32 2016 +0100
-
-    NBIFOM: upgrade dissector to v13.3.0
-    
-    Change-Id: I95166c355bccc74705812f495066b55eedccedb0
-    Reviewed-on: https://code.wireshark.org/review/19326
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 1613ee7
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 17 15:53:40 2016 +0100
-
-    LPP: use unit strings
-    
-    Change-Id: Ic7767b9b47e200b0b0cae70e9781b417cf7d2a3b
-    Reviewed-on: https://code.wireshark.org/review/19315
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 9354346
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Dec 17 14:06:33 2016 +0100
-
-    ULP: follow-up of gda5cad4
-    
-    Uniformize unit display
-    
-    Change-Id: Ie89ad77be81232692ee7f4f220157d2d0cab21ea
-    Reviewed-on: https://code.wireshark.org/review/19314
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 01c328f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 30 21:31:10 2015 +0100
-
-    bootp: Update DHCP Message Type 53 Values
-    
-    Add RFC6926 and RFC7724
-    
-    Change-Id: I2e10c337f3fe3043e5c36f501eb3e29b16bfcecc
-    Reviewed-on: https://code.wireshark.org/review/19312
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 69dc69a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Dec 17 10:34:16 2016 +0100
-
-    bootp: fix indent (use tabs)
-    
-    Change-Id: I0c16bf29631e9376b9f3b701627bd5f8fb133397
-    Reviewed-on: https://code.wireshark.org/review/19311
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e520d79
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Dec 17 07:23:31 2016 +0000
-
-    IPsec: Revert g232cb9a2dd
-    
-    Change-Id: I9e353215c17c9a868b1cbbcd18a5707e023d86bb
-    Reviewed-on: https://code.wireshark.org/review/19310
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit da5cad4
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Dec 16 23:33:49 2016 +0100
-
-    ULP: use unit strings
-    
-    Change-Id: Id6cca5fa5b7547a43488e0bd83bb150ef008f48e
-    Reviewed-on: https://code.wireshark.org/review/19309
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Bug: 13799
+    Change-Id: I611e3e888f91f78262e0d685e613a2bc221687c5
+    Reviewed-on: https://code.wireshark.org/review/22210
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 166e129
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Dec 16 20:35:13 2016 +0000
-
-    Improve some unit strings with unicode characters
-    
-    Change-Id: Ic6812fd266832743962e020cfc8f0af2d4742fdf
-    Reviewed-on: https://code.wireshark.org/review/19308
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 2892cc6
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Dec 16 19:57:54 2016 +0000
-
-    IPv6: Fix IPv6 fragment header offset unit display
-    
-    Fragment offset unit is 8-octet, not bytes.
-    
-    Reverts regression introduced in 232cb9a2dd87ea9cc9c88d4c32bfb7b452705130.
-    
-    Change-Id: Id015209b45e15cd630f42ed2c3bbf342094b8ba6
-    Reviewed-on: https://code.wireshark.org/review/19307
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit bd494c3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 16 11:13:02 2016 -0800
-
-    Sort opttype_vals by the option value.
-    
-    Otherwise, we get complaints when generating the value_string_ext from
-    it.
-    
-    Change-Id: I2b4fc4c57b1f0c47706fe73187192c155593da84
-    Reviewed-on: https://code.wireshark.org/review/19306
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3649993
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Dec 16 01:42:16 2016 +0000
-
-    6LoWPAN: Make UDP NHC port endianness code cleaner
-    
-    Change-Id: I7abb29a8368a91d113038bc878aaf47ed58360bb
-    Reviewed-on: https://code.wireshark.org/review/19298
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit f923009
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Dec 15 23:48:25 2016 +0000
-
-    6LoWPAN: Display UDP NHC port encoding field as 2-bit
-    
-    Reference: RFC 6282 Section 4.3.3
-    
-    Change-Id: I8ff46452d80b1aba4545967bc05310c341f6e174
-    Reviewed-on: https://code.wireshark.org/review/19297
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 1a57d81
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 16 09:35:01 2016 -0500
-
-    Rename packet-range.[ch] to packet_range.[ch]
-    
-    The check*.pl scripts presume that files with the prefix "packet-"
-    are dissector files and therefore have different rules than other
-    files.  Rather than trying to clarify that more with additional
-    directory information, just make any non-dissector file with
-    "packet-" filename prefix conform if it fails a "dissector specific"
-    check from the scripts.
-    
-    Change-Id: I7cb52e1fad4ea62320492bb690904260f958aeb4
-    Reviewed-on: https://code.wireshark.org/review/19304
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 70c4a03
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Dec 2 22:29:36 2016 +0100
-
-    Add GSMTAP logging sub-dissector
-    
-    Applications can also use GSMTAP framing to convey log messages
-    which would traditionally be printed on stderr or on log files. This
-    allows the ordered/interspersed display of protocol messages with log
-    lines from the applications that send or received those messages.
-    
-    The osmocom logging framework (part of libosmocore) implements this in
-    libosmocore.git Change-Id I9a7e72b8c9c6f6f2d76d1ea2332dcdee12394625
-    
-    Change-Id: I0de723445e5b5ce0199a4081808111240a9ed047
-    Reviewed-on: https://code.wireshark.org/review/19183
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0572fbb
-Author: Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>
-Date:   Sun Dec 11 15:35:30 2016 +0100
-
-    6LoWPAN: bugfix in extracting in-line UDP checksum of IPHC
-    
-    Bug: 13233
-    Change-Id: Ie697d5a2d8a604bf3348f690d78ada4f9f0b1b89
-    Reviewed-on: https://code.wireshark.org/review/19208
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 41a9a1f
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Nov 25 09:41:37 2016 +0000
-
-    autotools: Add tag glob pattern for distribution VCS version
-    
-    Avoid leaking private tags and prefer vX.X.X over wireshark-X.X.X.
-    
-    Ping-Bug: 12901
-    Change-Id: I7a4e2de283b87047e435a0b0abe72bc18819a985
-    Reviewed-on: https://code.wireshark.org/review/18951
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 8a0e863
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Dec 16 15:13:31 2016 +0100
-
-    [S1AP] Handle the case where the TransparentContainer is empty.
-    
-    Change-Id: I6b2333c32119149b32beacc660b48970e0ddbae6
-    Reviewed-on: https://code.wireshark.org/review/19303
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 53f2b37
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Wed Dec 14 10:40:44 2016 -0500
-
-    CIP: Always handle extra data
-    
-    1. Generically handle/display all unparsed data. Any unparsed data can be found with cip.data
-    2. This now shows at least some unparsed data that was not previously displayed. Previously, extra data sent with Get Attribute List requests was not displayed. It was difficult to tell why devices were returning errors, without knowing there was extra data.
-    3. Make most functions return the number of bytes processed to support the above points.
-    
-    Change-Id: I290c09d76e74c18facaef99c8903e7937fbdd710
-    Reviewed-on: https://code.wireshark.org/review/19263
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 12fd99f
-Author: Eliot Lear <lear@cisco.com>
-Date:   Thu Dec 15 10:21:06 2016 -0500
-
-    [BOOTP/DHCPv6] Add new manufacturer usage description (MUD) DHCP option, which presents a URL.
-    
-    Change-Id: I152a388db2f3b8c035c80bd06dfbb9a18f10c031
-    Reviewed-on: https://code.wireshark.org/review/19284
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 93dec73
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Thu Dec 15 23:15:51 2016 +0100
-
-    packet-rtp.c: Fix of variable names to test
-    
-    Variables are removed
-    
-    Change-Id: I54bb00a74255625c7ce487cfd31794fcdb9fa979
-    Reviewed-on: https://code.wireshark.org/review/19295
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit daf7c84
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Dec 16 08:54:56 2016 +0100
-
-    Fix typo in unit_name_string units_decibels name.
-    
-    Change-Id: Ib17ca3a613648667d0f99fa7412d074a205840a9
-    Reviewed-on: https://code.wireshark.org/review/19300
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 232cb9a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Dec 15 13:01:27 2016 -0500
-
-    Remove proto_item_append_text calls in favor of BASE_UNIT_STRING.
-    
-    Many proto_item_append_text calls were just adding a unit string to a field.
-    There's a better way to do that now.
-    
-    Change-Id: Id18d5ac1ea4d8ecdc4cbe7ebaec07fbd2eab6e78
-    Reviewed-on: https://code.wireshark.org/review/19289
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8efb7fe
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Dec 14 17:34:56 2016 -0500
-
-    Adjust proto_tree_add_xxx_format_value calls to use unit string
-    
-    proto_tree_add_uint_format_value had the most use of unit strings, this
-    patch handles all of the other proto_tree_add_xxx_format_value calls that
-    could be better served using BASE_UNIT_STRING with a "unit string" in hf_ field.
-    
-    Added more "common" unit string values to unit_strings.[ch]
-    
-    Change-Id: I0fb680be781e10037eb7bd40dd21a9ee20c1fb1c
-    Reviewed-on: https://code.wireshark.org/review/19288
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d706f9c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 15 17:48:59 2016 -0800
-
-    Add symlinks to Wireshark binaries in Resources/bin, and point there.
-    
-    That way, $PATH points to .../Wireshark.app/Contents/Resources/bin, so
-    the man command will look in
-    .../Wireshark.app/Contents/Resources/share/man.
-    
-    This also may obviate the need to install the wrapper scripts in
-    /usr/local/bin, although those scripts obviate the need to re-set PATH
-    after installing Wireshark.
-    
-    Change-Id: I7202b5a0fe5d2b90c956dc0db2af073f6c08b00d
-    Reviewed-on: https://code.wireshark.org/review/19296
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8234de5
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Thu Dec 15 19:54:01 2016 +0000
-
-    Fix release-notes.html generation
-    
-    The ASCIIDOC_CONF_FILES setting for asciidoc was only generated
-    if any of the guides were being built.
-    
-    Clean up a dup setting and some and blank lines in FindASCIIDOC
-    
-    Change-Id: Ie8ab97db09e18cdb8d7e2a7bd4dcf8c288dd036f
-    Reviewed-on: https://code.wireshark.org/review/19291
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 2c20ffa
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Dec 15 11:42:50 2016 -0800
-
-    Update tools/commit-msg.
-    
-    Update tools/commit-msg to version 2.12.7 by running
-    
-        curl -Lo tools/commit-msg https://code.wireshark.org/review/tools/hooks/commit-msg
-    
-    Change-Id: Ie70a8e869968b5237c9e21c0624f1f8af696d83b
-    Reviewed-on: https://code.wireshark.org/review/19290
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 08a6925
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Dec 15 18:15:09 2016 +0000
-
-    UDP: Add missing space to string
-    
-    Change-Id: I0b5a60d426b2d06441323d74aa973e1b700d4f03
-    Reviewed-on: https://code.wireshark.org/review/19286
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 0d3fd95
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Dec 15 09:32:53 2016 -0800
-
-    Update the release notes.
-    
-    Change-Id: Id26548a1c262a91e4fe0a4c44dcb578b5b4e5c11
-    Reviewed-on: https://code.wireshark.org/review/19285
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit c8b96ef
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Dec 15 14:49:31 2016 +0100
-
-    [GTPv2] Fix dissection of MM Context fpr EPS
-    
-    Change-Id: I1ee7f4caa23834ac8bcbd56731c116a785b67d6b
-    Reviewed-on: https://code.wireshark.org/review/19283
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e7ba5d7
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Dec 13 12:40:47 2016 +0100
-
-    packet.c: add initializer.
-    
-    As per glib manual, GSLists need to be NULL initialized.
-    
-    Change-Id: If78904b900f6ddd7a0afaf3a1c480ec7626f2027
-    Reviewed-on: https://code.wireshark.org/review/19281
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c65e5851
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 15 00:29:38 2016 -0800
-
-    Make some items that don't need to be size_t guint.
-    
-    Those sizes are limited by the packet sizes we support, and we only
-    support a maximum packet size of 2^32.
-    
-    This squelches some compiler warnings.
-    
-    Remove some casts that this renders unnecessary.
-    
-    Change-Id: Id9a7bcf8c2ce30bbed7be6c0e28deb9cf38002e0
-    Reviewed-on: https://code.wireshark.org/review/19279
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e6a9877
-Author: Nora Sandler <nsandler@securityinnovation.com>
-Date:   Thu Dec 8 16:54:37 2016 -0800
-
-    Improved  parsing of sniffed homeplug-av data
-    
-    This patch modifies the homeplug-av dissector to better decode sniffer data according to the IEEE 1901-2010 standard.
-    The dissector now decodes MPDU variant fields correctly based on delimiter type, and decodes beacon MPDU payloads.
-    There are some variable-length fields it doesn't handle yet.
-    This patch should have no effect on how non-sniffer-data packets are decoded.
-    These changes are based on Andrew Margolis' pull request to faifa at https://github.com/ffainelli/faifa/pull/11
-    
-    Change-Id: Ia60ac7affa99a68b38f04ab66373ac715c761328
-    Reviewed-on: https://code.wireshark.org/review/19156
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e1e6195
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 13 21:02:21 2016 +0100
-
-    802.11(ad): fix wrong dissection of Grant Frame
-    
-    See 8.4a.2 from 802.11ad-2012(.pdf)
-    
-    Issue reported by Hany ASSASA
-    
-    Ping-Bug: 13244
-    Change-Id: I6e22de3009b722e61b30ce2dd93596c4f51bb2fe
-    Reviewed-on: https://code.wireshark.org/review/19243
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 85266a0
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Wed Dec 14 23:55:31 2016 +0300
-
-    pkixtsp: add support for dissecting CMS signature time-stamps
-    
-    As per RFC 3161 Appendix A. The ASN.1 elements it defines are not
-    officially part of any module, so just stick them into PKIXTSP.
-    
-    Change-Id: I728505cb305b924465b62eb442288edea7f916a7
-    Reviewed-on: https://code.wireshark.org/review/19272
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 104b102
-Author: chinarulezzz <s.alex08@mail.ru>
-Date:   Wed Dec 14 18:43:07 2016 +0200
-
-    packet-tns.c: Oracle 12c packet length fix.
-    
-    In some messages (observed in Oracle 12c) packet length has 4 bytes
-    instead of 2.
-    
-    Tested with oracle12-example.pcapng from SampleCaptures wiki.
-    
-    Also small datatype fix.
-    
-    Change-Id: I35490ade8cf0dee6392f4fa1b51d8dc7cff85400
-    Reviewed-on: https://code.wireshark.org/review/19264
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bdd166f
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Wed Dec 14 19:37:04 2016 +0100
-
-    VoIP Calls/Flow Sequence: Fix of showing nodes from previous call
-    
-    When VoIP Calls/Flow Sequence generates list of nodes to show (nodes above flow), it do not clear the list from last call. As consequence of it, when second call is between hosts than first call, you see nodes which are not involved in call.
-    
-    Change-Id: I80f9acb09e6aa71b3a32bb6eacaeb5b4bb13b332
-    Reviewed-on: https://code.wireshark.org/review/19267
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9090afb
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Tue Dec 13 13:28:30 2016 +0100
-
-    Save RTP audio to file: RTP Stream Analysis dialog allows save audio for non G.711 codecs and mixed codecs
-    
-    - spaghetti code for save was split into separate functions
-    - code saves G.711 only, all other codecs are saved as silence with correct duration
-      - code is ready to include other codecs
-      - code supports 8000 Hz sampling rate only, other rates are rejected with warning
-      - bidirectional stream (forward and reverse) creates stereo .au file
-    - output is based on timestamps in RTP streams
-      - save operation is slower than before because it is set of seek() - one per each codec sample
-    - code allows align of save audio:
-      - as it is - each stream is saved from its beginning, no aling
-      - to start of each other - later stream is prepended with silence
-      - align saved audio to beginning of capture file - each stream is prepended with silence
-    - save to raw works correctly now - only payload is saved
-      - old code was inserting G.711 silence time to time to raw data
-    
-    Bug: 13242
-    Change-Id: I74d02a1cc1c75acf9ffe930d078c00a0555cbfb6
-    Reviewed-on: https://code.wireshark.org/review/19245
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1afbab6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 14 15:02:33 2016 -0800
-
-    Just use strncmp() to check the prefix of the file's first line.
-    
-    Bug: 13246
-    Change-Id: I9df35596aa8dcb937f6a03cf60b5d0fbe9dce1ec
-    Reviewed-on: https://code.wireshark.org/review/19276
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5fdbb7a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 14 14:42:54 2016 -0800
-
-    Don't assume we've read a line long enough to contain a magic number.
-    
-    Check the length of the line first.
-    
-    Bug: 13246
-    Change-Id: I906bb652594898061afb4b2cd4edb916af354161
-    Reviewed-on: https://code.wireshark.org/review/19273
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f78b60d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Dec 14 20:27:54 2016 +0100
-
-    nordic_ble: Add legacy version support
-    
-    Added back legacy version (<= 0.9.7) support after restructuring
-    for dissector completeness.
-    
-    Change-Id: I5355bf8faa1b9fd8ee9056254048fe5c314b6efb
-    Reviewed-on: https://code.wireshark.org/review/19271
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 41f2890
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Nov 3 18:57:17 2013 +0100
-
-    Bluetooth profile: configure columns and layout for Bluetooth
-    
-    Change-Id: Iab8e33b5a7b62eea9c1365e0e5fec84f0ccd23fe
-    Reviewed-on: https://code.wireshark.org/review/17080
-    Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3032e80
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Wed Dec 14 21:35:00 2016 +0300
-
-    cms: remove trivial differences between the ASN.1 code and RFC 5652
-    
-    This clears up the diff between the local copy of the CMS module and
-    upstream, making it easier to determine what modifications were made.
-    
-    Change-Id: I466cb97e6505ea8075d01663e1ede95b85468898
-    Reviewed-on: https://code.wireshark.org/review/19269
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1c8223d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Dec 9 11:44:11 2016 +0100
-
-    extcap: add info to extcap manpage (taken from README.extcap).
-    
-    Ping-Bug: 13218
-    Change-Id: Ib43dc2ce8ae7991468b866aec3f03f6a5709f8b2
-    Reviewed-on: https://code.wireshark.org/review/19177
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 07ffcf9
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Dec 14 13:43:27 2016 +0100
-
-    extcap: Avoid double free of help.
-    
-    Avoid double free of help when having multiple extcap interfaces.
-    
-    Ping-Bug: 13218
-    Change-Id: I6a0d6afd645787f9814c02e84079b4e8763d05f1
-    Reviewed-on: https://code.wireshark.org/review/19261
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 978a30b
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Dec 14 10:17:42 2016 +0100
-
-    nordic_ble: Improved dissector code
-    
-    - Added header fields in a new subtree.
-    - Restructured to use fewer functions and to use offset
-      counting instead of offset defines.
-    - Removed support for legacy version 0.9.7.
-    - Removed unused code.
-    
-    Change-Id: I9eb6c8b3b450ddb95fb0f4bdd9f9717dafa687b0
-    Reviewed-on: https://code.wireshark.org/review/19260
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fc8f787
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Dec 13 19:28:29 2016 +0100
-
-    Skip loading the Nordic BLE Sniffer dll on WIN32
-    
-    The dissector for the Nordic BLE Sniffer was added as internal in
-    g7844a118, so ensure we don’t load this third party dll on WIN32.
-    
-    Change-Id: I74c200d42793f3c1e764bc9f6c3a9a795d38a5a7
-    Reviewed-on: https://code.wireshark.org/review/19259
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1c2d224
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Dec 8 17:56:22 2016 +0100
-
-    extcap: set help for interfaces.
-    
-    The help statement is in the first sentence, while interfaces are
-    in others. We need to keep state of it.
-    
-    Ping-Bug: 13218
-    Change-Id: Iad1d403d5e8bc34e2489daaa3b14d469d5ee5b5b
-    Reviewed-on: https://code.wireshark.org/review/19148
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 39050d3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Dec 5 12:33:02 2016 +0100
-
-    README.extcap: impagination improvement.
-    
-    Change-Id: I1cc0dc6496bea8e42c199dff116530ccec6fb591
-    Reviewed-on: https://code.wireshark.org/review/19089
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit da06f7c
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Mon Dec 12 21:13:34 2016 +0100
-
-    RTP Stream Analysis: save Audio allows any filename extension
-    
-    Format of file selected by user is derived from save dialog format selection, not from filename as before.
-    
-    Bug: 13240
-    Change-Id: Id6e159d97e4f26c25b3d2d98d43041d8617cc737
-    Reviewed-on: https://code.wireshark.org/review/19240
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e6dcb06
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Mon Dec 12 20:57:40 2016 +0100
-
-    RTP Stream Analysis dialog: dialog shows when forward/reverse stream starts
-    
-    Dialog shows time (relative to capture start) and packet number when forward and reverse stream starts. It shows difference in such values on bottom of dialog too.
-    
-    Bug: 13239
-    Change-Id: If807b8a56723df17ed131b1aac053cf8f985bb7b
-    Reviewed-on: https://code.wireshark.org/review/19239
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b1ed528
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 21:06:49 2016 -0500
-
-    Remove add_item_text
-    
-    It's a manual attempt at what proto_tree_add_bitmask can do anyway.
-    
-    Change-Id: If551e8afa346a33b8e15dc441aae75ba0752ab46
-    Reviewed-on: https://code.wireshark.org/review/19257
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8156e13
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 19:40:45 2016 -0500
-
-    packet-lsc.c: Use proto_tree_add_item instead of manually fetching field values.
-    
-    Change-Id: I60740615de02bc5047eaca618973064513ac7b56
-    Reviewed-on: https://code.wireshark.org/review/19256
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d346d8a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 19:28:32 2016 -0500
-
-    packet-kerberos4.c: Use encodings instead of boolean little vs big endian.
-    
-    Also use proto_tree_add_item_ret_length for string handling.
-    
-    Change-Id: Id1eae2e51460a3b7f4c3385b9b1fd7f12398a227
-    Reviewed-on: https://code.wireshark.org/review/19255
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a8d06c7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 19:08:40 2016 -0500
-
-    packet-nbt.c: General cleanup
-    
-    1. Remove functionality that was replaced by a proto_tree_add_bitmask
-    2. Remove use of nbdgm_header structure which is just a useless placeholder
-    3. Remove some if (tree) over single fields.
-    
-    Change-Id: I0879043685686eb5b861cf77ec38bbf25ed6044e
-    Reviewed-on: https://code.wireshark.org/review/19254
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b585c72
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 18:11:02 2016 -0500
-
-    file-jpeg.c - Pacify pre-commit hooks by removing macro
-    
-    IMG_JFIF was trying to be a macro for all display and expert info filters.
-    This messed with the pre-commit scripts ability to ensure protocol
-    filter name was being used as the prefix for display and expert info
-    filters.  So replaced IMG_JFIF with the proper prefix - "image-jfif"
-    
-    Change-Id: I1fe3dc8797529c9d17f75c511bc279824e7e69b0
-    Reviewed-on: https://code.wireshark.org/review/19253
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f41e3bf
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Dec 13 12:27:04 2016 +0100
-
-    cmake: add semicolon to file list.
-    
-    The file list contains semicolon-separated list of files to check.
-    When merging the lists we need to separate them properly.
-    
-    Error:
-    
-    No such file: "packet-ncp2222.cpacket-coseventcomm.c" at wireshark/tools/checkAPIs.pl line 2050.
-    
-    Change-Id: I19702ab85408caf69ed922732fce74c3058be640
-    Reviewed-on: https://code.wireshark.org/review/19237
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b7f4e25
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 13 14:26:27 2016 -0500
-
-    Adjust proto_tree_add_uint_format_value calls to use unit string
-    
-    Several calls to proto_tree_add_uint_format_value could be better served
-    using BASE_UNIT_STRING with a "unit string" in hf_ field.  There also
-    a few cases where proto_tree_add_uint_format_value could just be
-    proto_tree_add_uint.
-    
-    Added a few more "common" unit string values to unit_strings.[ch]
-    
-    Change-Id: Iaedff82c515269c9c31ab9100dff19f5563c932d
-    Reviewed-on: https://code.wireshark.org/review/19242
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a869ec6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Dec 12 13:22:05 2016 -0500
-
-    Adjust proto_tree_add_[float|double]_format_value calls to use unit string
-    
-    Several calls to proto_tree_add_[float|double]_xxx could be better served
-    using BASE_UNIT_STRING with a "unit string" in hf_ field.
-    
-    Added a few more "common" unit string values to unit_strings.[ch]
-    
-    Change-Id: Id0da7b579403898d20c2667d6c4abcd59d5a48d4
-    Reviewed-on: https://code.wireshark.org/review/19241
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e150235
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 12 11:34:03 2016 -0800
-
-    Qt: Optionally restore our selected packet when thawing.
-    
-    Stash the current row when we freeze the packet list. Make it possible
-    to restore it when thawing. Do so when the layout changes and when we
-    move a column.
-    
-    Change-Id: I44cfb8bafcd4d49a46e1c89bf47aecf5ac139773
-    Reviewed-on: https://code.wireshark.org/review/19222
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 6f3fed9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 13 22:15:28 2016 +0100
-
-    win-setup.ps1: add missing zlib-1.2.8-ws folder
-    
-    Change-Id: Ie32a231146365c11fe80e9e4f414ef7c464a8249
-    Reviewed-on: https://code.wireshark.org/review/19247
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit 82fc557bed30b1aa69ca43a4291b64a9ce54c78a)
+    Reviewed-on: https://code.wireshark.org/review/22229
 
-commit 588f525
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 13 11:39:16 2016 +0100
-
-    imf: fix no newline at end of file [-Wnewline-eof]
-    
-    Change-Id: Ibddfbb049fdf8510ffc14fbadba7484300821888
-    Reviewed-on: https://code.wireshark.org/review/19236
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 31a53fd
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Mon Dec 12 20:30:29 2016 +0100
-
-    rtp_analysis_dialog.cpp: RTP Stream Analysis dialog shows same SSRC for forward and reverse stream
-    
-    Same SSRC is shown because of typo in variable name for reverse stream.
-    
-    Bug: 13236
-    Change-Id: Idcba4d83c7b4358cd8ebf1ee5c5b5bde2fc2e48b
-    Reviewed-on: https://code.wireshark.org/review/19238
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4e97f74
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Dec 11 19:16:52 2016 -0500
-
-    Add support for adding unit names to hf_ fields.
-    
-    This was inspired by the https://www.wireshark.org/lists/wireshark-dev/201505/msg00029.html thread.
-    
-    Used TCP and NTP dissectors as the guinea pig with sample use.
-    
-    Documentation updates includes some unrelated cleanup just because it was noticed.
-    
-    Change-Id: I59b26e1ca3b95e3473e4757f1759d7ad82976965
-    Reviewed-on: https://code.wireshark.org/review/19211
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 97b41a4
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Dec 13 09:52:31 2016 +0100
-
-    [RTP Analysis] calculate BW correctly whem IPv6 is used.
-    
-    Change-Id: Ia53efa57042d199673a77c59491215c0e99c9e84
-    Reviewed-on: https://code.wireshark.org/review/19235
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f530b58
+commit 4378f2d
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Dec 11 14:18:55 2016 +0100
+Date:   Mon Jun 19 10:30:35 2017 -0400
 
-    bthci_acl: Set src/dst addresses before reassembly.
-    
-    Set all addresses before we do reassembly because sub-dissectors may set
-    their own addresses, and we don't want to override them again.
-    
-    This fixes "Follow TCP Stream" and shows the correct IP addresses in the
-    Source and Destination columns when transporting IP packets.
+    Qt: Flush signals when disable protocols
     
-    Allocate the addresses in pinfo pool to avoid possible stack buffer overflow.
+    When opening the enabled protocols dialog from a protocol preferences
+    menu we must flush app signals to ensure a redissect is done.
     
-    Bug: 13230
-    Change-Id: I3b81ccb02b38331add4773d9bb3d5e0f6dcf025e
-    Reviewed-on: https://code.wireshark.org/review/19201
+    Change-Id: I512b8f6959aabcc15ccffc67615583ee9c60ceec
+    Reviewed-on: https://code.wireshark.org/review/22224
     Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 583c2504671e1671afd03e7638cf6c2957d2b020)
+    Reviewed-on: https://code.wireshark.org/review/22228
 
-commit 9d85c4f
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Fri Dec 9 00:19:25 2016 +0300
-
-    ssh: add dissection for Elliptic Curve Diffie-Hellman KEX
-    
-    The protocol is actually nearly identical to ordinary Diffie-Hellman,
-    but the names are different, and the ephemeral keys are bytestrings
-    rather than integers.
-    
-    Change-Id: I261b6426137dae12fe53686e74517080abd80bb3
-    Reviewed-on: https://code.wireshark.org/review/19210
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 79babc6
-Author: Arjen Zonneveld <arjen@bz2.nl>
-Date:   Fri Dec 2 13:20:18 2016 +0100
-
-    Add BGP dissector support for draft-ietf-idr-shutdown-01
-    
-    Parse the communication bits of a BGP Cease NOTIFICATION:
-    
-    Border Gateway Protocol - NOTIFICATION Message
-        Marker: ffffffffffffffffffffffffffffffff
-        Length: 146
-        Type: NOTIFICATION Message (3)
-        Major error Code: Cease (6)
-        Minor error Code (Cease): Administratively Shutdown (2)
-        BGP Shutdown Communication Length: 124
-        Shutdown Communication: NTT will perform maintenance on this router. This is tracked in TICKET-1-24824294. Contact noc@ntt.net for more information.
-    
-    Draft at https://tools.ietf.org/html/draft-ietf-idr-shutdown-01, sample
-    file taken from from http://instituut.net/~job/shutdown.pcap
-    
-    Change-Id: I2ab633883cc69e560ff79cb6239e02fcffd71e10
-    Reviewed-on: https://code.wireshark.org/review/19144
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8d59678
-Author: Jakub Pawlowski <jpawlowski@google.com>
-Date:   Mon Dec 12 19:27:58 2016 -0800
-
-    Bluetooth: BTLE: Add new commands parsing
-    
-    Add "LE Set Extended Advertising Parameters" and
-    "LE Set Extended Advertising Parameters" commands parsing.
-    
-    Change-Id: Ibcc9f145694e54710da3a11ade237f7132674366
-    Reviewed-on: https://code.wireshark.org/review/19234
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 693dcd2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Dec 12 21:42:14 2016 +0100
-
-    Build TRANSUM plugin
-    
-    Add plugin to autofoo and CMake build systems and fix errors found
-    Add plugin to Windows installer (optional component activated by default)
-    
-    Change-Id: Id1b777bdee04e53076b3291f6fb68d5abad6985d
-    Reviewed-on: https://code.wireshark.org/review/19228
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 862905d
-Author: David Barrera <davidbb@gmail.com>
-Date:   Mon Dec 12 11:06:42 2016 +0100
-
-    Change spaces to tab for recent wka entries
-    
-    Commit 66549a9cacb29abdbb2c6fdaaf8235c4f34f6a13 added 3 new entries to
-    wka.tmpl, but used spaces instead of the default tab separator. This
-    inconsistency causes external tools that expect tabs in the manuf file
-    to behave unexpectedly.
-    
-    The manuf file was re-generated after the fix to wka.tmpl.
-    
-    Change-Id: I79bceac649e0fc29b3502fc2e074dcd513f29ff5
-    Reviewed-on: https://code.wireshark.org/review/19217
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8095234
-Author: Jakub Pawlowski <jpawlowski@google.com>
-Date:   Mon Dec 12 17:56:32 2016 -0800
-
-    Bluetooth: BTLE: Add BT5.0 command and event name parsing
-    
-    Change-Id: I830551959965896451ddc08f3e843b61f22eed67
-    Reviewed-on: https://code.wireshark.org/review/19233
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9f9086c
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Sat Dec 10 03:00:09 2016 -0500
-
-    packet-infiniband: Update conversation src port for exact lookup
-    
-    Dissectors above infiniband (such as RPC dissector)
-    performs exact lookup on saddr, daddr, sport, dport. They are unaware
-    that underlying transport is infiniband which doesn't have src_qp in
-    packets. Due to which srcport remains uninitialized and exact lookup
-    fails.
-    In order to get them work seemlessly, this fix updates the sport
-    to src_qp (similar to destport to dest_qp). With this upper level
-    dissectors can perform direct lookup similar to TCP. Those which need to
-    access private data of unidirectional CM messages, can still continue to
-    perform unidirectional lookup as before.
-    
-    It also fixes the issue where req_qp and resp_qp were swapped during
-    bidirectional conversation creation. This was caught during testing with
-    packet-rpc.c by Chuck Lever.
-    
-    Tested protocols:
-    1. nfs-rdma over Infiniband with trace of Bug 13213
-    2. ICMP packets over Infiniband
-    3. NVMe fabrics over RDMA
-    Tested with trace of Bug 13201 for Nvme.
-    
-    Bug: 13202
-    Bug: 13213
-    Change-Id: Ica1b6aae3ccaa6642dc3b3edfa9a5a4c335cc5da
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/19190
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dd816a1
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Dec 8 09:41:47 2016 -0800
-
-    Update to WinSparkle 0.5.3.
-    
-    Update our WinSparkle package to 0.5.3. This fixes a file deletion bug.
-    Note that WinSparkle now supports application shutdown callbacks, which
-    should let us fix bugs 9687 and 12989.
-    
-    Bug: 13217
-    Change-Id: I4b5f325c6dc251ce167f7bd344bbf3ca5ad3fe14
-    Reviewed-on: https://code.wireshark.org/review/19230
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit ce54bfe
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 12 14:03:25 2016 -0800
-
-    Remove some GtkCList comments and code.
-    
-    Remove some comments and hopefully-no-longer-necessary code specific to
-    GtkCList.
-    
-    Change-Id: Ib62387f87e662798afba282cf95cbd215d60075e
-    Reviewed-on: https://code.wireshark.org/review/19227
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 7ad655c
-Author: Jiri Novak <j.novak@netsystem.cz>
-Date:   Mon Dec 12 13:26:53 2016 +0100
-
-    rtp_player_dialog.cpp: fix usage of unsupported method QComboBox::setCurrentText with Qt4.x
-    
-    QComboBox::setCurrentText() method is available in Qt5.x.
-    Older versions code won't compile with it.
-    
-    Bug: 13235
-    Change-Id: Ia2e2713fefe0f2be01a0b77ff1ac39c9162fd0d1
-    Reviewed-on: https://code.wireshark.org/review/19219
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 9e9b5ec
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 12 13:12:26 2016 -0800
-
-    Move the declaration of packet_list_select_last_row() to ui/gtk/packet_list.h.
-    
-    It's GTK+-only, so it shouldn't be in ui/ui_util.h.  Get rid of the
-    unused Qt packet list implementation of it.
-    
-    Change-Id: Ia9f8fe2209939dff5244e6948c36f29509340f68
-    Reviewed-on: https://code.wireshark.org/review/19226
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 334485f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 12 12:57:12 2016 -0800
-
-    Get rid of some GTK+-only routines in file.c.
-    
-    Just directly call the packet_list_select_ routine from the GTK+ code.
-    
-    Change-Id: I9146fb968c407d6186b146a86aa34678765f7352
-    Reviewed-on: https://code.wireshark.org/review/19225
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit eb1307a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 12 12:34:26 2016 -0800
-
-    Mark routines GTK+ only.
-    
-    Mark packet_list_select_last_row and cf_goto_bottom_frame GTK+ only.
-    
-    Change-Id: I158814c2fa8c5fa8021b7156dded0945535c978a
-    Reviewed-on: https://code.wireshark.org/review/19223
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 128246b
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Sun Dec 11 18:52:26 2016 -0500
-
-    Do not set Qt Window focus when highlighting rows
-    
-    Bug: 11890
-    Change-Id: I372f096c1ac0e483bf49cf95831e3df43621a642
-    Reviewed-on: https://code.wireshark.org/review/19209
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d6d2b59
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Dec 12 14:21:03 2016 +0100
-
-    [RTP] In case no conversation is found, check if we have a dissecor for
-    the dynamic payload type defined. If so set the dynamic
-    payload_type_string to that dissectors name.
-    
-    This is for RTP analysis to work if there is no setup information in the
-    file.
-    
-    Change-Id: I7ae7b957cfa9eb6013f7d32d50563e2034210af6
-    Reviewed-on: https://code.wireshark.org/review/19220
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b604fff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 12 00:19:44 2016 -0800
-
-    Rename non-EBCDIC-specific routines.
-    
-    Those routines can handle any single-byte character set whose characters
-    map to characters in the Basic Multilingual Plane; it could be used for
-    extended ASCII, but we have another routine for that, mapping only
-    characters with code points > 0x7f, so we just say "nonascii" rather
-    than "ebcdic".
-    
-    Change-Id: I3d55b5d58e3e7ab08f3dfbfdb57a0301a30e71d4
-    Reviewed-on: https://code.wireshark.org/review/19214
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7eea6f2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 12 00:06:35 2016 -0800
-
-    Update for library changes.
-    
-    Change-Id: Ibe63e79a2865c53be0aafbf1b53103267a502b7a
-    Reviewed-on: https://code.wireshark.org/review/19213
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4d47c9a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 11 21:49:14 2016 -0800
-
-    Fix handling of EBCDIC string fields.
-    
-    Have a routine that takes a 256-element translation table and uses it to
-    map various flavors of EBCDIC to Unicode.  Have separate translation
-    tables for "common" EBCDIC (everything that's the same in all EBCDIC
-    code pages that include the original EBCDIC characters) and EBCDIC code
-    page 037.  Add ENC_EBCDIC_CP037 for code page 037.
-    
-    Change-Id: Ia882b3c0abef9e30eb54cd47396e6fa0d6342044
-    Reviewed-on: https://code.wireshark.org/review/19212
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6bc6512
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Sun Dec 11 03:21:52 2016 +0300
-
-    ssh: correct inaccurate field names/abbrevs/id variable names
-    
-    * kex_first_packet_follows -> first_kex_packet_follows
-      That's the name the spec (RFC 4253) uses.
-    
-    * DH H signature -> H signature, DH host key -> host key
-      Neither the host key nor the H signature have much to do
-      with Diffie-Hellman. They're used in the same way in
-      every key exchange method that I know of, so their names
-      should be more generic.
-    
-    * mpint_[ef] -> dh_[ef], mpint_[pg] -> dh_gex_[pg]
-      This is to make all key exchange method-specific fields follow
-      a consistent pattern with all names/abbrevs being prepended
-      by the method name.
-    
-    Change-Id: Ic887fb92d8cbb6042e9b8e553cb5804db0ba4db8
-    Reviewed-on: https://code.wireshark.org/review/19199
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a494d1d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 11 21:00:06 2016 +0100
-
-    smb/tftp: fix no previous prototype for ‘tftp/smb_eo_cleanup’ [-Wmissing-prototypes]
-    
-    Change-Id: I22ce7c49eab9232d38ace51a39fee098786f981d
-    Reviewed-on: https://code.wireshark.org/review/19206
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 035fbe2
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 11 08:12:37 2016 -0800
-
-    [Automatic update for 2016-12-11]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Ie1a890ea3d5cfab844bc486806303e0ea4417ec3
-    Reviewed-on: https://code.wireshark.org/review/19203
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f27f048
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 10 20:18:26 2016 -0800
-
-    Cleanup dissection of endpoint addresses.
-    
-    All the pseudo-headers encode the endpoint as per a bEndpointAddress in
-    sections 9.6.6 "Endpoint" of the USB 2.0 spec and the USB 3.1 spec, with
-    a 4-bit endpoint number at the bottom and a 1-bit direction at the top
-    with 0 = OUT and 1 = IN.
-    
-    Show the FreeBSD endpoint address the same way the other endpoint
-    addresses are shown; the FreeBSD one is shown as a 4-byte little-endian
-    value, but only the low-order (first) byte is used, so just show that
-    byte.
-    
-    Call that field the "endpoint address", with the lower 4 bits being the
-    "endpoint number" and the uppermost bit the "endpoint direction".
-    
-    Change-Id: Ic7358c7fb6b6df2502315b590eb5178cecb321d9
-    Reviewed-on: https://code.wireshark.org/review/19200
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 54abb36
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Sun Dec 11 02:40:27 2016 +0300
-
-    ssh: remove uninformative blurbs
-    
-    For most of the fields, the blurb is just the name with "SSH" prepended,
-    which is not particularly useful. Replace a few of them with more
-    informative descriptions and remove the rest.
-    
-    Change-Id: I15e95a42e897d09d3b6334022b32dd36f29e86a4
-    Reviewed-on: https://code.wireshark.org/review/19198
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 74bc8f8
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Dec 9 14:40:59 2016 -0800
-
-    Add a preference to control whether string and byte lengths appear in protocol tree
-    
-    Change-Id: I6be13d9adb8871cbbf4604155e8e7175a74ddaa3
-    Reviewed-on: https://code.wireshark.org/review/19188
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dmitry Lazurkin <dilaz03@gmail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 4097c10
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Dec 9 13:21:13 2016 -0500
-
-    gsmtap: Introduce a new packet-gsmtap.h header file
-    
-    Move the GSMTAP protocol related #defines to packet-gsmtap.h, as there
-    are other dissectors (like packet-gsm_sim.c and future dissectors) need
-    access to some of those #defines.
-    
-    Change-Id: Ibb3517bd773be63b7e3cd30104a5351427e22ebf
-    Reviewed-on: https://code.wireshark.org/review/19185
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2dfa603
+commit 4715b44
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 10 10:37:07 2016 -0800
+Date:   Sun Jun 18 19:55:11 2017 -0700
 
-    Initialize fd_head->frame in all cases where we allocate fd_head.
+    Put the definition of BIT_SWAPPED_MAC_ADDRS in the file where it's used.
     
-    Also, sort the initializations of structure members by the order in the
-    structure, to make it easier to check that we've initialized them all.
+    In change 18a3b0659c209a2e0121eacd640b75e6c1c3b87d, I moved the table
+    that uses it, but not the actual definition, from libpcap.c to
+    pcap-common.c; they both should have been moved.  Make it so.
     
-    Bug: 13231
-    Change-Id: Id2819940d916a5fd5a3f1bf2fc20bd3ee34a75f4
-    Reviewed-on: https://code.wireshark.org/review/19195
+    Change-Id: I266fce455df3848b873cdfadb12cecdbf9c8d4d3
+    Reviewed-on: https://code.wireshark.org/review/22216
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit e9e1b4816278a131aa38dfc579ccd975fed2d7c7)
+    Reviewed-on: https://code.wireshark.org/review/22217
 
-commit 00223bc
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Dec 10 13:07:06 2016 +0100
-
-    Qt: Avoid infinite recursion in ExtcapArgument::loadValues
-    
-    If configuring a extcap "value" sentence with {value=} then loadValues()
-    must not run in a infinite recursion trying to find it's children.
-    
-    Change-Id: Ic2577b31d9312e8f6a099c4fe7c0672e801dbc89
-    Reviewed-on: https://code.wireshark.org/review/19192
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 6a4226e
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Fri Dec 9 01:04:39 2016 +0300
-
-    ssh: organize header field IDs
-    
-    The header field ID variables are listed in a somewhat chaotic order,
-    making the list hard to comprehend and update. Group them according
-    to the part of the protocol the corresponding fields occur in, and
-    order the groups and the IDs within groups to roughly match
-    the protocol flow and message formats.
-    
-    Change-Id: I915f508fd78ff89819c96d246c79d335de6a172e
-    Reviewed-on: https://code.wireshark.org/review/19154
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5592deb
+commit 0012bf7
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 9 19:27:58 2016 -0800
+Date:   Sun Jun 18 18:58:48 2017 -0700
 
-    Boost the max CPU time.
+    Register for WTAP_ENCAP_FDDI.
     
-    See if that lets the big file from bug 13226 pass the test under
-    Valgrind.
+    In 609ea4baa62a523434cdd8ff350d56d135d588ae
+    (I459249b98741cc069495c84ad4c47c0aa6768096) I unintentionally removed
+    the registration.  Put it back.
     
-    Change-Id: I76eb0c18809289e3b14ff8071402c31f70d93d42
-    Ping-Bug: 13226
-    Reviewed-on: https://code.wireshark.org/review/19189
+    Change-Id: I7cf216378e1610350949910091ee187ce150ca05
+    Reviewed-on: https://code.wireshark.org/review/22213
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 547b08b49527eb97ac2ab37fbbcb5a728869d2fd)
+    Reviewed-on: https://code.wireshark.org/review/22214
 
-commit f60ec25
+commit 74bf217
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Dec 8 21:41:58 2016 -0500
+Date:   Sat Jun 17 11:33:29 2017 -0400
 
-    [ICMP] use abs() in detecting timestamp heuristics
+    OpenSafety: sanity check calculated length.
     
-    The code was making the assumption that the ICMP data time will always
-    be greater than or equal to the frame time, but not earlier, but that
-    is not always the case and the heuristics can fail.
+    Original sanity check was missed for fragmentation
     
-    Bug: 13161
-    Change-Id: I4bc7bd8d22d717d3b1f08afdd651f8a70cb7aef2
-    Reviewed-on: https://code.wireshark.org/review/19157
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Bug: 13755
+    Change-Id: If9e24e01a119c869b02f198456776c8e6c6f2ad0
+    Reviewed-on: https://code.wireshark.org/review/22193
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2984193
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Dec 9 15:43:30 2016 +0100
-
-    [RTP] Don't call p_get_proto_data() twice
-    
-    Change-Id: Ie13e23232e183818b813e391274d75415b3fee83
-    Reviewed-on: https://code.wireshark.org/review/19181
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2d89c34
-Author: Thomas Dreibholz <dreibh@iem.uni-due.de>
-Date:   Fri Dec 9 10:34:42 2016 -0500
-
-    packet-windows-common.h: Fix "Warning: this decimal constant is unsigned only in ISO C90"
-    
-    Bug: 12824
-    Change-Id: I4b857f3cc488867d8ee7487c1f978edf639988f8
-    Reviewed-on: https://code.wireshark.org/review/19182
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 43000ac
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Dec 9 11:46:20 2016 +0100
-
-    ui: move filesystem code to wsutil/filesystem.c
-    
-    This function can be used by code outside ui (eg. extcap).
-    
-    Ping-Bug: 13218
-    Change-Id: Ic11f7acebefeaf777692df044ebff9b1bc387aa3
-    Reviewed-on: https://code.wireshark.org/review/19178
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8dca05f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Dec 9 13:04:28 2016 +0100
-
-    [RTP]Rearrange the logic in process_rtp_payload() to make it a bit clearer
-    what happens.
-    
-    Change-Id: Ib64c127ef5e2ba3fe57301c7ac7c75fd1d0e0d27
-    Reviewed-on: https://code.wireshark.org/review/19176
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9f56bdb
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Dec 8 15:16:00 2016 -0800
-
-    Set a Libgcrypt log handler on Windows.
-    
-    Libgcrypt prints all log messages to stderr by default. On Windows the
-    slow_gatherer routine logs
-    
-        NOTE: you should run 'diskperf -y' to enable the disk statistics
-    
-    if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't
-    depend on cryptographically secure random numbers and the message is
-    needlessly confusing. Add a log handler that ignores less-severe messages.
-    
-    Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a
-    Reviewed-on: https://code.wireshark.org/review/19155
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b7e7796
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Nov 9 13:56:12 2016 +0100
-
-    extcap: add new option type (timestamp).
-    
-    Bug: 12787
-    Change-Id: I941833c55fb607c8af2ef832082af58d7b94e965
-    Reviewed-on: https://code.wireshark.org/review/18721
-    Petri-Dish: Roland Knall <rknall@gmail.com>
     Reviewed-by: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fb0c288
-Author: Paul Offord <paul.offord@advance7.com>
-Date:   Mon Oct 3 09:09:18 2016 +0100
-
-    transum: plugin code
-    
-    A plugin to calculate response, service and spread time values based on
-    the RTE model.
-    
-    Bug: 12892
-    Change-Id: I47d7e5354fc269916851a318fef10b826897eaf8
-    Reviewed-on: https://code.wireshark.org/review/17750
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 58f6018
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 13 18:47:28 2016 +0100
-
-    .mailmap: Update (of november)
-    
-    Change-Id: I643825baa09bf1b6b54515dc109669c0cb1e2cd7
-    Reviewed-on: https://code.wireshark.org/review/18800
-    Reviewed-by: Franklin Mathieu <snaipe@diacritic.io>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6b064e0
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Dec 7 19:59:53 2016 +0100
-
-    extcap: Whitespace cleanup.
-    
-    Cleanup code to use uniform whitespace to make it more readable.
-    Also added brackets to unbracketed one line conditional statements.
-    
-    This was done using "astyle -A1cHjk3pU".
-    
-    Change-Id: Iebe96c488c843ce1d790ede0016eb9df025e98a5
-    Reviewed-on: https://code.wireshark.org/review/19133
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    (cherry picked from commit 66c50585e5c10764d0b8a850fd49fa7012346560)
+    Reviewed-on: https://code.wireshark.org/review/22208
     Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d438170
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 8 12:34:59 2016 -0800
-
-    Fix a mis-merging.
-    
-    Also, remove the "make sure we're not fetching a bogus structure" tests.
-    
-    Add a comment explaining how a compiler bug where it's overly optimizing
-    a combination of tests could cause the valgrind errors we were seeing,
-    so we're zeroing the entire structure, padding included, to avoid that.
-    
-    Change-Id: I24f94b2cbceec5234c1da82b891f609648075839
-    Reviewed-on: https://code.wireshark.org/review/19149
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a02d8e3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Dec 8 15:46:59 2016 +0100
-
-    tns: reduce variable scope.
-    
-    Change-Id: Ie187692143b5866bb52b7daf1def2e36ce202a86
-    Reviewed-on: https://code.wireshark.org/review/19146
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7a7249c
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Dec 8 13:50:42 2016 +0100
-
-    [GTP] Add dissection of Extended Common Flags II IE
-    while at it extend IE value_strings.
-    
-    Change-Id: Iea592aca088384c381843be7255922db2ade393a
-    Reviewed-on: https://code.wireshark.org/review/19145
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3496051
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Dec 8 00:24:05 2016 +0100
-
-    sdp: decode pt for more RTP transport protocols
-    
-    Do not just decode the payload type for RTP/AVP, but also all RTP
-    transport types.
-    
-    Add RTP/AVPF (same as normal RTP/AVP, but with additional RTCP formats).
-    Similarly, add RTP/SAVPF and the two DTLS variants. Add references to
-    the relevant specifications and order per IANA registry.
-    
-    Tested with dtls-srtp-ws-sip.pcapng, now the payload types under the
-    "m=" tree have names and frames that were previously reported as RTP
-    show up as SRTP. Frame 442 now shows "Encrypted RTCP Payload" warning
-    instead of decoding it as garbage.
-    
-    Change-Id: I06893f385ec270391f8891e72a364d08d2354a0a
-    Ping-Bug: 13193
-    Reviewed-on: https://code.wireshark.org/review/19139
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 43706be
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Dec 8 08:14:14 2016 +0100
-
-    Qt: Fix currentOutputDeviceName() without QtMultimedia
-    
-    Fix build error:
-    ui/qt/moc_rtp_player_dialog.cxx:87:76: error: ‘currentOutputDeviceName’ was not declared in this scope
-             case 0: *reinterpret_cast< QString*>(_v) = currentOutputDeviceName(); break;
-    
-    Change-Id: I065862540e775c3e965cb5d3ae4c53bd8d505bdd
-    Reviewed-on: https://code.wireshark.org/review/19142
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 98ec464
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 8 09:07:13 2016 +0000
-
-    Revert "Revert "Don't use a local variable's address in set_address().""
-    
-    This reverts commit 92a2c184b09ce41a1ab717963750bb5543099742.
-    
-    Actually, that address *is* attached to a pinfo structure.
-    
-    Change-Id: I183135f9cf10a6714045091d2ae02d2799093bae
-    Reviewed-on: https://code.wireshark.org/review/19143
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5e3f823
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Sat Nov 12 14:40:31 2016 -0500
-
-    packet-rpcrdma: Select correct size of transport header
-    
-    Nit: Make it easier to see the transition between the end of the
-    RPC-over-RDMA transport header and the start of the RPC header.
-    Calculate the selection size of the RPC-over-RDMA header
-    properly, including the size of the chunk lists.
-    
-    Change-Id: I84bc7d970a95e8f50a21a45ded386322711b6512
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19034
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dde3137
-Author: Chris Brandson <chris.brandson@gmail.com>
-Date:   Wed Dec 7 14:36:17 2016 -0800
-
-    Fix ZigBee End Device Timeout enumeration
-    
-    Value 1 incorrect. Remaining enumerations correct
-    
-    Change-Id: I31939fabded6c4eab13c5b61bbdd4f61b962f0e0
-    Reviewed-on: https://code.wireshark.org/review/19137
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 92a2c18
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 7 22:50:49 2016 +0000
-
-    Revert "Don't use a local variable's address in set_address()."
-    
-    This reverts commit e2c26ff90c6aee381c3af0c33253dcfa5631bb43.
-    
-    *That* address isn't attached to a pinfo structure, it's used to create a conversation, and a copy is made of it, using file scope.  So that's not the cause of this problem.
-    
-    Change-Id: I07ce091e678c42c30080cd00fd17cd1584f473ad
-    Reviewed-on: https://code.wireshark.org/review/19138
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e2c26ff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 7 14:21:09 2016 -0800
 
-    Don't use a local variable's address in set_address().
-    
-    The address data is supposed to outlive the current routine's scope, so
-    you can't pass it a pointer to an argument to the routine; you have to
-    allocate pinfo-scoped memory and copy the variable to that.
-    
-    Bug: 13219
-    Change-Id: Id3fdb52b614036d4d24d0676e798a2524fbe916c
-    Reviewed-on: https://code.wireshark.org/review/19136
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 37eead0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Dec 6 16:31:32 2016 +0000
-
-    Revert "Temporarily break up complicated expression into a bunch of separate ifs."
-    
-    This reverts commit db7c6286169015a727024e86eb270722127125bb.
-    
-    As pointed out in bug 13044, the warning is really coming from checking
-    "cops_call->solicited", no need to expand the whole expression.
-    
-    Ping-Bug: 13044
-    Change-Id: Ib376ce6d0ec9fcf896e6081adae7664f19d9f759
-    Reviewed-on: https://code.wireshark.org/review/19115
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 49fcee3
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Wed Dec 7 01:14:39 2016 +0300
-
-    Qt: don't append a second extension to save file names
-    
-    When checking if the file already has one of the possible extensions,
-    MainWindow::fileAddExtension reuses file_suffix between iterations and
-    appends to it each time, so it ends up checking for the wrong suffix for all
-    extensions except the first one. Scope file_suffix to the for loop to
-    fix that.
-    
-    Change-Id: Idbc5a619a4793d8c477bfd88305cdb44ea844e13
-    Reviewed-on: https://code.wireshark.org/review/19123
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 983334f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 7 11:50:10 2016 -0800
-
-    The version lists are sequences of 1-byte integers, not strings.
-    
-    Show each version in the list independently as an item.
-    
-    Perhaps the Set Protocol response version lists seen have only one
-    version, but the presence of a version-0 terminator suggests that it
-    could contain multiple versions, so dissect it as such.
-    
-    For FT_STRINGZ values, let proto_tree_add_item() determine the length -
-    pass a length of -1.  If we need the length, use
-    proto_tree_add_item_ret_length().
-    
-    Change-Id: I5954ccac34f9e462c6d43e9a213974cf818f4d0d
-    Reviewed-on: https://code.wireshark.org/review/19134
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0af0532
+commit c59d770
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Dec 7 09:58:28 2016 -0800
+Date:   Sun Jun 18 08:20:35 2017 +0000
 
-    Qt: Fixup the currentOutputDeviceName Q_PROPERTY.
+    [Automatic update for 2017-06-18]
     
-    The CONSTANT attribute indicates that the same value will be returned
-    every time. That isn't the case here so remove it.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: Ie7451e6aabcb4fa1a6960762d96ad190f32b3d7a
-    Reviewed-on: https://code.wireshark.org/review/19130
+    Change-Id: Iabd301cc4cda3d645854111fa5638d4b55cc8953
+    Reviewed-on: https://code.wireshark.org/review/22204
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fa47c36
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Dec 7 19:02:06 2016 +0100
-
-    extcap: Separate dirname and file with G_DIR_SEPARATOR_S.
-    
-    Change-Id: I9e1e9b1a10a15ca95519392a7a19ba77f460141e
-    Reviewed-on: https://code.wireshark.org/review/19131
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cd4540b
-Author: Alexandr Savca <s.alex08@mail.ru>
-Date:   Sat Dec 3 16:42:23 2016 +0200
-
-    packet-tns: add Set Protocol dissection.
-    
-    Set Protocol is a SQLNET (NET8) message of Data packet type. At the
-    moment, request message is fully implemented, response partly.
-    
-    Also, remove unused href entry(s).
-    
-    Change-Id: I1814ce867cf4f03fa70f05552bfe870ed8f7737c
-    Reviewed-on: https://code.wireshark.org/review/19051
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b9a1fd5
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Dec 6 09:10:52 2016 +0100
-
-    Bluetooth: SMP: Use bitmask fields
-    
-    And try to improve column output readability by using
-    separators.
-    
-    Change-Id: I274f47275519c2a87def483f8f857a98edc341d1
-    Reviewed-on: https://code.wireshark.org/review/19109
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 1dde01c
-Author: bwhitn <brian.m.whitney@outlook.com>
-Date:   Wed Dec 7 07:32:31 2016 -0800
-
-    Fix: Allocate new string for export object entry to prevent crash when memory is freed
-    
-    Change-Id: Ied9f267b28144ea6069388d2d739d07955642863
-    Reviewed-on: https://code.wireshark.org/review/19129
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f39389e
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Tue Dec 6 11:25:59 2016 -0500
-
-    packet-rpcrdma: Fix selection size in chunk list dissectors
-    
-    Use proto_item_set_len instead of walking the packet ahead of time
-    trying to compute the size.
-    
-    Change-Id: I5eb3da1fef45895853cb5b6b198d0310394e4176
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19120
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 29768d9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Dec 6 21:19:01 2016 -0500
-
-    RTCP: Bugfix MS Video Source Request dissection
-    
-    Bug: 13212
-    Change-Id: I249d38e843f737bbd0773828f24980d148fbaa00
-    Reviewed-on: https://code.wireshark.org/review/19126
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0863a2c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Dec 7 00:06:23 2016 +0100
-
-    sdp: replace bitmask by enum for transport protocol
-    
-    Previously the bitmask also stored whether the type of media (video) and
-    address type (IPv4/IPv6). Now that these are gone, it makes more sense
-    to use enums.
-    
-    There is no functional change (only debugging output is different).
-    
-    Change-Id: Idc9659cd21e36489a3f5720bbf13640c4beecc02
-    Reviewed-on: https://code.wireshark.org/review/19124
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f0dbb28
+commit d2d630c
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 6 13:37:45 2016 -0800
+Date:   Sat Jun 17 14:50:31 2017 -0700
 
-    Throw in another tweak to check for uninitialized cops_call_t structures.
-    
-    Temporariy add a "magic" field, initialize it when we allocate it, and
-    whenever we fetch a structure from the array, make sure the "magic"
-    field has the right value.
-    
-    (If this all turns out to be a valgrind bug, I'm not going to be very
-    happy.)
+    Clean up whitespace.
     
-    Change-Id: I29becc715367fdc305504b38d48be05dc516132a
-    Reviewed-on: https://code.wireshark.org/review/19128
+    Change-Id: I67616d3ea6d325000c22c550c4d20c320b1c51db
+    Reviewed-on: https://code.wireshark.org/review/22195
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 43700544312f33ca78199de6003f8c4328df2203)
+    Reviewed-on: https://code.wireshark.org/review/22196
 
-commit 451eac8
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Fri Nov 11 17:35:58 2016 -0500
-
-    packet-rpcrdma: Prepare dissector for RPC-over-RDMA on iWARP or RoCE
-    
-    Remove the Infiniband-centric QP filtering. This filtering attempted
-    to create conversations to allow the heuristic dissector to be
-    bypassed once it was established that a QP was carrying
-    RPC-over-RDMA traffic.
-    
-    However, it was preventing proper identification of RPC-over-RDMA
-    traffic when a CM connection establishment exchange doesn't appear
-    in the capture (which is frequently the case for captures of NFS
-    traffic).
-    
-    Also, without this conversation logic, loading a capture file
-    appears to be significantly faster, at least for capture files
-    I have on hand.
-    
-    Later, some form of conversation management will be needed in
-    order to associate RPC-over-RDMA transport headers with
-    RDMA Read and Write operations that go along with them. But it
-    will need to be agnostic about the underlying link layer.
-    
-    Bug: 13199
-    Bug: 13202
-    Change-Id: Ie6b7a4c65979dac036306f7367ce18836713ab4d
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19032
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4f684a6
-Author: Alexandr Savca <s.alex08@mail.ru>
-Date:   Sat Dec 3 15:36:51 2016 +0200
-
-    packet-tns: add TNS_TYPE_DATA functions dissection.
-    
-    Those functions also known as NET8 commands or SQLNET layer of TNS protocol.
-    Also added a lot of sub-functions for one NET8 command, also known as OCI
-    (Oracle Call Interface).
-    
-    Do other cleanup while in the neighbor hood including:
-    1. Use proto_tree_add_bitmask where applicable
-    2. Remove individual "hidden" command fields. Filtering should use "tns.type"
-    3. Remove unnecessary if (tree)s
-    
-    Change-Id: Ib7cc5cf307179d5d252c334949a4e77d9d396ba4
-    Reviewed-on: https://code.wireshark.org/review/19050
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a1c30fe
-Author: bwhitn <brian.m.whitney@outlook.com>
-Date:   Tue Dec 6 10:58:17 2016 -0800
-
-    reformatted IMF export objects
-    
-    Change-Id: I3d8da3f481d6808d374c2a906652370a46a4c088
-    Reviewed-on: https://code.wireshark.org/review/19121
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Moshe Kaplan <me@moshekaplan.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fc4bb7e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 6 20:49:12 2016 +0100
-
-    Change SpanDSP capitalization
-    
-    Many capitalization can be found for this library (spandsp, Spandsp, SpanDSP),
-    let's use the one found in the library README and in its spec file.
-    
-    Change-Id: Ia66b723e5d582a6218da1b6366b7d4859272f80c
-    Reviewed-on: https://code.wireshark.org/review/19122
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 47829b9
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Dec 6 17:46:09 2016 +0100
-
-    cops: try to avoid uninitialized warning error
-    
-    Valgrind 3.11.0 on the Ubuntu 16.04 buildbot reports that
-    cops_call->solicited is not initialized:
-    
-        pdus_array = (GPtrArray *)wmem_map_lookup(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value));
-        /* ... */
-        for (i=0; i < pdus_array->len; i++) {
-            cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i);
-            if ( /* ... */
-            ( (cops_call->op_code == COPS_MSG_KA && !(cops_call->solicited)) &&
-                                                      ^^^^^^^^^^^^^^^^^^^^
-    
-    which is clearly bogus since the only place where cops_call could be
-    created is a few lines up:
-    
-        ver_flags = tvb_get_guint8(tvb, offset);
-        is_solicited = (lo_nibble(ver_flags) == 0x01);
-        /* ... */
-        pdus_array = (GPtrArray *)wmem_map_lookup(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value));
-        if (pdus_array == NULL) {
-            pdus_array = g_ptr_array_new();
-            wmem_map_insert(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value), pdus_array);
-        }
-        /* ... */
-        cops_call = wmem_new(wmem_file_scope(), cops_call_t);
-        cops_call->op_code = op_code;
-        cops_call->solicited = is_solicited;
-        /* ... */
-        g_ptr_array_add(pdus_array, cops_call);
-    
-    Try to zero the whole structure to avoid this bogus warning.
-    
-    Change-Id: I1ec4d23e99c987849af580a1c8134610c383e55e
-    Ping-Bug: 13044
-    Ping-Bug: 13203
-    Reviewed-on: https://code.wireshark.org/review/19119
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ae989a5
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Nov 9 16:34:34 2016 +0100
-
-    Bluetooth: SMP: Indicate when keys are Debug
-    
-    Debug mode keys are described by Bluetooth Core4 specification.
-    Inform user if any of keys are debug. Debug mode is only if both
-    keys are debug.
-    
-    Change-Id: Id7f58c2445614dc386a67b91cbe6f78ffbeda880
-    Reviewed-on: https://code.wireshark.org/review/19083
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d59653f
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Dec 2 15:52:02 2016 -0800
-
-    Qt: Make the RTP player output device selectable.
-    
-    Add a combobox for selecting the output device and populate it with our
-    available devices. Let the user know if our output format isn't
-    supported.
-    
-    Ping-Bug: 13105
-    Change-Id: I299c7d0f191bb66d93896338036000e2c377781f
-    Reviewed-on: https://code.wireshark.org/review/19046
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 263fea9
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Oct 27 13:51:05 2016 +0200
-
-    Bluetooth: SMP: Dissect remaining Key Distribution bits
-    
-    Add "Linkkey" and "Reserved" fields.
-    
-    Change-Id: I21a23824348500bbcf8366c947fe2d6599b015d4
-    Reviewed-on: https://code.wireshark.org/review/19081
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ebe948b
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Sun Dec 4 21:47:57 2016 -0500
-
-    packet-rpcrdma: Add filter variable for Write chunk segment count
-    
-    Allow the Write segment count field to be selected and filtered on.
-    In many Write chunks there is just one segment. However in some
-    special cases there can be multiple segments in a Write or Reply
-    chunk.
-    
-    Change-Id: Ic4a4104e3a44bf4f2c96e4e5353a10e7547350c9
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19102
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8c748af
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 6 08:53:10 2016 -0800
-
-    Add udpdump to the macOS package.
-    
-    Change-Id: I9d16a8291efdd564a905b2f8bc1ded4fa1aa718d
-    Reviewed-on: https://code.wireshark.org/review/19118
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f5e22a1
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Nov 24 00:27:14 2016 +0100
-
-    codecs: Add support for G.722 and G.726
-    
-    Integrate the Spandsp library for G.722 and G.726 support. Adds support
-    for G.722 and all eight variants of G.726.
-    
-    Note: this also fixes a crash in Qt (buffer overrun, reading too much
-    data) caused by confusion of the larger output buffer (resample_buff)
-    with the smaller input buffer (decode_buff). It was not triggered before
-    because the sample rate was always 8k, but with the addition of the new
-    codecs, a different sample rate became possible (16k).
-    
-    Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled
-    and the VOIP Calls dialog is opened (the begin frame, start_fd, is not
-    yet known and therfore a NULL dereference could occur).
-    
-    Passes testing (plays normally without bad RTP timing errors) with
-    SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested
-    with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled.
-    
-    Bug: 5619
-    Change-Id: I5661908d193927bba50901079119eeff0c04991f
-    Reviewed-on: https://code.wireshark.org/review/18939
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d8cdb55
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Dec 2 11:36:45 2016 -0800
-
-    Autotools: Disable Qt4 on macOS.
-    
-    Add a check for macOS+Qt4 to configure.ac in order to roughly match the
-    CMake behavior in ge858829.
-    
-    Change-Id: I37de95d5db515d28dd88f13d818531bf6e94d07e
-    Reviewed-on: https://code.wireshark.org/review/19036
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c334297
+commit 0738978
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Sep 22 13:36:44 2016 -0400
-
-    SDP: Fix compiler warning
-    
-    Change-Id: I5d415ba9ce7ae62eff43d47ceaa96e6282eaad1a
-    Reviewed-on: https://code.wireshark.org/review/19113
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7c3ecc6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 6 14:50:09 2016 +0100
-
-    DOF: fix UAT update callbacks
-    
-    - update callback must return a boolean to indicate success / failure
-    - error message must be allcoated in glib memory as GUI will g_free it
-    
-    Bug: 13209
-    Change-Id: Ibb9690034d66dae85e775d0010aadeb192c76b4a
-    Reviewed-on: https://code.wireshark.org/review/19111
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e2c812c
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Oct 28 08:26:12 2016 +0200
-
-    Bluetooth: Sync "Classic" color rules
-    
-    Change-Id: Ic64f9b71eba4ba8c79c28e10fe4eac983ca98f22
-    Reviewed-on: https://code.wireshark.org/review/19085
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 1d2f68b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Dec 5 00:43:02 2016 +0100
-
-    sdp: refactor session/media level handling of attributes
-    
-    The media_count meaning is horrendous. -1 means "none", a count of "0"
-    actually means "1". This led to various bugs in the past, so just rip it
-    out and use a (wmem) array from which the length can be determined.
-    
-    That also means that a hard-coded limit on the media can now easily be
-    lifted without affecting the size of the transport_info_t structure.
-    (This limit, SDP_MAX_RTP_CHANNELS,  is unchanged in this patch though.)
-    
-    Refactor the SDP dissector such that:
-    
-     - Media and related attributes are no longer a bunch of fixed array
-       fields, but grouped in one structure. This results in the largest
-       changes all over the place since "transport_info->media[n]" is now
-       transformed into "media_desc->media" where "media_desc" is an element
-       of the "transport_info->media_descriptions" wmem array.
-     - Simplify protocol (in "m=") parsing (lots of ifs -> array + loop).
-     - Remove convert_disposable_media and disposable_media_info_t, parse
-       fields (media protocol from "m=", connection address from "c=", etc.)
-       while parsing the SDP instead of parsing it at the end.
-     - Have two distinct structures for keeping the info for the session and
-       media level. Emphasize that new media descriptions are inherited from
-       session level attributes (via sdp_new_media_description).
-     - Delay creation of dynamic payload type information table until we
-       actually create the media description. Create function
-       clean_unused_media_descriptions to handle the common of freeing
-       unused dynamic pt.
-     - Remove SDP_IPv4/SDP_IPv6, these are replaced by checking the type
-       member of the address structure.
-    
-    Changes to MSRP part:
-    
-     - Move MSRP attributes to the media-level attributes.
-     - Remove msrp_transport_address_set attribute, rely on the AT_NONE
-       address type for detecting bad addresses.
-     - Remove SDP_MSRP_IPv4 check, this never worked as the flag was never
-       set. Now it relies on the address family from the host in a=path:.
-    
-    Tested with these capture files with no change in PDML output nor
-    improvements/regressions with memleaks (as reported by ASAN):
-    
-        capture sip call wireshark 1.8.2.pcap
-        NOringback.pcapng
-        rtp_not_parsed_by_1_10_1.pcap
-        rtsp_interleaved_coreplayer.cap
-        SIP_CALL_RTP_G711.pcapng
-        srtpincorrectlyselected.pcap
-        tdnwifitontwifi_withnatting_clientAbhopati_03082015.pcapng
-    
-    Change-Id: Ia0dbc63f8bd78cc84dad2e18174540e31b78a80d
-    Reviewed-on: https://code.wireshark.org/review/19072
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 104b9fe
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Dec 5 23:00:33 2016 +0100
-
-    rtp: add function to duplicate rtp_dyn_payload_t
-    
-    There is no way to iterate through the contents. For a future patch to
-    the SDP dissector (where the session-level info is copied to the
-    media-level), it would be nice to duplicate the dynamic payload info.
-    
-    Change-Id: I79b8349e5e157298a28fc608e20c2c2e03e76400
-    Reviewed-on: https://code.wireshark.org/review/19106
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 89bc07c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Nov 30 21:43:09 2016 +0100
-
-    DTLS: add support for use_srtp extension (RFC 5764)
-    
-    Decryption support will be added later. Tested with
-    dtls-srtp-ws-sip.pcapng from the linked bug.
-    
-    Change-Id: Ida1a2da754ef9aef16ad15ff64455b6f8e703ffd
-    Ping-Bug: 13193
-    Reviewed-on: https://code.wireshark.org/review/18996
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f96e9d0
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Mon Dec 5 22:43:21 2016 +0300
-
-    ssh: add dissection for ECDSA host keys
-    
-    Change-Id: Ic9851976bfa25fc61c708ee08e5a26ad01769f06
-    Reviewed-on: https://code.wireshark.org/review/19097
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 38f45e1
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Dec 3 01:20:10 2016 +0100
+Date:   Sat Jun 17 11:10:53 2017 -0400
 
-    SDP: reduce code duplication
-    
-    Observe that some code in setup_sdp_transport is effectively the same
-    code as a part from dissect_sdp with these differences:
-    
-     - Removal of these two conditions (setup_sdp_transport already returns
-       early when a packet is visited):
-        (!pinfo->fd->flags.visited) && (transport_info == &local_transport_info)
-     - "establish_frame" in setup_sdp_transport is replaced by "pinfo->num"
-       in dissect_sdp.
-    
-    dissect_sdp further has two additional blocks that add information to
-    the VoIP calls dialog. This is preserved.
-    
-    Freeing of the RTP payload information has also been simplified. Instead
-    of checking it inside the main loop that adds addresses (now moved to a
-    new function, "apply_sdp_transport"), let the caller do it outside the
-    loop.
+    Expose RTPS dissector for Lua.
     
-    The transformation in this patch is rather mechanical:
+    See https://ask.wireshark.org/questions/61824/how-to-get-a-reference-to-an-existing-heuristic-dissector-in-lua-in-order-to-wrap-rtps
     
-     0. Add a comment on what the new function is supposed to do.
-     1. Move code from setup_sdp_transport into a new function,
-        apply_sdp_transport and reduce indentation level.
-     2. Copy all variables to the new function and populate the parameter
-        list.
-     3. Compile result, remove unused variables that the compiler warns for.
-     4. Move freeing of unused media outside the loop to the caller.
-     5. Create a new conditional statement before the duplicated loop, which
-        checks whether setup_sdp_transport has been used before. (SIP first
-        calls setup_sdp_transport, then it invokes the media type dissector
-        which calls dissect_sdp to populate the tree.)
-     6. Remove the duplicated code from the dissect_sdp loop until only the
-        VoIP Calls dialog info remains.
-    
-    There is no functional change intended.
-    
-    Change-Id: I928379466af56ef1729cccbf4a5b60895ddb3227
-    Reviewed-on: https://code.wireshark.org/review/19047
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I926b974da8e2de35c64cc46cba7b38e71368fcdd
+    Reviewed-on: https://code.wireshark.org/review/22137
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 57fece13e06b347ef14f106ec9ee19f2d13b0182)
+    Reviewed-on: https://code.wireshark.org/review/22194
 
-commit 2994e63
+commit 230ebe0
 Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Nov 30 21:57:56 2016 +0100
-
-    SDP: add basic ICE candidate attribute dissection (RFC 5245)
-    
-    Dissect the first, fixed part of a=candidate. The candidate type is also
-    unabbreviated for easier understanding. Tested with
-    dtls-srtp-ws-sip.pcapng from the linked bug.
-    
-    Change-Id: I9950c8f066becea86f1fe8e9ffab2dc07ae0f425
-    Ping-Bug: 13193
-    Reviewed-on: https://code.wireshark.org/review/18997
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8773ea0
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Mon Dec 5 07:43:03 2016 -0500
-
-    CIP: Minor enhancements
-    
-    1. ENIP: Display the CIP Forward Open Request packet number for connected data
-    2. CIP: Extended Network: Display expert info when the expected bytes does not match actual bytes
-    3. CIP: Look up more data fields as CIP service or Device Type
-    4. CIP: Display data as Dec/Hex, depending on how the spec shows things
-    5. Minor: Pull out common code into load_cip_request_data()
-    6. Minor: Text corrections
-    
-    Change-Id: I184ac3899786f650e4d4643a5dfe68bba785d6e0
-    Reviewed-on: https://code.wireshark.org/review/19092
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a94b82a
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Sun Dec 4 20:16:59 2016 -0500
-
-    packet-rpcrdma: Clean up Reply chunk dissection
-    
-    Display the Reply chunk as a tree, using the same code that the
-    Write list dissector now uses. Fix up the selection size of the
-    Reply chunk.
-    
-    Bug: 13197
-    Change-Id: Ie861b7721b2c2dd9a5839986488ee22f39f81d1e
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19101
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 677a543
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Sun Dec 4 18:39:39 2016 -0500
-
-    packet-rpcrdma: Fix Write list dissection
-    
-    The current mechanism of dissecting RPC-over-RDMA chunk lists is not
-    working. It treats the Write list as a list of RDMA segments (it's a
-    list of counted arrays).
-    
-    Bug: 13197
-    Change-Id: I6f8e788d66eefd17d6c1995e238a9ff9fa1e81f2
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19100
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 149e42f
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Sun Dec 4 17:36:59 2016 -0500
-
-    packet-rpcrdma: Fix Read list dissection
-    
-    The current mechanism of dissecting RPC-over-RDMA chunk lists is not
-    working. It treats the Read list as a counted array (it's a list).
-    
-    Part of this confusion arises because RFC 5666 uses the term "chunk"
-    to mean "chunk", "read segment", and "rdma segment". Re-organize
-    the dissector logic to make this distinction properly.
-    
-    Bug: 13197
-    Change-Id: Iad517804dbcf8b30de795af03af7a71a6f231231
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19099
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 74f025d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Dec 5 15:21:34 2016 -0500
-
-    RTPS: Cleanup endian handling
-    
-    1. Rather than pass a boolean that has to be continually evaluated, just pass the
-    necessary encoding (ENC_LITTLE_ENDIAN or ENC_BIG_ENDIAN)
-    2. Incorporate more use of proto_tree_add_item_ret_[u]int
-    3. Remove NEXT_guint16 and NEXT_guint32 because we now have tvb_get_guint16 and
-    tvb_get_guint32
-    
-    Change-Id: Ib1c3488450b4e727d2c1943ba4e577faf2350dcc
-    Reviewed-on: https://code.wireshark.org/review/19103
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 548b9fe
-Author: Dmitry Lazurkin <dilaz03@gmail.com>
-Date:   Fri Nov 25 22:45:02 2016 +0300
-
-    kafka: add dissection for rest of api keys
-    
-    - support rest of api keys
-    - dissect kafka.required_acks with constants
-    - dissect kafka.message_timestamp_type
-    - add expert info about missing request
-    
-    Change-Id: I3d18936adac6702a61f545385bdec1b75b564bd9
-    Reviewed-on: https://code.wireshark.org/review/18954
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit a275e3f
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Sun Dec 4 22:11:12 2016 -0500
-
-    packet-rpcrdma: Display length fields in decimal
-    
-    Change-Id: I3a3a51de76286800992b1445c332c50059112c54
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19098
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 026b2f9
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Sun Dec 4 16:58:37 2016 -0500
-
-    packet-rpcrdma: Remove if (tree) preventing dissectors being called.
-    
-    When tshark displays each frame in default mode (without -V):
-    
-    - NFS on TCP is dissected and displayed
-    - NFS on RPC/RDMA is displayed as only an RPC/RDMA frame
-    
-    NFS on RPC/RDMA should be dissected and displayed just like NFS on
-    TCP. Make passing along the RPC payload to the RPC dissector
-    unconditional.
-    
-    Bug: 13198
-    Change-Id: Ia86f3abcfcbc65a860d4ff7bac19a5f3af44a0b0
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19027
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7b5e774
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 5 10:53:32 2016 -0800
-
-    CMake: Update FindWiX.
-    
-    The WiX Toolset installer sets the WIX environment variable. Search for
-    our WiX executables there first.
-    
-    Change-Id: I5acc9cb369dc2bdbb071d35b5a39498c6db117a3
-    Reviewed-on: https://code.wireshark.org/review/19096
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 2b51717
-Author: Juanjo Martin <juanjo@rti.com>
-Date:   Wed Nov 30 17:13:30 2016 +0100
-
-    RTPS: Added submessages and fixed minor issues for Secure DDS
-    
-    Bug: 13204
-    Change-Id: Iaad562aafe3a4f0300398fc45927ac810814ee75
-    Reviewed-on: https://code.wireshark.org/review/18990
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4d9eb4c
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Oct 26 14:56:30 2016 +0200
-
-    Bluetooth: SMP: Dissect remaining AuthReq bits
-    
-    Dissect SC, Keypress and Reserved bits.
-    Up to Bluetooth Core 4 specification.
-    
-    Change-Id: Id7ac75bd917786abe9aada433a1343887a32234d
-    Reviewed-on: https://code.wireshark.org/review/19079
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2452367
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Oct 26 15:53:12 2016 +0200
-
-    Bluetooth: SMP: Implement 3 more commands
-    
-    0x0C: /* Pairing Public Key */
-    0x0D: /* Pairing DHKey Check" */
-    0x0E: /* Pairing Keypress Notification */
-    
-    Change-Id: I18dc88d2cb7a96412b230a9b414ce053bfde09fa
-    Reviewed-on: https://code.wireshark.org/review/19080
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+Date:   Mon Jun 12 16:21:29 2017 +0200
 
-commit d67b557
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Oct 27 15:22:27 2016 +0200
-
-    Bluetooth: SMP: Add coloring rule for SMP
-    
-    SMP occurs very rare, because of it nature - it is just pairing
-    procedure. It is better to distinguish it from L2CAP by assigned to it
-    another yellow colour.
+    Do not process UI events while reading from live capture
     
-    Change-Id: I71e8641b717581253cd86cc867fa71241e7650b7
-    Reviewed-on: https://code.wireshark.org/review/19082
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 75a5cf9
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Nov 9 12:51:15 2016 +0100
-
-    Bluetooth: BTLE*: Initialize what initialized was not
-    
-    Fix unexpected Direction flag pass to BTLE dissector
-    what caused reassemble of L2CAP not working correctly
-    (it based on Source/Destination addresses/columns).
-    
-    Change-Id: I10fb17c29b020f6ca746f7bbccb7527e0ba04624
-    Reviewed-on: https://code.wireshark.org/review/19084
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5a0bc5f
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Oct 28 15:47:01 2016 +0200
-
-    Bluetooth: Assigned Numbers: Update Member UUIDs
-    
-    Update manually from time to time based on:
-    https://www.bluetooth.com/specifications/assigned-numbers
-    
-    Change-Id: I506e58c16322862c9fe517b71ab12806818331b5
-    Reviewed-on: https://code.wireshark.org/review/19086
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a7d404a
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Nov 3 10:46:25 2016 +0100
-
-    androiddump: Add support for Bluetooth on Android 7.0
-    
-    Now "ps" command does not support process name as parameter,
-    use grep instead.
-    
-    Change-Id: I0c35bc7d560e237e4140000e67af097744cb2c1b
-    Reviewed-on: https://code.wireshark.org/review/19087
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit e0a4f0c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Dec 4 20:27:35 2016 -0500
-
-    SMB: Limit Export object files to 32 bits.
-    
-    Most of the file offset fields are 32-bit, but the algorithms use gsize
-    variables, which can vary between 32 and 64 bit builds.  The 64-bit
-    builds are the ones with the problem with "garbage" data comes from
-    (effectively) invalid 32-bit offsets.
-    
-    Bug: 11133
-    Change-Id: I20b8cafb75fc021594159ab092c18c24f3e257e3
-    Reviewed-on: https://code.wireshark.org/review/19073
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 26def3e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Dec 4 22:29:14 2016 -0500
-
-    Honor protocols.display_hidden_proto_items preferences when outputting fields in TShark
-    
-    Bug: 13192
-    Change-Id: Ibb2b3913716d31a3d5f600e1b6400fdf14a69ca4
-    Reviewed-on: https://code.wireshark.org/review/19075
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 037c64a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 4 20:25:51 2016 -0800
-
-    Clean up initialization code for programs.
-    
-    Make the init_progfile_dir() call unconditionally, even if plugins
-    aren't supported, as that doesn't necessarily mean nobody uses the
-    directory containing the executable.
-    
-    Report the error the same way in all programs, and free the error string
-    after we're finished with it.
-    
-    Make the error - and the comment before the code - reflect what
-    init_progfile_dir() is actually doing (the goal is to get the full
-    pathname of the directory *containing* the executable; that's generally
-    done by getting the pathname of the executable and stripping off the
-    name of the executable, but that's won't necessarily always be the
-    case).  Also note for TShark that we won't be able to capture traffic,
-    just as we do for Wireshark (if we don't have the pathname of the
-    program file, we don't have a pathname to use to find dumpcap).
-    
-    Have the plugin scanner just fail silently if we weren't able to get the
-    plugin directory path, so we don't have to worry about calling it if
-    init_progfile_dir() fails.
-    
-    Clean up white space while we're at it.
-    
-    Change-Id: I8e580c719aab6fbf74a764bf6629962394fff7c8
-    Reviewed-on: https://code.wireshark.org/review/19076
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit faf7060
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 4 19:21:19 2016 -0800
-
-    Update a comment to reflect current reality.
+    For at least Qt, the main_window_update callback is not necessary to
+    make the stop button work. When restarting a live capture during a
+    flood (via Ctrl-R), this callback actually results in an infinite loop
+    in MainWindow::captureStop since the capture state never changes from
+    FILE_READ_IN_PROGRESS.
     
-    Change-Id: Ied84e0363161ebc42c8cf24e7ade4b1b4e536448
-    Reviewed-on: https://code.wireshark.org/review/19074
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 83a1ab2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 29 00:44:56 2016 +0100
-
-    cmake: Fix building with plugins disabled
+    Remove this callback to ensure that the problematic
+    pipeActivated / sync_pipe_input_cb / capture_input_new_packets /
+    main_window_update / ... / on_actionCaptureRestart_triggered /
+    testCaptureFileClose / captureStop sequence is avoided.
     
-    When Lua is enabled, scripts can still be loaded from the plugin dir
-    (filesystem.c uses PLUGIN_INSTALL_DIR), so be sure to set it or the
-    cmake build fails.
+    Even though captureStop invokes capture_stop, I guess that this does not
+    change the state because the pipeActivated callback is already active.
     
-    Change-Id: I87d2d705434052220f9619438c90905c24b2a3a6
-    Reviewed-on: https://code.wireshark.org/review/18976
+    Bug: 10917
+    Change-Id: I6ca4fa946963928b7bc8a53ca14f9a9a3a35eaa7
+    Reviewed-on: https://code.wireshark.org/review/22097
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
     Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fca6bf6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 4 14:25:10 2016 -0800
+    (cherry picked from commit 553b1e0215ad5826906aafbe0e38c1e44cf9e1c3)
+    Reviewed-on: https://code.wireshark.org/review/22191
 
-    Reflect API changes.
-    
-    Change-Id: I6a8d50cb697bcd4a5232dc01107c7d9618258d87
-    Reviewed-on: https://code.wireshark.org/review/19071
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bded2b6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 4 14:20:37 2016 -0800
-
-    Rawshark uses libwiretap, so it has to call wtap_init().
-    
-    Change-Id: I4b87227e4828ebad98b22e5e5d1f3896e636582a
-    Reviewed-on: https://code.wireshark.org/review/19070
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ab07f8e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 4 13:42:07 2016 -0800
-
-    Have a routine to do all the work of initializing libwiretap.
-    
-    Have programs that use libwiretap call that routine rather than
-    separately calling some or all of init_open_routines(),
-    wtap_register_plugin_types(), and wtap_opttypes_initialize().
-    
-    Also don't have routines internal to libwiretap call those.  Yes, this
-    means doing some initialization work when it isn't necessary, but
-    scattering on-demand calls throughout the code is a great way to forget
-    to make those calls.
-    
-    Change-Id: I5828e1c5591c9d94fbb3eb0a0e54591e8fc61710
-    Reviewed-on: https://code.wireshark.org/review/19069
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 51d23c6
+commit 51c57ce
 Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 29 00:58:40 2016 +0100
+Date:   Mon Jun 12 14:23:32 2017 +0200
 
-    Show codec information in About dialog
+    Qt: fix hang on exiting Qt while loading capture file
     
-    Show codec libraries in About dialog, this should give the user a clue
-    of what codecs are available.
-    
-    SBC is already supported, Spandsp (for G.722/G.726) is work in progress.
-    
-    Change-Id: Iebc4d9c9fae619a442e06c8afc780a420aa3971b
-    Reviewed-on: https://code.wireshark.org/review/18978
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 98efddc
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 29 00:53:23 2016 +0100
-
-    codecs: allow it to be used without plugins
+    testCaptureFileClose can also be invoked while reading an existing
+    capture file (the original comment only applied to GTK+, not Qt). When
+    the user quits Wireshark while reading an offline pcap, this could
+    result in a confusing "Unsaved packets" dialog. Fix this by checking the
+    actual capture session state.
     
-    Not all codecs require the plugin infrastructure. For example, G.711U/A
-    is a built-in codec. Allow such functionality to be registered even if
-    plugin support is disabled.
+    After fixing this, the next issue is that cf_close trips on an assertion
+    ("cf->state != FILE_READ_IN_PROGRESS"). To address this problem, do not
+    close the capture file immediately, but signal to the reader (cf_read)
+    that this should be done (similar to the quit logic in GTK+).
     
-    Change-Id: I2505cc9955e7953268ec0739531278921f70a771
-    Reviewed-on: https://code.wireshark.org/review/18977
+    Bug: 13563
+    Change-Id: I12d4b813557bf354199320df2ed8609070fdc58a
+    Reviewed-on: https://code.wireshark.org/review/22096
     Petri-Dish: Peter Wu <peter@lekensteyn.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 800a856fb4784e31347e15a8ec825d2daeb62350)
+    Reviewed-on: https://code.wireshark.org/review/22190
 
-commit 0544556
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 4 08:13:20 2016 -0800
-
-    [Automatic update for 2016-12-04]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Icad3ffb6cbd570b0b8a2c650d3c11a3c9bed536f
-    Reviewed-on: https://code.wireshark.org/review/19066
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 5721a87
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Dec 3 23:41:08 2016 +0100
-
-    Qt: clear Export Objects list on retapping
-    
-    The tap reset callback should not just invoke the reset callback of the
-    dissector, but also clear the previous list of objects in the dialog.
-    Otherwise duplicate entries will be created every time retapping occurs
-    (e.g. on changing the display filter).
-    
-    Bug: 12230
-    Change-Id: I75f25db0652dcc9c0ac59ab0e536c06874aedb9c
-    Reviewed-on: https://code.wireshark.org/review/19055
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 40ebfb9
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Thu Dec 1 23:25:55 2016 +0300
-
-    ssh: fix the heuristic for MAC size determination
-    
-    size_str points to a dash, so the result of calling ws_strtoi32 on it is
-    a negative number, which becomes a huge positive number, because size is
-    a guint32.
-    
-    Parse the number after the dash instead, and use ws_strtou32.
-    
-    Also, check that size is divisible by 8, since otherwise it's unlikely
-    to be a bit length.
-    
-    Change-Id: I531f67d45e9e914574d36a9ffceed9239fd46d64
-    Reviewed-on: https://code.wireshark.org/review/19006
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit dd98856
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 3 17:57:34 2016 -0800
-
-    Have separate merge APIs for regular file/temporary file/standard output.
-    
-    This is similar to what we have for opening a dump file - one API that
-    uses the file name as specified, one that creates a temporary file and
-    provides the file name, and one that uses the standard output.
-    
-    All of those APIs handle closing the output file.
-    
-    Change-Id: I56beea7be347402773460b9148ab31a8f8bc51e1
-    Reviewed-on: https://code.wireshark.org/review/19059
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5aede1b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 3 19:02:36 2016 -0800
-
-    Squelch a casting-away-constness warning.
-    
-    Change-Id: I77ca8ffd38baf812ef20b9611f59cd70ae37d392
-    Reviewed-on: https://code.wireshark.org/review/19062
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b49e20c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 3 18:54:15 2016 -0800
-
-    Remove unnecessary cast (gchar = char) that removes const.
-    
-    Change-Id: I3924c2b4a525c0ae5ab57b7f9867296586d78509
-    Reviewed-on: https://code.wireshark.org/review/19061
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 39840d7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 3 18:47:16 2016 -0800
-
-    Update list of symbols.
-    
-    Remove symbols from plugins; they're not part of libwireshark.
-    
-    Put all the get_rtd_ symbols together.
-    
-    Add some new symbols.
-    
-    Change-Id: I724ca7fd19ad083b7e05526a30974c23fa321e0b
-    Reviewed-on: https://code.wireshark.org/review/19060
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 99ca028
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 3 15:15:39 2016 -0800
-
-    Use ws_close(), rather than the UN*X-only close().
-    
-    Change-Id: Iae29db90273191c10455e172bdd2aac00b12143c
-    Reviewed-on: https://code.wireshark.org/review/19058
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a63c568
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 3 15:14:31 2016 -0800
-
-    Get rid of test printout.
-    
-    Change-Id: I0db268b0f7010d23c938ae56674cc5cd6c0bd998
-    Reviewed-on: https://code.wireshark.org/review/19057
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3309c08
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 3 14:17:08 2016 -0800
-
-    When opening the standard output for writing, dup it.
-    
-    That way, we can close the resulting wtap_dumper the same way we close
-    any other wtap_dumper, including closing the FD, rather than trying to
-    do everything *except* closing the FD (which is tricky for a FILE *).
-    
-    Change-Id: I8cb66e32784d73e598b2e8720a12f9bdab1c6205
-    Reviewed-on: https://code.wireshark.org/review/19054
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a0d03ce
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Sat Dec 3 02:49:37 2016 +0300
-
-    ssh: dissect the host key when the connection uses DH group exchange
-    
-    After this, hf_ssh_kexdh_host_key is no longer used, so remove it.
-    
-    Change-Id: Ie56a086481bbe087b7ba3b17aea394c05986f63d
-    Reviewed-on: https://code.wireshark.org/review/19052
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a0b4d46
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Nov 27 19:05:32 2016 +0000
-
-    install_rpms_for_devel: add optional packages.
-    
-    Install all optional dependencies as reported by cmake.
-    
-    Tested on Centos7, openSUSE Leap 41.1, Fedora 24.
-    Fedora 24 is shipped with lua5.3, that is not compatible
-    with the current master, then it is not enabled.
-    
-    Change-Id: Ie4de7ff2849d66371e94d5d7960aab8146337dea
-    Reviewed-on: https://code.wireshark.org/review/18968
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 77f31c6
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Mon Nov 28 22:40:55 2016 -0500
-
-    packet-infiniband: Fixed duplicate conversation entries
-    
-    1. Fixed find_conversation for PT_IBQP to not lookup in reverse
-    direction when all searches fail.
-    This is required, because there could be valid different connection in
-    reverse direction which mistakenly gets updated for non template cases.
-    
-    2. Added support for having MAD data for upper level dissectors to process
-    during RC packet processing.
-    This is required because connection options are negotiated out of band
-    using this CM exchanges (unlike in band TCP options).
-    
-    3. Moved creating unidirectional connections when actually MAD packets
-    are processed.
-    Previously client-to-server unidirectional conversation was created when
-    CM_RSP stage, where MAD Data of CM_REQ packet is inaccessible.
-    
-    4. Fixed creating multiple conversations with same address property by
-    eliminating create_conv_and_add_proto_data during RTU stage, which was
-    incorrect.
-    Now they are created during REQ and RSP frame processing. (Instead of
-    RSP and RTU processing).
-    
-    5. Added support for creating bidirectional connection that ULP can
-    refer.
-    This is required to keep track of oustanding transactions on a
-    connection (requests and responses).
-    
-    Bug: 11363
-    Change-Id: I32ea084a581a58efbc16dbb7a3e267c82622c50c
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/18982
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 50489fd
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Fri Dec 2 00:56:22 2016 -0500
-
-    tshark: Add -G folders report
-    
-    Add a new tshark feature to generate a folders report.  The folders report
-    is essentially the information presented by Wireshark's About / Folders page
-    in a TAB delimited format.
-    
-    Change-Id: Ic4b3d332b4bdaa7e6b7aad1e9cc5dd18413aada6
-    Reviewed-on: https://code.wireshark.org/review/19002
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit db7c628
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 2 20:08:40 2016 -0800
-
-    Temporarily break up complicated expression into a bunch of separate ifs.
-    
-    Maybe this way we can identify which *particular* test is, according to
-    Valgrind, looking at uninitialized data; there's nothing obvious that
-    shows up from inspecting the code, and neither of our static analyzers
-    seem to have found anything.
-    
-    Change-Id: I80f6bb8e6fa92decfe195c01766330b97e980821
-    Reviewed-on: https://code.wireshark.org/review/19049
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2462f9e
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Wed Nov 9 10:06:45 2016 -0500
-
-    packet-rpcrdma: Fix protocol frame pre-detection
-    
-    The current mechanism of detecting RPC-over-RDMA is broken because
-    it treats the Read list as a counted array (it's a list); and treats
-    the Write list and Reply chunk identically (one is a list, one is
-    always a single chunk).
-    
-    While we're here, refactor pre-detection helper functions so they
-    can be used during frame dissection as well.
-    
-    Bug: 13196
-    Change-Id: I76e210c8d2a9464fed00e7199072d37f4ebbebf2
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19025
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 54f48c8
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Wed Nov 30 18:00:12 2016 +0100
-
-    echo: decide on req/resp based on matched port
-    
-    Since the use of 'Decode as' can result in another port number than the
-    default port (7) being the service port, this should be checked against.
-    
-    Change-Id: I93383613115595fff621e2fb9ab7959cd448c01e
-    Reviewed-on: https://code.wireshark.org/review/18991
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 14bae88
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Wed Nov 9 09:48:50 2016 -0500
-
-    packet-rpcrdma: Display length and version fields in decimal
-    
-    Display length fields in decimal, just as they are displayed by the
-    RDMA RETH dissector.
-    
-    Display version fields in decimal, just as they are displayed by the
-    RPC dissector.
-    
-    RDMA offset fields are left in hexadecimal since they are
-    essentially addresses, and at least the Linux RPC-over-RDMA
-    implementation has debugging messages that display these as
-    hexadecimal values.
-    
-    Change-Id: I7206970675ca0ca486b3a2837b6dbb1c4d764091
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19028
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit aecff2f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 2 13:15:41 2016 -0800
-
-    Include config.h first, for large-file-related #defines.
-    
-    Change-Id: Iced77fb65c2db8bc370cefe4c48c972fe1262f92
-    Reviewed-on: https://code.wireshark.org/review/19039
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d5bdf7b
-Author: Chuck Lever <chuck.lever@oracle.com>
-Date:   Wed Nov 9 10:06:45 2016 -0500
-
-    packet-rpcrdma: Dissector should exit when frame is not RPC-over-RDMA
-    
-    On an RDMA transport, RPC protocol never appears in a frame by
-    itself. If RPC-over-RDMA is not present, then RPC is by definition
-    not present as an InfiniBand data payload.
-    
-    Bug: 13195
-    Change-Id: Icaea9d4936477af32adc73140c67539e977a7a9a
-    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-    Reviewed-on: https://code.wireshark.org/review/19024
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4dc7873
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 2 13:05:53 2016 -0800
-
-    Include config.h first, for large-file-related #defines.
-    
-    Change-Id: Id71326bc89e1461b100df99b618a1c49256b93af
-    Reviewed-on: https://code.wireshark.org/review/19037
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6f37317
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 2 11:18:50 2016 -0800
-
-    Include config.h at the very beginning of all Flex scanners.
-    
-    That way, if we #define anything for large file support, that's done
-    before we include any system header files that either depend on that
-    definition or that define it themselves if it's not already defined.
-    
-    Change-Id: I9b07344151103be337899dead44d6960715d6813
-    Reviewed-on: https://code.wireshark.org/review/19035
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2ec9093
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 2 11:57:43 2016 -0500
-
-    Make SMB2 MessageId field a FT_UINT64
-    
-    Also adjust the smb2_info_t structure that handles the value.
-    
-    Bug: 12915
-    Change-Id: Ia314b8dc840b9d26d2c1d185f06ef93f242a3a7b
-    Reviewed-on: https://code.wireshark.org/review/19019
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d2e2d7c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 2 10:27:51 2016 -0800
-
-    Put tap-exportobject.h into the release tarball.
-    
-    Change-Id: I5c103c5b513c32c5de0ea90956f9049fd6b0edec
-    Reviewed-on: https://code.wireshark.org/review/19022
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 20c57cb
-Author: Moshe Kaplan <me@moshekaplan.com>
-Date:   Thu Nov 24 09:37:01 2016 -0500
-
-    Enable exporting objects with tshark
-    
-    A new "--export-object <protocol>,<destdir>" option is added to tshark.
-    
-    This required refactoring Export Object behavior in all GUIs to give the
-    export object handling to the dissector, rather than the ui layer.
-    Included in the refactoring was fixing some serious memory leaks in Qt
-    Export Object dialog, crash due to memory scope issues in GTK Export
-    Object dialog, and addition sorting column feature in Qt dialog (set
-    up by creating a widget to manage the items that were previously
-    leaking memory)
-    
-    Bug: 9319
-    Ping-Bug: 13174
-    Change-Id: I515d7662fa1f150f672b1476716f347ec27deb9b
-    Reviewed-on: https://code.wireshark.org/review/18927
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9ca313c
+commit 6c7ed87
 Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Wed Nov 30 23:37:32 2016 +0100
+Date:   Sat Jun 17 08:44:08 2017 +0200
 
-    BOOTP: Fix V-I Vendor-Specific Information Option
+    PIM: Add identification of Hello option 65004
     
-    Apply the same value checks to the vendor generic suboption dissection
-    as is done for the Cable lab and ADSL forum ones.
-    See https://ask.wireshark.org/questions/57695 for an example issue.
+    Cisco uses propietary option 65004 to transmit RPF Proxy Vector
+    information. Add the name of the option to the option identification.
     
-    Change-Id: I4fe07d07cf0a93f4693e5ff54dd70c008701cf41
-    Reviewed-on: https://code.wireshark.org/review/18999
+    Change-Id: I5ee9e4d44d6326d8a457a8a4bbb24896e17216e8
+    Reviewed-on: https://code.wireshark.org/review/22186
     Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
     Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3b5d5ad
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Dec 2 10:19:12 2016 +0100
-
-    autotools: fix typo.
-    
-    The required executable is rpmbuild and not rpm.
-    
-    Change-Id: Iba1bff9c7fb6907659451a977ad8ab98efb169da
-    Reviewed-on: https://code.wireshark.org/review/19015
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 74fb68d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 2 09:26:29 2016 +0100
-
-    simple_dialog(.h): fix parameter 'Type' not found in the function declaration [-Wdocumentation]
-    
-    Change-Id: I3dc476af941221b1d59f31bd6f639a49059e38a9
-    Reviewed-on: https://code.wireshark.org/review/19014
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6ac4052
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 2 02:32:39 2016 -0800
-
-    Make sure config.h is included before inet_addr.h.
-    
-    Otherwise, _FILE_OFFSET_BITS might be defined by a header file included
-    by inet_addr.h before it gets defined by config.h.
-    
-    Change-Id: I5987b3f1493b81fd2d427d9792b9606117b255d0
-    Reviewed-on: https://code.wireshark.org/review/19018
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6e02789
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 2 01:29:26 2016 -0800
-
-    Do *NOT* strip newlines from the standard input of sed.
-    
-    There is *NO* guarantee that sed will do anything useful with input that
-    doesn't have a newline and, in fact, the default sed in Solaris 11
-    doesn't produce *any* output if you hand it input with no newline.
-    
-    Furthermore, doing xxx=`yyy` will, if the output of yyy has newlines at
-    the end, strip them; to quote section 2.6.3 "Command Substitution" of
-    the Single UNIX Specification:
-    
-            The shell shall expand the command substitution by executing
-            command in a subshell environment (see Shell Execution
-            Environment) and replacing the command substitution (the text of
-            command plus the enclosing "$()" or backquotes) with the
-            standard output of the command, removing sequences of one or
-            more <newline> characters at the end of the substitution.
-    
-    so there's no need to strip the newline.
-    
-    Change-Id: Ia710f67a42739c1e218eb9fec53a54bde6e010da
-    Reviewed-on: https://code.wireshark.org/review/19016
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8d927a9
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Dec 1 14:32:29 2016 -0800
-
-    Qt: Fix QStyledItemDelegate assertions.
-    
-    QStyledItemDelegate::paint asserts if you pass it an empty QModelIndex.
-    We were doing this in PercentBarDelegate and TimelineDelegate in order to
-    keep it from drawing any text. Return an empty string from ::displayText
-    instead, which appears to be the correct way to paint without text.
-    
-    Bug: 13180
-    Change-Id: I8064d9575e04e95a926797eec7f6ad2b0bfef1c0
-    Reviewed-on: https://code.wireshark.org/review/19007
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 672a5bd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 1 18:24:58 2016 -0800
-
-    The Kerberos dissector include Kerberos header, and needs KRB5_CFLAGS.
-    
-    Change-Id: I9a0e6ff09292fafca970e8ff423f18a835b5f2c4
-    Reviewed-on: https://code.wireshark.org/review/19011
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 333832e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Dec 1 16:15:10 2016 -0800
-
-    Prefs: Use g_utf8_strlen instead of strlen.
-    
-    Change-Id: I99e2906b3c31f4aebcda44f4433f0fdd457ced3b
-    Reviewed-on: https://code.wireshark.org/review/19008
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 007976b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 1 16:42:30 2016 -0800
-
-    Clean up error messages.
-    
-    Also, use elif in some chains of tests, to make it a bit clearer that
-    the cases in question are disjoint.
-    
-    Change-Id: I6dc92d536450c7ac3db6ee118581a5ed0c3ce80c
-    Reviewed-on: https://code.wireshark.org/review/19009
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d28a687
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Dec 1 13:04:08 2016 -0500
-
-    RPM: fix the date in a recent changelog entry.
-    
-    RPM complains when the date isn't valid.
-    
-    Change-Id: I859a9900ba87d52159071b06310d5873c092231a
-    Reviewed-on: https://code.wireshark.org/review/19003
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 58746cb
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Thu Dec 1 01:44:52 2016 +0300
-
-    ssh: add DSA host key dissection
-    
-    Change-Id: Ib1e2b4e57832e94b94d34102c0079f820b18f350
-    Reviewed-on: https://code.wireshark.org/review/19000
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit cbf89c8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Sep 20 14:11:29 2016 -0700
-
-    Check preference titles and descriptions.
-    
-    When registering preferences, make sure our titles and descriptions are
-    valid UTF-8. Make sure our titles are short and only contain printable
-    characters.
-    
-    Fix problematic titles and descriptions.
-    
-    Change-Id: I20d3f93438f2b3c30266f934297feb79897f2ee5
-    Reviewed-on: https://code.wireshark.org/review/18998
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9887cd7
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Nov 28 15:53:59 2016 +0100
-
-    Qt: fix crash when closing RTP player while playing
-    
-    For some time, the RTP Player has been crashing for me (Arch Linux, Qt
-    5.7.0) when the RTP Player is active (affects also Wireshark 2.0.5).
-    
-    This call trace was observed:
-    
-        + RtpPlayerDialog::reject (closing dialog via Escape / Close button)
-          + RtpAudioStream::stopPlaying
-            + RtpAudioStream::outputStateChanged(QAudio::StoppedState)
-              + QAudioOutput::deleteLater   // problematic!
-          + RtpPlayerDialog::~RtpPlayerDialog
-            + RtpAudioStream::~RtpAudioStream
-    
-    As the QAudioOutput instance is a child of RtpAudioStream, it is also
-    destroyed after that. QAudioOutput's destructor somehow invokes (via
-    libqtmedia_pulse.so) a main loop iteration which invokes the previously
-    scheduled deleteLater call.
-    
-    As QAudioOutput was already being destructed, this results in a crash.
-    Workaround this by removing this child from RtpAudioStream (no cruelty
-    intended).
-    
-    Change-Id: I88f2e929ac566534be5d2270e2e0b194685533eb
-    Reviewed-on: https://code.wireshark.org/review/18970
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7242719
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 29 09:32:47 2016 -0800
-
-    Qt: Fix simple_dialog formatting.
-    
-    Make sure that simple_dialog displays plain text. Trim whitespace
-    and remove excessive newlines in order to improve message formatting.
-    Add a comment about simple_dialog's behavior in Qt and GTK+ and how it
-    might be improved.
-    
-    Bug: 13178
-    Change-Id: Ic6ff3cecd5ef1d76ec095d7a409f38e602b41ce2
-    Reviewed-on: https://code.wireshark.org/review/18985
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit ff0371e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Nov 26 14:39:24 2016 +0100
-
-    ssl,dtls: add expert info for overly large record lengths
-    
-    All TLS and DTLS RFCs (and SSLv3) limit the record length to 2^14, so
-    add expert info if this is exceeded. Spotted in the wild via
-    https://ask.wireshark.org/questions/57641/tls12-record-length-gt-16k-valid
-    
-    Tested with a synthetic pcap having length 2^14+1 using Python:
-    
-        from scapy.all import IP, TCP, UDP, wrpcap
-        len_plus_frag = b'\x40\x01' + 0x4001 * b'\0'
-        wrpcap('bad-record-length.pcap', [
-        IP()/TCP(sport=2000, dport=443)/(b'\x17\x03\x03' + len_plus_frag),
-        IP()/UDP(sport=2000, dport=853)/(b'\x17\xfe\xfd' + 8*b'\0' + len_plus_frag)
-        ])
-    
-    Change-Id: I5eac48775333d8d222e013a24a6d06da79892b77
-    Reviewed-on: https://code.wireshark.org/review/18959
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 1c9e061
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Nov 30 12:24:18 2016 +0100
-
-    sip: register with Websocket dissector (RFC 7118)
-    
-    The subprotocol is also listed in the IANA registry at
-    https://www.iana.org/assignments/websocket/websocket.xhtml#subprotocol-name
-    
-    Tested with the pcap from the linked bug.
-    
-    Bug: 11420
-    Change-Id: I4ba8e6c55889f72f5aca37c4ae759e2cd20a22b7
-    Reviewed-on: https://code.wireshark.org/review/18989
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit b2fa26ff7a270dc6a0f70c06cdc3e186f0c9d29f)
+    Reviewed-on: https://code.wireshark.org/review/22189
 
-commit 4ace7ce
-Author: Роман Донченко <dpb@corrigendum.ru>
-Date:   Wed Nov 30 02:11:06 2016 +0300
-
-    Fix the build when a different version of Qt is in PATH
-    
-    When we add our Qt to PATH, prepend it so that it will be found first.
-    
-    Change-Id: I405496d6a08d676b5a2e0d9bd792de7ba9abe7f9
-    Reviewed-on: https://code.wireshark.org/review/18988
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 7fe45cc
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Nov 23 16:28:34 2016 +0100
-
-    Qt: fix GoToPacket when Voip Calls dialog is closed
-    
-    After opening the Call Flows dialog from the Voip Calls dialog, followed
-    by closing the Voip Calls dialog, the Go To Packet functionality in the
-    Call Flows dialog is broken. That happens because the signal is not
-    proxied anymore.
-    
-    Just remove all these indirections via signals and directly update the
-    selected packet.
-    
-    Change-Id: I9c6d519dbe800e4dfdf0407d832f17819b344e46
-    Reviewed-on: https://code.wireshark.org/review/18933
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f96ef34
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Nov 29 14:27:35 2016 +0100
-
-    3GPP NAS: shorten some value_string to avoid truncation during display
-    
-    Change-Id: I50f9bbec5405c17a59c5eaac9833929737b8c145
-    Reviewed-on: https://code.wireshark.org/review/18984
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0cb44e4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 28 19:16:55 2016 -0800
-
-    Handle FT_CHAR, and report unsupported types as such.
-    
-    FT_CHAR is straightforward to support.
-    
-    Split the list of "invalid" types into a list of "unsupported" types and
-    a short list of "invalid" types, containing FT_PCRE (which isn't a valid
-    type for a field) and "everything else".  Add FT_IEEE_11073_SFLOAT and
-    FT_IEEE_11073_FLOAT to the "unsupported" list.
-    
-    Flag the whole unsupported list as just "not handled yet".
-    
-    Change-Id: I62d2d7eead53377e4e601594a035b4395fdbeead
-    Reviewed-on: https://code.wireshark.org/review/18979
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a222812
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 28 16:34:46 2016 +0100
-
-    3GPP NAS: add an expert info when APN encoding exceeds 100 bytes
-    
-    As stated in 3GPP 23.003:
-    "the APN has, after encoding as defined in the paragraph below,
-    a maximum length of 100 octets"
-    
-    Change-Id: Iae23117f44ea5b668f6cb23dbd0e726e4e56ce41
-    Reviewed-on: https://code.wireshark.org/review/18972
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 591e633
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Nov 27 20:54:45 2016 +0100
-
-    Qt: Position UAT hint label just below the list.
-    
-    Place the UAT hint label at the same position as in other dialogs;
-    just below the main widget.  Also use smaller font and italic.
-    
-    Change-Id: I51251825ff08122e17ca60144ef53fed5c6142ef
-    Reviewed-on: https://code.wireshark.org/review/18969
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c4aba11
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Nov 27 20:08:26 2016 +0100
-
-    Qt: Update UAT OK button enabled on delete.
-    
-    Check if the OK button should be enabled when removing a row in a
-    UAT dialog.  Also update the error hint.
-    
-    Change-Id: Icb5c47c2b2e65ed266fd2c7e3a1535f6a3a50279
-    Reviewed-on: https://code.wireshark.org/review/18967
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7c3aa5a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sat Nov 26 18:31:19 2016 -0600
-
-    Qt: Fix conversation buttons.
-    
-    Move parts of currentTabChanged to conversationSelectionChanged. This
-    lets us enable the "Follow Stream" and "Graph" buttons when either the
-    current tab or the current selection changes.
-    
-    Bug: 12893
-    Change-Id: I025447d26073a938f2d8b5a8fcad7c0d5e855650
-    Reviewed-on: https://code.wireshark.org/review/18963
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 1239336
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Nov 28 16:50:25 2016 +0100
-
-    Qt: fix heap-use-after-free when double-clicking a packet number
-    
-    On double-clicking a packet number, the current field item is
-    invalidated by goToPacket. Skip the URL since a field can either have a
-    URL or a frame number (but not both).
-    
-    Change-Id: I58e5445fa74071fa0fd203df77ebdecdd1478d31
-    Reviewed-on: https://code.wireshark.org/review/18971
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 13adab2
-Author: Matthieu Coudron <mattator@gmail.com>
-Date:   Sat Nov 26 19:18:37 2016 +0100
-
-    Update message on outdated precommit hook
-    
-    Change-Id: I3afb93cced09df7844c0810438ee6d760f8237a5
-    Reviewed-on: https://code.wireshark.org/review/18960
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 99aacf8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 27 08:14:07 2016 -0800
-
-    [Automatic update for 2016-11-27]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I3dae07ff98d80f02d1aaf7408e81faf6614d7058
-    Reviewed-on: https://code.wireshark.org/review/18964
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f975020
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Nov 26 14:00:11 2016 +0100
-
-    DOCSIS: fix an infinite recursion introduced in g3e1828e
-    
-    Bug: 13179
-    Change-Id: I4c510dab463f7c223bcaabd3157ca791dd86d690
-    Reviewed-on: https://code.wireshark.org/review/18958
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Seth Alexander <pxsdaemon@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d0fa82b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Nov 25 11:42:26 2016 -0600
-
-    Qt: Clean up the byte view hover highlight.
-    
-    Rename the text highlight enum "HighlightMode" to make its use and
-    intent more clear. Add a mode for the offset highlight instead of using
-    a separate variable. Use our palette to draw the hover highlight colors.
-    Add a note about colors to the Developer's Guide.
-    
-    Change-Id: I488b2512a5058e17eb5b49c8ac55616100f32fbc
-    Reviewed-on: https://code.wireshark.org/review/18953
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit ff4b272
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 25 17:02:20 2016 -0500
-
-    GlusterFS: Insert missing FORGET command.
-    
-    Apparently, it was forgotten ;)
-    
-    Bug: 12614
-    Change-Id: Id1a2d98e3ea2b381c5fa60faeb342256d4c7d9f8
-    Reviewed-on: https://code.wireshark.org/review/18955
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 9022877
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 25 18:50:49 2016 -0800
-
-    We only need the tvbuff length for EAP messages.
-    
-    Change-Id: I22a5990e12a151c209288b9e879ae1f88c866904
-    Reviewed-on: https://code.wireshark.org/review/18956
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c551e06
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Fri Nov 25 11:26:40 2016 +0300
-
-    PROFINET: Update LineDelay Dissection
-    
-    When LineDelay is decoded, the FormatIndicator is not evaluted.
-    
-    Sample LineDelay: 2147483658 (0x80 00 00 0a)
-    This value should be 10,
-    since FormatIndicator (Bit 31) = 0x01 states that this is a CableDelay.
-    
-    Change-Id: I08ae8e6de8b6f8c493122109e29e91dc47096734
-    Reviewed-on: https://code.wireshark.org/review/18950
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ce90d98
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 20 22:46:10 2016 -0500
-
-    packet-dcm.c: Cleanup memory usage with strings
-    
-    wmem_file_scope() was used too many times when wmem_packet_scope() will do.
-    Also, use the wmem string functions to only allocate enough space to
-    handle a string instead of using MAX_BUF_LEN.
-    
-    Change-Id: I3031d3aef34b7105264b17dc83e3b1f4cfb4b3d4
-    Reviewed-on: https://code.wireshark.org/review/18910
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dd5697b
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Wed Nov 23 10:04:39 2016 +0100
-
-    diameter: add values for AVP 2037
-    
-    Change-Id: I7bddb48d1c6c88f9a6edfce2dd527603878c5ac4
-    Reviewed-on: https://code.wireshark.org/review/18931
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ebf4c91
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 21 17:22:40 2016 +0200
-
-    Add .gitlab-ci.yml.
-    
-    As for .travis.yml, this file triggers the CI module of GITLAB.
-    On the public instance of gitlab (gitlab.com) the runners are active
-    by default, then any mirror of wireshark on gitlab.com will result
-    in an automated build.
-    
-    The current version of .gitlab-ci.yml builds with gcc 4,5,6 and with
-    default config, without extcap and without pcap.
-    
-    Change-Id: I0800045e7f1b4a137dbd69a185d3b09a89398948
-    Reviewed-on: https://code.wireshark.org/review/18936
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit b87a2be
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 21 14:33:00 2016 +0100
-
-    ieee80211: Add Meru (Fortinet) Vendor Specific TLV
-    
-    Change-Id: Iaa554ac94d248c67c635ac180ea2d1c1e3775b6a
-    Reviewed-on: https://code.wireshark.org/review/18915
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2e8bbe4
-Author: Petr Sumbera <petr.sumbera@oracle.com>
-Date:   Tue Nov 22 06:09:24 2016 -0800
-
-    Fix git description for out-of-tree builds from a tarball
-    
-    version.conf is to be found in the source dir after unpacking.
-    
-    Bug: 13163
-    Change-Id: Ib8308e341b771d991ab48b48553f8d92b0b0621c
-    Reviewed-on: https://code.wireshark.org/review/18923
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cc09fbd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 24 19:32:54 2016 -0800
-
-    Mark another dictionary as commented out due to no RFC 6929 support.
-    
-    Change-Id: I0b119fdc786970842d39b92b504e361d80a5624c
-    Reviewed-on: https://code.wireshark.org/review/18948
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 26b3b78
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 24 17:44:34 2016 -0800
-
-    Get rid of "cast throws away constness" warnings.
-    
-    Change-Id: I62cf58798341a5301a787c321f65ecc2a3cec171
-    Reviewed-on: https://code.wireshark.org/review/18947
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 174db53
+commit b5711f1
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 24 17:41:04 2016 -0800
+Date:   Fri Jun 16 20:43:51 2017 -0700
 
-    Update comments.
+    Handle CMD over GRE.
     
-    Change-Id: I72a90fe4af08de3585d3df92a28ff3dbd693b260
-    Reviewed-on: https://code.wireshark.org/review/18946
+    Bug: 13804
+    Change-Id: I0d96122a0c7f39315316e4da32c29977e147d3d6
+    Reviewed-on: https://code.wireshark.org/review/22183
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit e2efa82811ee987dfe96929dd8383c45104dec0b)
+    Reviewed-on: https://code.wireshark.org/review/22184
 
-commit 513fa60
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 24 14:32:43 2016 -0800
-
-    Squelch warnings.
-    
-    There's some problem with our RADIUS dictionary reader that causes it to
-    produce
-    
-            radius: Vendor: 'integer', does not exist in .../dictionary.rfc7930
-    
-    warnings when reading entries such as
-    
-            ATTRIBUTE       Response-Length                         241.3   integer
-    
-    Change-Id: I90548281ce4e5ffce974b9fe074266adbfdf2a5c
-    Reviewed-on: https://code.wireshark.org/review/18945
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ab55444
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 21 12:06:43 2016 +0100
-
-    RADIUS: Add RFC7930 dictionnary
-    
-    From FreeRADIUS master
-    
-    commit 42e55cca4cee6524475f0461b00f0f96769ab40b
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Wed Oct 12 10:13:00 2016 -0400
-    
-        added RFC 7930
-    
-    Change-Id: Icb69117cad84fcaf9d9ffe8040962afb33709441
-    Reviewed-on: https://code.wireshark.org/review/18913
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 75bf463
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 21 12:13:04 2016 +0100
-
-    RADIUS: Add Microsemi dictionnary
-    
-    commit 503e1e78daaa51d9a47e85bd7c9f5fb096a25b87
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Fri Nov 11 06:56:23 2016 -0500
-    
-        from Microsemi
-    
-    Change-Id: Icc5e5f74f7d34aaebdb192c83908856189082cf0
-    Reviewed-on: https://code.wireshark.org/review/18914
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f39ce7d
-Author: Günther Deschner <gd@samba.org>
-Date:   Wed Sep 21 16:50:21 2016 +0200
+commit cd8f1f2
+Author: Vasil Velichckov <vvvelichkov@gmail.com>
+Date:   Sat Jun 17 04:16:02 2017 +0300
 
-    dissectors: add PRINTER_INFO_5 decoding for DCE/RPC spoolss dissector.
+    gsm_sms: decode UCS2 as UTF-16
     
-    Guenther
-    
-    Change-Id: I9eb8be636ebdf81092b7abd8d4749410cc5dcc06
-    Signed-off-by: Guenther Deschner <gd@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/18932
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8eb6b3e
-Author: Seth Alexander <seth.alexander@cosmicaes.com>
-Date:   Wed Nov 23 15:09:18 2016 -0700
-
-    Removed Manipulation of Visited Flag
+    Some phones (Android and iOS smartphones) encode emoji characters as
+    UTF-16 big endian and although the UTF-16 is not specified in the 3GPP
+    23.038 (GSM 03.38) it seems to be widely supported
     
-    Change-Id: Ic77afa3fd0b9cabb3f2681be099e11be79d271be
-    Reviewed-on: https://code.wireshark.org/review/18938
+    Bug: 13808
+    Change-Id: Ic4a600e42fb4b471223aaef1a661bd002835b519
+    Reviewed-on: https://code.wireshark.org/review/22181
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 85e2a54703da8adee8bf7aefc67f4851ee3b3f1d)
+    Reviewed-on: https://code.wireshark.org/review/22182
 
-commit 19b6062
+commit 6b610cc
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 23 18:25:53 2016 -0800
-
-    Note that we can't use a child setup routine in g_spawn routines.
-    
-    They don't work on Windows, and we support Windows, so....
-    
-    Change-Id: Icdbdfcfd930ae13aba6d8fb018d7e2af55b76fa1
-    Reviewed-on: https://code.wireshark.org/review/18943
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7dbe9b4
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Nov 23 16:31:57 2016 -0800
-
-    Return from snort_start early if dissector not enabled.
-    
-    Change-Id: Idf63210ce33d92ac8619fe3295bd3e6c0bb304a9
-    Reviewed-on: https://code.wireshark.org/review/18941
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 76c3970
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Nov 23 15:53:28 2016 -0800
-
-    Add missing header file for distcheck
-    
-    Change-Id: I230c8886585f30fae101ac40a1cd5018a2a62e8b
-    Reviewed-on: https://code.wireshark.org/review/18940
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Fri Jun 16 14:03:17 2017 -0700
 
-commit 28fb531
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Nov 16 12:33:09 2016 -0800
-
-    Initial commit of Snort post-dissector.
+    Have two separate routines for wlantap dissection - OCTO and pre-OCTO.
     
-    This dissector allows Snort to process all of the
-    packets passed to Wireshark, and for the alerts to
-    be shown in the protocol tree.  It is also possible
-    to set the source of alerts to be packet comments.
-    
-    Change-Id: I6e0a50d3418001cbac2d185639adda2553a40de8
-    Reviewed-on: https://code.wireshark.org/review/18848
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 24f7b93
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Nov 21 23:52:04 2016 +0100
-
-    debian-setup: check for both libgnutls-dev and libgnutls28-dev.
-    
-    Change-Id: Ibe63e1d9b7527295223fc817889a60db79869e27
-    Reviewed-on: https://code.wireshark.org/review/18935
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit a85d136
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Nov 21 22:51:26 2016 +0100
-
-    debian-setup: remove lsb_relese check.
+    The two code paths don't share any code, so they might as well be in
+    separate routines.
     
-    It is not used anymore and breaks docker builds.
+    That makes it even easier to read.
     
-    Change-Id: Ic4a2e6abf2da8059f28fcee19e611a8a83165895
-    Reviewed-on: https://code.wireshark.org/review/18934
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 6930ded
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Nov 22 11:19:37 2016 -0800
-
-    Include <io.h> and <fcntl.h> for _setmode().
-    
-    Change-Id: I1910275653ef4a985e9894f01cf5cb5fa33070d4
-    Reviewed-on: https://code.wireshark.org/review/18928
+    Change-Id: I8ee335f4cac2aedc42216db7f9674e1a609d9347
+    Reviewed-on: https://code.wireshark.org/review/22179
     Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f4d6c7a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Nov 22 10:01:29 2016 -0800
-
-    On Windows, put the standard output in binary mode if we're writing the capture file to it.
-    
-    While we're at it, explicitly compare the restult of strcmp() against 0,
-    to make it clearer that it's testing for the argument *not* being equal
-    to "-".
-    
-    Bug: 13165
-    Change-Id: Ic63085abb2de5f5c60d2101d19c1a269b7e0c9d7
-    Reviewed-on: https://code.wireshark.org/review/18924
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fb9a356
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 17 21:45:28 2016 -0500
-
-    Add prefs_get_uint_value and prefs_get_range_value
-    
-    This allows dissectors to not need to know about the internal preference structure.
-    
-    Change-Id: I1ae67248cd0b0132aefc225ea0a9befaf9afdde2
-    Reviewed-on: https://code.wireshark.org/review/18864
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ba67963
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Sat Nov 19 18:13:47 2016 +0100
-
-    Improve name resolution preference tooltips.
-    
-    Change the tooltips texts to make them better describe the preference.
-    
-    Bug: 13130
-    Bug: 13131
-    Change-Id: Ie753e3703a702bdafed91cf0f41b306347088526
-    Reviewed-on: https://code.wireshark.org/review/18878
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 03a2539
-Author: Dmitry Lazurkin <dmitry.lazurkin@synesis.ru>
-Date:   Sun Nov 20 16:39:31 2016 +0300
-
-    extract common logic of proto_item_set_len/proto_item_set_end
-    
-    Change-Id: I55f9303624471d09b446c10939e5c22bf8e21511
-    Reviewed-on: https://code.wireshark.org/review/18894
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0f36cf6
-Author: Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>
-Date:   Mon Nov 14 23:47:51 2016 +0100
-
-    ieee802154: support 6top protocol (6P) draft-03
-    
-    - support draft-ietf-6tisch-6top-protocol-03
-    - rename variables and constants to reflect the protocol hierarchy
-    - show 6P specific information in the "Protocol" and "Info" column
-    - cleanup
-    
-    Bug: 13136
-    Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f
-    Reviewed-on: https://code.wireshark.org/review/18824
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3e1828e
-Author: Seth Alexander <seth.alexander@cosmicaes.com>
-Date:   Tue Nov 1 09:42:46 2016 -0700
-
-    Added Path Value and CRC to DOCSIS Plugin
-    DOCSIS update with basic defragmentation
-    
-    Bug: 13106
-    Change-Id: Idbb42c80b87c0c3189da087b523733cf0b19967c
-    Reviewed-on: https://code.wireshark.org/review/18676
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fe38577
-Author: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
-Date:   Mon Nov 21 19:20:41 2016 +0100
-
-    lua: Allow FT_ETHER protofields to be inserted in TreeItems.
-    
-    Change-Id: If1daef88dce166ec92f00a8c6e71bcb220d25e0c
-    Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
-    Reviewed-on: https://code.wireshark.org/review/18917
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7691102
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 22 08:10:53 2016 +0100
-
-    PW-ATM: fix code will never be executed [-Wunreachable-code]
-    
-    Change-Id: If838db823dd1c7614fcfdfc2774952bf70da3c6e
-    Reviewed-on: https://code.wireshark.org/review/18919
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5c54097
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 21 10:09:50 2016 +0100
-
-    ieee80211: Add 20/40 BSS Coexistence IE Parameters (72)
-    
-    Bug: 13148
-    Change-Id: I60bb679b8b8221f5229146ca1120d00ce9e2ec66
-    Reviewed-on: https://code.wireshark.org/review/18911
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 7617286
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Nov 22 07:16:17 2016 +0100
-
-    RLC: always initialize LI length, even when it is malformed
-    
-    Bug: 13162
-    Change-Id: Ie0938611b4c90fd54e7ccda0ee5f3d791078be06
-    Reviewed-on: https://code.wireshark.org/review/18918
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 4a3a6b1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Nov 20 22:13:52 2016 +0100
-
-    bgp: remove dead code (CID 1158699).
-    
-    Change-Id: Ib7f766819bb81858fa0c3a0b49fe39de7123bf6d
-    Reviewed-on: https://code.wireshark.org/review/18908
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bb4ecec
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Nov 20 01:43:02 2016 -0800
-
-    Kafka: show API versions in root, and don't show bogus size for GZIP messages.
-    
-    Change-Id: Ib8182537a791ed24bcc417594713dd6c206ce0ce
-    Reviewed-on: https://code.wireshark.org/review/18885
-    Reviewed-by: Dmitry Lazurkin <dilaz03@gmail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 975461a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 20 17:38:14 2016 -0500
-
-    packet-dcm.c: Assorted cleanup
-    
-    1. Use tvb_get_guintXX with encoding parameter rather than have an "is_little_endian" flag
-    2. Replace proto_tree_add_xxx_format with proto_tree_add_xxx_format_value or proto_tree_add_item
-    3. Create some value_strings in favor of functions.
-    
-    Change-Id: If4b8e8992662bda768b39ba5f1932272760eef65
-    Reviewed-on: https://code.wireshark.org/review/18909
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 79c2bdc
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 21 10:41:08 2016 +0100
-
-    NAS EPS: fill info column when receiving a ciphered message
-    
-    Change-Id: I2aaad1e7682025f38d78198c7fef7c759629d762
-    Reviewed-on: https://code.wireshark.org/review/18912
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c3706a9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 20 12:39:39 2016 +0100
-
-    bthci_evt: Fix conflict for hf fields
-    
-    'bthci_evt.pending_response_delta' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_DOUBLE
-    
-    Change-Id: I7665ea0c007ef089c6986c102f2358d08d4628df
-    Reviewed-on: https://code.wireshark.org/review/18889
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 3bf6a18
-Author: Etienne Dechamps <etienne@edechamps.fr>
-Date:   Sun Nov 20 18:37:19 2016 +0000
-
-    Fix -1 lengths in proto_tree_add_item_ret_string_and_length().
-    
-    Currently, when passing a -1 length to proto_tree_add_item_ret_string_and_length() or
-    proto_tree_add_item_ret_string(), the -1 length will be passed directly
-    to the field info. The calculated length should be used instead.
-    
-    Bug: 13159
-    Change-Id: I980d18fb9bde3c452e64a8735e62d4830ce53b64
-    Reviewed-on: https://code.wireshark.org/review/18904
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 035e404
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Nov 20 20:34:09 2016 +0100
-
-    cmake: add creation of version.conf to be shipped in tarball.
-    
-    Change-Id: I2bb66844b29cd4805d201891ffba342d26ee475f
-    Reviewed-on: https://code.wireshark.org/review/18731
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 48c423a
-Author: Nick Lowe <nick.lowe@gmail.com>
-Date:   Sun Nov 20 15:20:48 2016 +0000
-
-    QBSS Load IE: Correct 'Available Admission Capabilities' to 'Available Admission Capacity'
-    
-    Change-Id: Ic4e6fe7978382854b4f36eebc8372eb3cd8e7551
-    Signed-off-by: Nick Lowe <nick.lowe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/18895
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1f51290
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 20 10:45:03 2016 -0800
-
-    Make something to which we assign a string pointer const.
-    
-    Change-Id: I4b292f252f0e4290fc8adc1e76aa589108fc597e
-    Reviewed-on: https://code.wireshark.org/review/18905
+    (cherry picked from commit 8b99bb7fbf80f2fd3bfe53bbbfa14caec6319cbd)
+    Reviewed-on: https://code.wireshark.org/review/22180
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a95667b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 20 17:36:02 2016 +0100
-
-    PDCP LTE: add NB-IoT channels
-    
-    Change-Id: I3dfb54bc4614ea033ba89ab1fc8be83ad5025473
-    Reviewed-on: https://code.wireshark.org/review/18900
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 22f6ab0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 20 17:21:06 2016 +0100
-
-    PDCP LTE: cache LTE RRC dissectors handles
-    
-    Change-Id: I35ac69aaf5ce6c3fe14c5af2182e4e53f2aded9b
-    Reviewed-on: https://code.wireshark.org/review/18899
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 390674f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 20 10:37:41 2016 +0100
-
-    uds: Fix conflict for hf fields
-    
-    'uds.tp.suppress_reply' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
-    
-    Change-Id: I8f6035c79c7b6481dd2915cfcfc99963fef7fc23
-    Reviewed-on: https://code.wireshark.org/review/18884
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 95325a2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 20 12:23:42 2016 +0100
-
-    hsms: Fix conflict for hf fields
-    
-    'hsms.data.item.value' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_BYTES
-    'hsms.data.item.value' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN
-    'hsms.data.item.value' exists multiple times with NOT compatible types: FT_INT64 and FT_STRING
-    'hsms.data.item.value' exists multiple times with NOT compatible types: FT_INT8 and FT_INT64
-    'hsms.data.item.value' exists multiple times with NOT compatible types: FT_DOUBLE and FT_INT32
-    'hsms.data.item.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_FLOAT
-    'hsms.data.item.value' exists multiple times with NOT compatible types: FT_UINT8 and FT_UINT64
-    
-    Change-Id: I83697e72ebfa4e164178141d789c4ca2d9d09db0
-    Reviewed-on: https://code.wireshark.org/review/18887
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Benjamin Parzella <bparzella@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 01d1abc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 20 10:18:56 2016 +0100
-
-    uftp4: fix last argument of proto_tree_add_item
-    
-    It can be not FALSE
-    
-    Change-Id: I938011296b40013a1dad813c3196e899b1b90347
-    Reviewed-on: https://code.wireshark.org/review/18883
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cbbaf1d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 20 10:13:18 2016 +0100
-
-    uftp4: Fix conflict for hf fields
-    
-    'uftp4.announce.publicmcast' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
-    'uftp4.announce.privatemcast' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
-    'uftp4.fileinfo.tstamp' exists multiple times with NOT compatible types: FT_ABSOLUTE_TIME and FT_UINT32
-    
-    Change-Id: I94b235e9ba8ebe8a036620f9537eb674f418f1e5
-    Reviewed-on: https://code.wireshark.org/review/18882
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 88f65ca
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 20 08:12:08 2016 -0800
-
-    [Automatic update for 2016-11-20]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I037cbaa9226ddf6630ae95865da7f67920592295
-    Reviewed-on: https://code.wireshark.org/review/18896
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 08e5d9a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 20 12:20:12 2016 +0100
-
-    radiotap: Fix conflict for hf fields
-    
-    'radiotap.present.flags' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT32
-    
-    Change-Id: Ib53eb43c2103b24bd02bd41fd20030b7e7ae321b
-    Reviewed-on: https://code.wireshark.org/review/18886
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ded081c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 20 10:06:18 2016 +0100
-
-    VXLAN: Fix conflict for hf fields
-    
-    'vxlan.flags_reserved' exists multiple times with NOT compatible types: FT_UINT8 and FT_BOOLEAN
-    
-    Change-Id: I98d296393796defc5741c41a496432eb8f927be2
-    Reviewed-on: https://code.wireshark.org/review/18881
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c63609b
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Tue Nov 15 00:14:51 2016 +0100
-
-    DICOM: Fix handling of AT tag elements
-    
-    A Attribute Identifier List can have more than one AT element. Therefore
-    we have to loop through the elements list.
-    
-    Bug: 13077
-    Change-Id: I3adaa5ba50a1ad01e7c5bacd05118c65afcf4442
-    Reviewed-on: https://code.wireshark.org/review/18825
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7ecbad8
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Nov 20 03:37:03 2016 -0800
-
-    kafka: fix mac build breakage by adding int cast
-    
-    Change-Id: Ic57d49f7408f041b60b719a3da4971c499122930
-    Reviewed-on: https://code.wireshark.org/review/18888
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 548bf92
+commit bcceb20
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 19 21:59:28 2016 -0800
-
-    proto_item_set_end() should set the FT_BYTES value length as well.
-    
-    Change-Id: I33459aabf059e1dc746e7e5f9d5ca28095e056f4
-    Reviewed-on: https://code.wireshark.org/review/18880
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6bd3222
-Author: Alex Badea <abadea@ixiacom.com>
-Date:   Thu Nov 17 16:46:16 2016 +0200
-
-    tcp: fix "calculated checksum" tree item for bad checksums
-    
-    The Calculated Checksum tree item prints the checksum from the
-    tvb, instead of the computed one  (the "should be 0x...." tree
-    item above it _does_ print the computed one).  As such, in a packet
-    with bad checksum, the Calculated Checksum is incorrect.  Fix the value.
-    
-    This seems to have been introduced in ad6fc87d ("Add
-    proto_tree_add_checksum.")
-    
-    Change-Id: Ia20d5addc40956713a944102e79d25317b969a0e
-    Reviewed-on: https://code.wireshark.org/review/18859
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit abf802b
-Author: John A. Thacker <johnthacker@gmail.com>
-Date:   Fri Nov 18 18:35:28 2016 -0500
-
-    Reassemble: fix premature free
-    
-    Fix a memory error found by the buildbot and valgrind in my recent patch
-    
-    Bug: 13100
-    Change-Id: Ieb21aa25e048f90ce7192546b0ad3d4718ff07df
-    Reviewed-on: https://code.wireshark.org/review/18877
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4eb61de
-Author: Dmitry Lazurkin <dilaz03@gmail.com>
-Date:   Fri Nov 18 00:19:18 2016 +0300
-
-    kafka: Update supported api keys to latest spec
-    
-    Details:
-    - update supported api keys
-    - add api key ApiVersions
-    - change api key names according to documentation
-    - add pcapng files for supported api keys
-    - add new documentation link
-    - add declaration of lz4 message codec
-    
-    Change-Id: I943dc31144890dcd3dd333981a86754668c2bec4
-    Reviewed-on: https://code.wireshark.org/review/18861
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 231ad4f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Nov 10 10:35:56 2016 +0100
-
-    cpack: improve source tarball generation by adding the "dist" target.
-    
-    The source package must not contain compiled objects. If the build dir
-    is under the source tree, it is included too. By excluding /build/ we
-    avoid to add every build dir, but if the build dir doesn't contain
-    build the problem still persist.
-    
-    Change-Id: I75021565c058c1a93945f43b9b49cb3d04c960d4
-    Reviewed-on: https://code.wireshark.org/review/18729
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 6926cf0
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Fri Nov 18 10:42:26 2016 +0100
-
-    LBM_UIMflow: Fix range_ratio calculation (CID-1355421)
-    
-    Port the same calculation from sequence_dialog.cpp.
-    Resolves the Coverity issue and aligns the output just a bit better.
-    
-    Change-Id: Iaa464149630e0fafb5bdff20019440c3fb67bbbd
-    Reviewed-on: https://code.wireshark.org/review/18868
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jun 16 13:31:10 2017 -0700
 
-commit c274046
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 8 15:20:30 2016 +0100
-
-    cmake: install icons and .desktop files
+    Further cleanup.
     
-    Based on the install-data-local target from Makefile.am.
+    Move some commented-out code where it belonged, and #if 0 it out
+    instead.
     
-    Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c
-    Reviewed-on: https://code.wireshark.org/review/18708
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-    Tested-by: Balint Reczey <balint@balintreczey.hu>
-
-commit a123990
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 18 10:51:12 2016 -0800
-
-    Create /etc/paths.d and /etc/manpaths.d if they don't exist.
+    Have only *one* test for OCTO.
     
-    Bug: 13152
-    Change-Id: I6ecfd1e3f7f10a3a63b44b0d8bf137f0b3450391
-    Reviewed-on: https://code.wireshark.org/review/18871
+    Change-Id: I6e8803f936ebd88f1705b2185f034ec0b2bddb77
+    Reviewed-on: https://code.wireshark.org/review/22177
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 8ab033a2838ee94879910fd3ab9860122a72f151)
+    Reviewed-on: https://code.wireshark.org/review/22178
 
-commit 58c4a4e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 15 21:13:45 2016 +0100
-
-    cmake/FindPCAP: fix use of bad cached function checks
-    
-    When libpcap-dev is not installed, do not look for functions like
-    pcap_datalink_name_to_val since the negative result would be cached.
-    Then after installing libpcap-dev, the build would fail due to
-    redeclaration of functions.
-    
-    Change-Id: Ifdbad09e9cf160383b16b6459693f7ea5d65b9c3
-    Reviewed-on: https://code.wireshark.org/review/18834
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit bba62e2
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 18 13:47:06 2016 +0100
-
-    [GSM A RR] Fix dissection of c1_delta.
-    
-    Change-Id: I500b3e0abd4368511842ff795b91d1ebbbf46bbc
-    Reviewed-on: https://code.wireshark.org/review/18869
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6a91e8a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Nov 17 11:33:02 2016 +0100
-
-    androiddump: check return value in useSndTimeout() (CID 1394378).
-    
-    Change-Id: I14109ffe1b9930c464ce2c42767f96b8ba4e5b67
-    Reviewed-on: https://code.wireshark.org/review/18855
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit a90d196
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Nov 18 09:39:24 2016 +0100
-
-    GTP: fix dissection of GGSN Back-Off Time IE
-    
-    Bug: 13153
-    Change-Id: I2f404515187f9f29a45f101c8ff294a971ffddac
-    Reviewed-on: https://code.wireshark.org/review/18865
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a3d3ebf
-Author: Joakim Karlsson <oakimk@gmail.com>
-Date:   Thu Nov 17 20:10:07 2016 +0100
-
-    gtpv2: correct order in bearer qos
-    
-    Change-Id: I4acc4d0546f90fcb574a77b5f8abe1b9f9e5bdc5
-    Reviewed-on: https://code.wireshark.org/review/18860
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 08e15a8
+commit fadd484
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 17 18:35:11 2016 -0800
+Date:   Fri Jun 16 12:53:44 2017 -0700
 
-    Don't assume we have a protocol tree.
-    
-    In the association_sanity_check_t structure:
-    
-    Have separate flags to indicate whether we *have* an IE specifying an
-    FT AKM suite and whether we *have* an IE specifying a non-FT AKM suite.
-    Use those to decide whether to add an expert info, so we add it
-    regardless of whether we are building a protocol tree or not.
+    Clean up the 802.11 payload handling a bit.
     
-    Set the protocol tree item for the first FT AKM suite and the first
-    non-FT AKM suite only if we have a protocol tree.
-    
-    Bug: 13149
-    Change-Id: I16a3194017b34d8d2c9128364c2761d1c202969d
-    Reviewed-on: https://code.wireshark.org/review/18863
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 50515b9
-Author: Will Glynn <will@willglynn.com>
-Date:   Thu Nov 17 15:48:18 2016 -0600
-
-    ieee80211: warn about FT AKM suite mismatches
+    Two separate checks for OCTO, one right after the other, is a bit
+    confusing.
     
-    Bug: 13149
-    Change-Id: I8bceeeadf30c9594aa4be8cc195e694594de1d97
-    Reviewed-on: https://code.wireshark.org/review/18862
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I702aa1809dc7271b69b5419dc850228fac516ed6
+    Reviewed-on: https://code.wireshark.org/review/22175
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit d217b757cb1c627e53d9cffe47fa5f47c38045de)
+    Reviewed-on: https://code.wireshark.org/review/22176
 
-commit de5580a
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Wed Nov 16 23:32:34 2016 +0100
-
-    BGP: Fix length in decode_prefix4()
-    
-    When decode_prefix4() gets called with more prefixes the length of
-    proto_tree_add_subtree_format() should not be the total length.
-    
-    As the "Withdrawn route" part was the only one where decode_prefix4() has
-    been called with a tlen not equal 0 we can eliminate the tlen parameter.
-    
-    Bug: 13146
-    Change-Id: I708dec2cecbed6054b60190104b82c72d54e8037
-    Reviewed-on: https://code.wireshark.org/review/18852
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 9c514d8
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Thu Nov 17 00:49:10 2016 +0100
-
-    TCP: Add MD5 signature option dissection
-    
-    Bug: 13147
-    Change-Id: Icfd1343458c0795c4e3a74e4ed4f06d18f1c1831
-    Reviewed-on: https://code.wireshark.org/review/18854
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 3dee62e
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Nov 15 17:10:11 2016 +0100
-
-    debian-setup: remove libssh-dev from basic list.
-    
-    Change-Id: I34c0c24bc9240e27cbdf71f6ef1ae0adbb27cd7f
-    Reviewed-on: https://code.wireshark.org/review/18830
-    Tested-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0b4b521
-Author: Deep Datta <deepdatta2010@yahoo.co.in>
-Date:   Mon Nov 14 15:43:05 2016 -0600
-
-    Adding new Ixia netflow fields for Source and Dest AS Names and Transaction Latency
-    
-    Change-Id: I48c0cb58cd5643ad1c930b668b81cc3cc7270afa
-    Reviewed-on: https://code.wireshark.org/review/18837
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bf7db02
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Tue Nov 15 23:36:26 2016 +0100
-
-    Resolv: various code / comment cleanups
-    
-    Various cleanups and corrections regarding MAC address handling.
-    
-    Change-Id: I31e2e377bc1c73705a89517c776d51bbb19b9ce3
-    Reviewed-on: https://code.wireshark.org/review/18836
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2902edb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 9 19:58:34 2016 +0100
-
-    gsm_abis_pgsl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I2ad9621c632060fba1010ab5fed0b62557580dff
-    Reviewed-on: https://code.wireshark.org/review/18726
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 737dabb
-Author: novakji <j.novak@netsystem.cz>
-Date:   Sun Nov 13 20:20:17 2016 +0100
-
-    SDP: Payload type name for dynamic payload is wrong for reverse RTP channels
-    
-    Bug: 13132
-    Change-ID: I61a2575f9d8da958ae2fb01c71f3c71c9643ddea
-    Reviewed-on: https://code.wireshark.org/review/18804
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Michael Mann <mmann78@netscape.net>
-
-commit 1de9f3c
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 15 15:56:57 2016 -0800
-
-    Double the fuzz testing memory limit.
-    
-    Increase MAX_VMEM to 1000000 in order to accomodate a large capture file
-    in the menagerie and allow some breathing room for future large
-    captures.
-    
-    Change-Id: I61d1a56d30d49af5c25785f8d43f104b6a300da5
-    Ping-Bug: 13049
-    Reviewed-on: https://code.wireshark.org/review/18838
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit ba2c79f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Nov 15 22:27:48 2016 +0100
-
-    PER: add support for fragmented octet string
-    
-    Change-Id: Ia649825c250fee89b6f9513df22c38cdb4669cf4
-    Reviewed-on: https://code.wireshark.org/review/18835
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 1431b97
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 15 10:30:31 2016 -0800
-
-    Add more information about UTF 8 in our source code.
-    
-    Change-Id: I81d41fdc1aa66dd904160508c4a2e634337b5ba0
-    Reviewed-on: https://code.wireshark.org/review/18833
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d84e46f
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Fri Nov 4 15:50:25 2016 -0400
-
-    CIP: Properly handle EPATH attributes that do not specify path size
-    
-    Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment.
-    
-    This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity'
-    There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file.
-    
-    I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling.
-    
-    Ping-Bug: 12049
-    Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466
-    Reviewed-on: https://code.wireshark.org/review/18675
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0623789
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Nov 15 14:14:51 2016 +0100
-
-    [SIP export-pdu] Don't export SIP messages from the body of another SIP message
-    
-    Change-Id: I48336eb721ce730e3d09d4343a8d1170cb985214
-    Reviewed-on: https://code.wireshark.org/review/18829
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a01d982
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Nov 12 14:05:30 2016 +0100
-
-    OSPF: Enhance dissector of RI TLV
-    
-    Update the list
-    Add dissection of SR Algorithm
-    use value string for TLV list
-    
-    Change-Id: If3573320a182235b720620af949e540b3706f538
-    Ping-Bug: 13118
-    Reviewed-on: https://code.wireshark.org/review/18813
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 456a3f1
-Author: Andre Puschmann <andre@softwareradiosystems.com>
-Date:   Tue Nov 15 10:23:38 2016 +0100
-
-    MAC LTE: call LTE RRC dissectors for NB-IoT when respective flag is set
-    
-    Change-Id: I678ea851d1afa3fd68fc75272dbc11814437d697
-    Reviewed-on: https://code.wireshark.org/review/18828
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d0cf1de
-Author: dario <lomato@gmail.com>
-Date:   Tue Nov 15 09:56:22 2016 +0100
-
-    per: add initializer.
-    
-    Travis CI found the following errors:
-    wireshark/epan/dissectors/packet-per.c: In function ‘dissect_per_open_type_internal’:
-    wireshark/epan/dissectors/packet-per.c:193:24: error: ‘pdu_tvb’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-        tvb_composite_append(pdu_tvb, tvb_new_octet_aligned(tvb, offset, 8*type_length));
-                            ^
-    wireshark/epan/dissectors/packet-per.c: In function ‘dissect_per_bit_string’:
-    wireshark/epan/dissectors/packet-per.c:2269:24: error: ‘fragmented_tvb’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-        tvb_composite_append(fragmented_tvb, tvb_new_octet_aligned(tvb, offset, length));
-    
-    Change-Id: Idfd8bfc20439485f53e906a46e0717fc6199071c
-    Reviewed-on: https://code.wireshark.org/review/18827
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit f3670b9
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Nov 14 17:38:24 2016 +0100
-
-    [SIP] Parse Via parameters for Overload Control RFC 7339
-    
-    Change-Id: Iec22e947b3e52b406c380066a8e5e178f804d04a
-    Reviewed-on: https://code.wireshark.org/review/18819
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dc26452
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 14 21:55:25 2016 +0100
-
-    tshark: fix activation of heuristic dissectors by command line
-    
-    Change-Id: I9499be0d0efd24ce1049513171c657795fa69250
-    Reviewed-on: https://code.wireshark.org/review/18823
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 67385b1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Nov 6 00:43:14 2016 +0100
-
-    travis: improve test matrix.
-    
-    Details:
-    - remove the original broken environments and create multi-variable ones
-    - remove old comments
-    - exclude some OSX builds
-    
-    Change-Id: Iec98d13350444678823fa52bb3b9faefe02859d6
-    Reviewed-on: https://code.wireshark.org/review/18689
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 70c3260
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 14 08:09:06 2016 +0100
-
-    profinet (dcerpc pn io): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I5b7d97b6238c26dd8fa748aaa59a84eb4a03274c
-    Reviewed-on: https://code.wireshark.org/review/18814
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 17db0dc
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Mon Nov 14 08:54:39 2016 +0100
-
-    diameter_3gpp: add decoding of Sd feature list
-    
-    Change-Id: I431cb2cb39328a7aa537eaa00b1cb1ab07723d3e
-    Reviewed-on: https://code.wireshark.org/review/18815
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 271ee47
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 13 22:52:06 2016 +0100
-
-    SABP: add support for messages >= 16KB
-    
-    Because of the way PER specification encodes length determinant >= 16K,
-    we cannot get the PDU length from a fixed position at the beginning of
-    the message. So drop tcp_dissect_pdus() (that cannot work for this use
-    case) and manually request extra chunks until the full PDU is available.
-    
-    Bug: 8221
-    Change-Id: I91e32160fc2180f74b3edb9699ba510798b46983
-    Reviewed-on: https://code.wireshark.org/review/18808
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c88b8ad
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 13 22:41:11 2016 +0100
-
-    PER: add support for fragmented open type
-    
-    Change-Id: Ie4282cc859518977686da13f017ad79dfffa359b
-    Reviewed-on: https://code.wireshark.org/review/18807
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fde5e29
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sun Nov 13 20:16:49 2016 +0100
-
-    DICOM: Reassemble only when "More Fragments" is set.
-    
-    When a TCP frame contains more DICOM segments, make sure that
-    only segments with "More fragments" bit set gets reassembled.
-    
-    Bug: 13110
-    Change-Id: Ie19c71285a00240a035ff92ce3183de4d9048cbd
-    Reviewed-on: https://code.wireshark.org/review/18805
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit a7d9c74
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 13 17:24:06 2016 +0100
-
-    OSPF: fix indent (use 4 spaces)
-    
-    Change-Id: I3ba3fa626398718fefcc3430fffeaed2f4ea47b9
-    Reviewed-on: https://code.wireshark.org/review/18799
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 63776db
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 11 21:58:45 2016 -0500
-
-    packet-dtn.c break loop if evaluate_sdnv doesn't succeed.
-    
-    Bug: 13097
-    Change-Id: If6128f5a3c940b4713c396e1a4a8f002a6bd03b8
-    Reviewed-on: https://code.wireshark.org/review/18764
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4fd9872
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 13 22:05:01 2016 +0100
-
-    tvbuff_composite.c: fix composite_get_ptr when length is over 2 segments
-    
-    When storing a copy of the composite tvb in tvb->real_data, ensure to copy the full
-    data and not only the length currently requested by the call to tvb_get_ptr()
-    
-    Change-Id: I6b42f3d46c4fba83fadf4d06f465c8d2486f4853
-    Reviewed-on: https://code.wireshark.org/review/18806
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a962621
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 13 19:11:57 2016 +0100
-
-    PER: fixes for fragmented bitstring
-    
-    Follow-up of g54c3df8:
-    - fix byte highlighting
-    - return correct offset
-    - return correct length
-    
-    Change-Id: Ib689ea72706c2e1d697c0e8f619b1b846c088001
-    Reviewed-on: https://code.wireshark.org/review/18803
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7f2a838
-Author: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
-Date:   Tue Nov 8 17:13:41 2016 +0100
-
-    lua: Allow proto:register_heuristic to be used on multiple list names
-    
-    In the C API, one can register a heuristic for the same protocol on different
-    lists by specifying another unique short_name. This is impossible in the
-    lua API, as the protocol name is used as the short name itself.
-    
-    This change fixes that by creating an unique shortname composed of the
-    protocol name and the target list name.
-    
-    Change-Id: I2c30ce6e4f7a3b38879180c64cf8564f779163b4
-    Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
-    Reviewed-on: https://code.wireshark.org/review/18711
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 67e1ed5
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 13 09:32:35 2016 -0800
-
-    [Automatic update for 2016-11-13]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I83298430701c25aaba15cc5db02603bacd6d196a
-    Reviewed-on: https://code.wireshark.org/review/18798
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 4994d3d
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Wed Nov 9 11:22:10 2016 +0300
-
-    PROFINET: Add Asset Management Record Dissection
-    
-    Identification and Maintenance (I&M) and AssetManagement (AM) functions
-    are to collect information about the assets of an automation plant
-    to cover the use cases such as
-    identification, configuration, commissioning, diagnosis etc..
-    
-    PROFINET plugin should support the Asset Management Record (AMR).
-    
-    Bug: 13112
-    Change-Id: I9c557b5f7f4f633fdd475c2c9e8900a8e6c2ba47
-    Reviewed-on: https://code.wireshark.org/review/18719
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 5b348a4
-Author: novakji <j.novak@netsystem.cz>
-Date:   Sat Nov 12 21:16:53 2016 +0100
-
-    Allocate transport_info->encoding_name from correct memory pool
-    
-    Bug: 13127
-    
-    Change-Id: I09893fadc6f64316a373ddb8ac72e07a6743e149
-    Reviewed-on: https://code.wireshark.org/review/18758
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Michael Mann <mmann78@netscape.net>
-
-commit efe95fa
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Nov 10 16:51:41 2016 +0100
-
-    Qt: populate Bookmarks menu in capture options dialog
-    
-    The bookmarks menu is populated for the main window when the
-    appInitialized signal is emitted, this ensures that any preferences are
-    applied.
-    
-    For the Capture Options dialog however, the appInitialized signal is
-    never triggered since the GUI has already started. Just invoke it from
-    the constructor such the menu is populated at least once.
-    
-    Bug: 12986
-    Change-Id: I04457fd25e52a25714ac471131b90e3a128515d8
-    Reviewed-on: https://code.wireshark.org/review/18734
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7ba0c0c
-Author: Bruno Verstuyft <bruno.verstuyft@excentis.com>
-Date:   Fri Nov 4 16:30:55 2016 +0100
-
-    DOCSIS: Added dissector for type51 UCD
-    
-    Change-Id: Ifb46b2bd0a6eeae3e641ebcb3ecc89fc4f74b3f9
-    Reviewed-on: https://code.wireshark.org/review/18673
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 42bd5f9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Nov 12 16:29:30 2016 +0100
-
-    QUIC: Update error code
-    
-    Change-Id: I797da3c55ecb1a8a61166d8fbf503c4bdeffc213
-    Reviewed-on: https://code.wireshark.org/review/18755
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 40b9860
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Nov 12 15:46:43 2016 +0100
-
-    fix no previous prototype for ‘capture_*’ [-Wmissing-prototypes]
-    
-    Change-Id: Ie5bfe4d366a679ebcb561716f23d174e7b9bf487
-    Reviewed-on: https://code.wireshark.org/review/18754
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 76f74ac
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Nov 11 19:15:09 2016 +0100
-
-    iso14443: dissect the TA(1) byte in the ATS
-    
-    Change-Id: I17785d32ca1f5ef69731c5dfba04892aa09648a0
-    Reviewed-on: https://code.wireshark.org/review/18756
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit f773e6c
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Sat Nov 12 13:19:34 2016 +0100
-
-    Really return manufacturer name if it's known.
-    
-    Bug: 13126
-    Change-Id: I56e935cea7aa323941ac612d4954875a01910684
-    Reviewed-on: https://code.wireshark.org/review/18752
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b085a23
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Nov 12 13:31:10 2016 +0100
-
-    gsm_abis_om2000: Expand bit-width of CON CCP and CI fields
-    
-    It seems more recent RBS2000 models have extended the range of the CON
-    Connection Point (CCP) by one bit, as I'm seeing CCP 1896 in protocol
-    traces.  Similarly, the Contiguity Index can at least reach 96.  Using
-    the full 8bit value to make sure IS and CON dissectors use the same
-    ranges for connection points and contiguity index.
-    
-    Change-Id: Iece34106fc97a11dc8a01cf2578b5e4245a4c9e8
-    Reviewed-on: https://code.wireshark.org/review/18753
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 54c3df8
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Nov 11 22:20:07 2016 +0100
-
-    PER: add support for bit strings >= 16K
-    
-    Bug: 13123
-    Change-Id: Ie20ef75393ea601d2702a024e0ade94b85adf9f2
-    Reviewed-on: https://code.wireshark.org/review/18748
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 134f5ad
+commit f6ad625
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 11 14:37:06 2016 -0800
-
-    Dissect the checksum field as a string, as that's what it is.
-    
-    Bug: 13125
-    Change-Id: Ib5d02e8841eb7e4d04e6a1df44a5eba5b925ce6c
-    Reviewed-on: https://code.wireshark.org/review/18749
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0decc3f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 11 14:44:02 2016 +0100
-
-    [SIP]Parse out the individual feature cap(s).
-    
-    Change-Id: Ie834da60a2d389d33e1a5b6cc897e13ae1522fb9
-    Reviewed-on: https://code.wireshark.org/review/18742
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b8f99e3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Nov 11 16:49:35 2016 +0100
-
-    ssl: fix next_protocol_negotiation id
-    
-    NPN is a legacy extension (superseded by ALPN), but there was still a
-    capture with this value. However, the decimal number is wrong. Adjust it
-    to the one in the draft -03 (the hex number is still correct).
-    
-    Change-Id: I80ce468bcb653bc8ec87432d76d478cb0423b46f
-    Reviewed-on: https://code.wireshark.org/review/18744
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e407dd4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Nov 11 10:30:57 2016 +0100
-
-    OSPF: Add LSA Type Flag (See RFC 5340 A.4.2.1)
-    
-    * Display in dec the LSA Type (like IANA)
-    
-    Bug: 13118
-    Change-Id: I78001b2066f186dcf2175153e539216437b1754e
-    Reviewed-on: https://code.wireshark.org/review/18740
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 94344cd
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Nov 11 08:48:33 2016 -0800
-
-    Qt: Fix a "No such slot" warning.
-    
-    Make sure on_actionCaptureOptions_triggered always exists so that we
-    don't get a "No such slot" warning when building without libpcap.
-    
-    Change-Id: Ib7c82df6c72bf080ff080e0a650216b345a97e9c
-    Reviewed-on: https://code.wireshark.org/review/18747
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 55fbb63
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Nov 11 17:46:10 2016 +0100
-
-    Qt: fix build without libpcap
-    
-    Change-Id: I89a2f9a21a17a318529c7f0785ab60385fe08dcf
-    Fixes: v2.3.0rc0-1445-g414c132 ("Qt: Handle retranslation events in the main window")
-    Reviewed-on: https://code.wireshark.org/review/18746
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 65ab2a9
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 1 14:35:29 2016 -0700
-
-    AsciiDoc: Create an include file for attributes.
-    
-    Move the replacement definitions in asciidoc.conf to
-    attributes.asciidoc. This makes the markup a bit cleaner and is more
-    compatible with AsciiDoctor. Use a standard naming scheme for URLs.
-    
-    Change-Id: Ica73aaadb013be2a4e6a3963fb54e6db6e02e98f
-    Reviewed-on: https://code.wireshark.org/review/18655
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit aba4d3a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Nov 11 14:48:21 2016 +0100
-
-    ftype-guid.c: fix FT_GUID filtering
-    
-    g_strlcpy copies at most n-1 bytes to ensure that the string is NULL terminated.
-    
-    Bug: 13121
-    Change-Id: I4f1677c518e65eb58b79d72052520ecce8c51722
-    Reviewed-on: https://code.wireshark.org/review/18743
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e723a89
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 11 14:33:08 2016 +0100
-
-    [tvbuff] Fix tvb_find_guint16() searched_bytes is from
-    start_offset(offset) and the while loop should be on searched_bytes.
-    
-    Change-Id: I62343f7cb04f9110f773ba1ada8dbcbfbd262861
-    Reviewed-on: https://code.wireshark.org/review/18741
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 20adb7a
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Fri Nov 11 10:25:28 2016 +0100
-
-    diameter_3gpp: decode AVP 1518
-    
-    Change-Id: I95618ebeeb2a5ebe0dfc97bdfdd6c0bb91cb4381
-    Reviewed-on: https://code.wireshark.org/review/18739
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7925698
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 10 23:38:39 2016 -0500
-
-    packet-asterix.c doesn't need a preference callback function.
-    
-    Just causes preference to be added twice.
-    
-    Bug: 13113
-    Change-Id: Iebbe296a8b35cbe58c163c4f1f5fac9d27c76ead
-    Reviewed-on: https://code.wireshark.org/review/18737
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1d56b0a
-Author: Jakub Pawlowski <jpawlowski@google.com>
-Date:   Thu Nov 10 11:31:59 2016 -0800
-
-    Bluetooth: BTLE: Add SC bit paring in AuthReq
-    
-    Change-Id: I91db50aadd572a81559bb8d22af19fffefea592f
-    Reviewed-on: https://code.wireshark.org/review/18735
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 73145b4
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Nov 10 14:14:49 2016 +0100
-
-    [XML] default_media_types should be in lower case.
-    
-    Change-Id: Ibd55b76a0ccbfcf511afb4e99144a0d1115e5af2
-    Reviewed-on: https://code.wireshark.org/review/18732
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 66fa314
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Oct 18 20:34:37 2016 -0400
-
-    tcp: Fix Follow TCP tap data and when its tapped.
-    
-    Use the model from the 2.0 branch and earlier that only "tapped" the
-    follow data in a single location. This fixes duplicate data for
-    reassembled data and handles out-of-order packets.
-    
-    Bug: 12855
-    Change-Id: I5268f13e3c08e9271acf026b859de693ad794c94
-    Reviewed-on: https://code.wireshark.org/review/18368
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit b489b7f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Nov 10 16:04:25 2016 +0100
-
-    lsd: fix unaligned read
-    
-    Fixes UBsan complaint:
-    
-        epan/dissectors/packet-lsd.c:141:7: runtime error: load of misaligned address 0x61d00017029e for type 'const guint32', which requires 4 byte alignment
-    
-    Change-Id: I74034f3e0bc198b4b86ca6cd7559d8df7283377f
-    Reviewed-on: https://code.wireshark.org/review/18733
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ce98b6c
-Author: Moshe Kaplan <me@moshekaplan.com>
-Date:   Thu Nov 3 09:33:48 2016 -0700
-
-    Enable exporting IMF traffic as an EML file
-    
-    Change-Id: Ia56b38a770a148dd8bf030699615189601944cc2
-    Reviewed-on: https://code.wireshark.org/review/18656
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit faa5ba2
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Thu Nov 10 12:48:05 2016 +0300
-
-    PROFINET: Update MRP dissection according to IEC62439-2 Ed.2.
-    
-    The MRP PDU dissection is updated with respect to MRP standard IEC62439-2 Ed.2.
-    0x88e3 is added for MRP Ether Type
-    String definions of MRP block and sub block types are updated.
-    dissect_pn_ManuData function is removed since it is not used anymore.
-    
-    Change-Id: Iec6666abc75bcba4189f2c38851407abc23267f9
-    Reviewed-on: https://code.wireshark.org/review/18730
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 414c132
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 8 16:48:58 2015 -0700
+Date:   Fri Jun 16 11:40:22 2017 -0700
 
-    Qt: Handle retranslation events in the main window.
-    
-    Update most (but not all) of the main status bar text when the user
-    changes the language setting.
+    Fix SURROGATE_VALUE() to match what RFC 2781 says.
     
-    Try to distinguish between recent preferences and recent captures more
-    clearly.
-    
-    Change-Id: I5278a503178fe3620a25b185742688f957dc30f4
-    Ping-Bug: 11307
-    Reviewed-on: https://code.wireshark.org/review/9575
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d1a2c4c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Nov 8 16:31:01 2016 +0100
-
-    bt-dht: add data to COL_INFO.
-    
-    Change-Id: I69e8b012156020f79cf22604bc709fc70f215155
-    Reviewed-on: https://code.wireshark.org/review/18710
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 720927a
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Nov 10 09:10:44 2016 +0100
-
-    androiddump: Set socket connect() timeout to 500ms
-    
-    This should avoid neverending or long time to obtain timeout
-    in some cases like firewall's drop rules, etc.
-    
-    Bump version to 1.0.4
-    
-    Bug: 13104
-    Ping-Bug: 13114
-    
-    Change-Id: I9bef714b6d92b3516a2a95ebdbe1ba594fa60e34
-    Reviewed-on: https://code.wireshark.org/review/18728
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 51bdba4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 7 19:34:04 2016 +0100
-
-    GVSP: Disable the heuristic by default
+    While we're at it, note in the comment for get_utf_16_string() the
+    "decoding UTF-16" algorithm in RFC 2781.
     
-    Already try to enhance but get always some false positive with STUN/RTP
-    
-    Change-Id: I187959ed526a0d538a2c6db76af07ae3dbf06c6e
-    Reviewed-on: https://code.wireshark.org/review/18702
-    Reviewed-by: thies.moeller <thies.moeller@baslerweb.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1be79dd
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Nov 9 01:55:30 2016 +0100
-
-    debian-setup: allow libssh-dev to be installed for trusty
-    
-    Ubuntu 14.04 Trusty has libssh-dev 0.6.1 (using OpenSSL) which should be
-    usable.
-    
-    The debian/control file is not updated due to OpenSSL licensing
-    concerns, if you need to build on trusty, you need dpkg-buildpackage -d
-    (--no-check-builddeps).
-    
-    Remove distro-detection in favor of feature detection. Note that the
-    minimum Ubuntu versions could be lower, but unsupported versions are not
-    listed on packages.ubuntu.com so I did not bother.
-    
-    Change-Id: Ia04d960f3d4957918c925bf9cd351537e233fd3e
-    Reviewed-on: https://code.wireshark.org/review/18725
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit cbccf05
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Wed Nov 9 19:02:01 2016 +0000
-
-    CMake: Use xz generator with cpack
-    
-    We already do so with autotools.
-    
-    Change-Id: I0d7ea052ee19a42d16e82134f2f7188b3a19ee1e
-    Reviewed-on: https://code.wireshark.org/review/18727
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Dario Lombardo <lomato@gmail.com>
-
-commit cb0697c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Nov 4 11:55:33 2016 +0100
-
-    CMake: fix cpack archive name to include version
-    
-    CPACK_PACKAGE_VERSION is used before setting its value. Remove
-    spurious CPACK_SYSTEM_NAME usage.
-    
-    Before:
-      CPack: - package: wireshark/build-test/wireshark--.tar.bz2 generated.
-    
-    After
-      CPack: - package: wireshark/build-test/wireshark-2.3.0.tar.bz2 generated.
-    
-    Change-Id: I6f12017113f64b9c759a3fbd930cb3ee0807811d
-    Reviewed-on: https://code.wireshark.org/review/18669
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Tested-by: João Valverde <j@v6e.pt>
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit f1486a9
-Author: Niels Widger <niels@qacafe.com>
-Date:   Tue Nov 8 11:41:41 2016 -0500
-
-    Add DHCPv6 options for Softwire provisioning
-    
-    Bug: 12719
-    
-    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Signed-off-by: Sander Steffann <sander@steffann.nl>
-    Change-Id: I2792ef4a5851cd2fba75fc253aa3d635cb7f1fa6
-    Reviewed-on: https://code.wireshark.org/review/16860
-
-commit 8e5e6dd
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 8 11:11:14 2016 -0800
-
-    CMake: Enable ccache for gcc and clang.
-    
-    Add an option to check for and use ccache. Disable it by default.
-    
-    Change-Id: Ifc928d22715b7e06e53115455b31dbeaf2ee8332
-    Reviewed-on: https://code.wireshark.org/review/18715
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 857b80e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 8 11:44:31 2016 -0800
-
-    CMake: Use find_program to find a program.
-    
-    Use find_program to find glib-compile-resources instead of find_file.
-    
-    Change-Id: I565c3a596923ff4761bc38988ee396aa24bd63a6
-    Reviewed-on: https://code.wireshark.org/review/18714
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit b688175
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Nov 9 15:47:59 2016 +0100
-
-    [SIP] Use call_dissector_only() to call the diagnostics dissector.
-    
-    While there correct a typo.
-    
-    Change-Id: I58f9f4353e1fb4155d4f4f77f0f93325940d291f
-    Reviewed-on: https://code.wireshark.org/review/18722
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d6e35b1
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Wed Nov 9 10:21:03 2016 +0100
-
-    diameter_3gpp: update gx_feature_list_1 3GPP TS 29.212, v14.0.0
-    
-    Change-Id: I9995f718ab323b48408951a7df792b7b72ce3c8f
-    Reviewed-on: https://code.wireshark.org/review/18720
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7d2dc97
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 8 11:00:51 2016 -0800
-
-    Qt: Restore the default "About" box tab.
-    
-    Set the default about box tab back to "Wireshark". (Presumably this
-    changed due to Qt Creator's annoying last-tab-selected-wins behavior.)
-    
-    Change-Id: I85f64b623758a14e9588f6b3929bad26a6a60ad5
-    Reviewed-on: https://code.wireshark.org/review/18716
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a77e8a3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 8 18:04:59 2016 +0100
-
-    cmake: install missing profiles directory
-    
-    Spotted when comparing an autotools "make install" tree with the cmake
-    one.
-    
-    Change-Id: I68eed5f518a72a6476c3e464a6997f0b3855144e
-    Reviewed-on: https://code.wireshark.org/review/18713
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 4e95d5f
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Nov 8 15:30:45 2016 +0100
-
-    cmake: fix the linker flags test for Visual Studio
-    
-    ddd1c87d43781533c3ec10279857e3870d12437e modified the order
-    of linker command line options. This broke the tests and made
-    invalid linker flags seem valid.
-    
-    (Link target) ->
-      LINK : warning LNK4044: unrecognized option '/Wl,--as-needed'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj]
-      LINK : warning LNK4044: unrecognized option '/pie'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj]
-    
-    The simple fix is to add specific options for Visual Studio and clang at the beginning of
-    the linker's command line options rather than at the end.
-    
-    Change-Id: I6492ea1271e18be0d190e7579f47baecf6ac4d61
-    Reviewed-on: https://code.wireshark.org/review/18709
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 7531318
-Author: Anthony Coddington <anthony.coddington@endace.com>
-Date:   Fri Oct 14 12:46:29 2016 +1300
-
-    ERF: Fix issues with Host ID mapping
-    
-    packet-erf: Fix Host ID/Source ID showing for all extension header types.
-    Only show generated Host ID/Source ID when there is a Host ID extension header
-    or there was not one on the record.
-    Assumes there is only one Source ID if multiple Flow ID extension headers (unlikely)
-    and that it matches the one in the Host ID header. This is consistent with other tools.
-    Does support multiple Host ID extension headers though.
-    
-    Fix dag_version tag short name. Was clashing with another tag due to typo.
-    
-    ERF wiretap: Don't conflate Host ID 0 with implicit Host ID.
-    
-    While the implicit Host ID defaults to 0, it is not the same thing as seeing
-    a packet with Host ID explicitly 0 in the extension header which means
-    explicitly unknown source.
-    Store the initial (unknown) implicit Host ID interface mapping in it's own
-    special mapping table entry rather than 0.
-    
-    Noticed we can currently get duplicate interfaces in the unusual event of mixed
-    implicit and explicit Host ID packet extension headers for the same ID before
-    we discover that mapping.
-    Consistently abandon the implicit version for consistency with the dissector
-    linking behaviour and mark the interface as unmatched in the description. In
-    2 pass mode (including normal Wireshark file open) the abandoned interface ends
-    up with no packets. In the common cases (all Host ID or no Host ID on packet
-    records) this duplicate interface will not be created in the first place.
-    
-    Change-Id: Ic5d0b2ce9aae973f1693a247cf240ef1324ff70a
-    Ping-Bug: 12303
-    Reviewed-on: https://code.wireshark.org/review/18704
-    Reviewed-by: Stephen Donnelly
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1ae0c1e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Nov 8 11:52:17 2016 +0100
-
-    GSM A: allow a length of 3 bytes when using the 'no identity' type
-    
-    As stated in 3GPP 24.008 §10.5.1.4, for GMM and EMM procedures the
-    length should be set to 3 when using the 'no identity' type.
-    
-    Change-Id: Ib2d5930416b0d26853f4cc430df0ce2f29488877
-    Reviewed-on: https://code.wireshark.org/review/18707
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c12280f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Nov 8 09:37:12 2016 +0100
-
-    print.c: fix ek output
-    
-    follow-up of g1b91475
-    
-    Bug: 13086
-    Change-Id: I7171c50a0b113e3036860941b586e96a068fea9e
-    Reviewed-on: https://code.wireshark.org/review/18705
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit fc99bca
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 7 14:57:56 2016 +0100
-
-    L2TP: Fix dissection when unknown vendor AVP
-    
-    Bug: 13103
-    Change-Id: I531aeb941bb80a1ac403d5e0ffcb6ba549ea9370
-    Reviewed-on: https://code.wireshark.org/review/18699
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ddd1c87
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Oct 30 19:46:56 2016 +0100
-
-    cmake: avoid leading space in linker options
-    
-    This causes problems with cmake 2.8.9, which ships with Debian Wheezy.
-    
-    Reorder the linker options to avoid a leading space. According to GNU
-    ld's manual, the order of linker options on the command line does not
-    matter. This should be the same for Visual Studio's cl.exe and for
-    clang's linker.
-    
-    See
-    https://www.wireshark.org/lists/wireshark-dev/201604/msg00141.html
-    for more details about the problem.
-    
-    Change-Id: Ieaf7425600d394f365b01747747665233693fea2
-    Reviewed-on: https://code.wireshark.org/review/18581
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 1b91475
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Nov 4 07:45:09 2016 +0100
-
-    JSON: print field value for an item containing a subtree
-    
-    For fields that contain both a value and a subtree, print the value and
-    then create a new item with a _tree suffix for the subtree content
-    
-    Bug: 13086
-    Change-Id: I5a3c96bf9895d87faff3925d439bb54b73769a3e
-    Reviewed-on: https://code.wireshark.org/review/18663
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kacer <kacer.martin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3814eee
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 7 14:59:36 2016 +0100
-
-    L2TP: Fix typo on ERICSSON define value
-    
-    Change-Id: I59b667d7415d340eddc48f648da594d2fac3ad93
-    Reviewed-on: https://code.wireshark.org/review/18700
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fb5d024
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Nov 4 17:42:43 2016 +0100
-
-    AUTHORS: Update record for Harald Welte
-    
-    The record has become quite a bit out-of-date over the years.
-    
-    Change-Id: Id60e3e0839f27643227ddf79559769d228f17b0f
-    Reviewed-on: https://code.wireshark.org/review/18687
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 12e030c
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Fri Nov 4 09:27:41 2016 +0300
-
-    PROFINET: Update preliminary version of the Reporting System (RS) dissection.
-    
-    Timestamp decoding is added.
-    Name of "Stop Observer" is changed as "Observer Status Observer".
-    TimeStatusObserver padding bytes location is changed.
-    Text of RS_ReasonCode for value "0" is changed from "Reserved" to "No Detail".
-    
-    Change-Id: I2c231d75001a89a1e41f2518f5c6ca1fdf49a2f0
-    Reviewed-on: https://code.wireshark.org/review/18662
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 1619c4c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 6 23:54:59 2016 -0500
-
-    interface_tree_model.cpp - ensure QObject namespace for tr()
-    
-    Change-Id: I64214b5e2eb8b64ae36e049174d94d10da1e5bc5
-    Reviewed-on: https://code.wireshark.org/review/18698
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 94483fc
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Nov 4 16:58:25 2016 +0100
-
-    gsm_abis_pgsl: Dissect PACCH uplink messages
-    
-    The P-GSL uplink PACCH messages contain information about the decoded
-    access burst information four consecutive frame numbers.  Each burst
-    individually carries receive level, access burst type (8/11bit),
-    validity information and access delay.
-    
-    Change-Id: I9d874d9b2c6de6a5461591e0f1f037ef2c34c143
-    Reviewed-on: https://code.wireshark.org/review/18682
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2d34b19
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 6 17:02:29 2016 -0800
-
-    Include header to declare gsm_a_rr_rxlev_vals_ext.
-    
-    Change-Id: Ie3fd593ef5ce90dc07037f44fda869c26616afd9
-    Reviewed-on: https://code.wireshark.org/review/18697
+    Change-Id: I5d7dc5c09af0474c055796e49e0c7b94fa87d2ad
+    Reviewed-on: https://code.wireshark.org/review/22171
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 435c68cd2b856a6be7d015e8703c6c83d9b8eb89)
+    Reviewed-on: https://code.wireshark.org/review/22172
 
-commit 43a60c0
-Author: sangodbole <sanket.godbole@spirent.com>
-Date:   Wed Nov 2 16:56:18 2016 -0400
-
-    Added Dissector for Openflow Experimenter Value field for Openflow 1.3 and 1.4
-    
-    Change-Id: I79d7b9afbde34451b545ac7e67c22b012843d822
-    Reviewed-on: https://code.wireshark.org/review/18654
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 61ed49e
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Nov 4 17:00:35 2016 +0100
-
-    gsm_abis_pgsl: Decode dissection of codec_rxlev
-    
-    Fix a copy+paste mistake (using the codec_csy string for the
-    codec_rxlev) and use the existing val_str_ext for decoding the GSM/GPRS
-    RxLev value into a dBm value range.
-    
-    Change-Id: Ie19621019977f6a41201cca424de3d44ece309b0
-    Reviewed-on: https://code.wireshark.org/review/18683
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5ae9af9
+commit 25b6694
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 6 11:02:51 2016 -0800
+Date:   Fri Jun 16 01:54:42 2017 -0700
 
-    Get rid of Boolean "flags" that don't have any bit set.
+    Rename FindOS_X_FRAMEWORKS.cmake for the new OS name.
     
-    And tweak the Pidl generator for Wireshark not to generate "flags" like
-    that.
+    It's now FindMACOS_FRAMEWORKS.cmake.
     
-    (The generator also does field name and true/false strings' case
-    differently, so I didn't use it to regenerate the dissectors; that needs
-    to be looked at.)
+    (But is it actually *used*?  CMakeLists.txt does the check itself.)
     
-    Change-Id: Ie1657a782ebdb107e58792cedd29bbaa79b17bd4
-    Reviewed-on: https://code.wireshark.org/review/18695
+    Change-Id: I6e972869b94da959dc7c9a3fccacfbd35e0e992c
+    Reviewed-on: https://code.wireshark.org/review/22163
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit a0dfbccdfca79da5ed9bc250d18bceedd3598276)
+    Reviewed-on: https://code.wireshark.org/review/22164
 
-commit a5a179d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 6 10:47:51 2016 -0800
-
-    Use guint rather than gsize, to avoid 64-bit-to-32-bit shortening warnings.
-    
-    Change-Id: Id907cd8c8ea83730674a0bc9b0636d2408b6546c
-    Reviewed-on: https://code.wireshark.org/review/18694
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e3fe33a
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Nov 4 14:39:30 2016 +0100
-
-    gsm_abis_pgsl: Fix endianness of frame numbers
-    
-    The frame numbers are stored as 24bit value in little endian byte order,
-    not in big endian (as assumed so far).
-    
-    Change-Id: Ia58db03749375a025e7b3b6b5805687af7601d9a
-    Reviewed-on: https://code.wireshark.org/review/18681
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 94b923c
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Oct 21 21:55:56 2016 +0200
-
-    gsm_abis_pgsl: Hand off into GPRS RLC/MAC dissector
-    
-    Rather than displaying the P-GSL data as "data", let's call the
-    proper GPRS RLC/MAC dissector to get a decode of the payload.
-    
-    As the RLC/MAC payload of P-GSL is one un-aligned stream of bits
-    containing the EGPRS header + RLC data blocks, we need to re-aling the
-    data blocks before calling into the RLC/MAC dissector in case of EGRPS.
-    
-    Change-Id: Ib081606c1b7af2a15ecf3c5f5b3ff44b5096e865
-    Reviewed-on: https://code.wireshark.org/review/18483
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 37388fb
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Nov 5 10:38:23 2016 +0100
-
-    gsm_abis_pgsl: Dissect Uplink Channel Mode Information Element
-    
-    Change-Id: Ibfd490fbdbdb479f0e557be9c0d3ede6f94c5639
-    Reviewed-on: https://code.wireshark.org/review/18685
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 1b6816d
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Nov 4 17:54:42 2016 +0100
-
-    gsm_abis_pgsl: Proper interpretation of "Q bits"
-    
-    Regarding the EGPRS header, a value of '1' means bads checksum/quality,
-    and '0' means good quality/checksum.  Let's explicitly state this by
-    overriding the default True/False boolean labels with Bad/Good.
-    
-    Change-Id: I2168771d5552345c9c2eb6910f2839013da8210e
-    Reviewed-on: https://code.wireshark.org/review/18684
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 991cbe8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 6 08:12:57 2016 -0800
-
-    [Automatic update for 2016-11-06]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Ia867e3b78363ba806ab99dd8da321f5f48c279cc
-    Reviewed-on: https://code.wireshark.org/review/18691
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 6862820
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Oct 9 10:20:57 2016 -0400
-
-    TCAP: Use a real dissector table to store dissector handles.
-    
-    Also cleanup ANSI TCAP dissector that had a commented out attempt at what
-    was just cleaned up with TCAP.
-    
-    Change-Id: I347f11e21a493d8d444c2dc528bb7713a227381a
-    Reviewed-on: https://code.wireshark.org/review/18129
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d3389fa
-Author: Simon Barber <simon.barber@meraki.net>
-Date:   Mon Jul 25 17:00:55 2016 +0100
-
-    Add wlan_radio preference to assume 802.11 preamble is short for duration
-    calculations.
-    
-    Change-Id: Ie314f7caee067b16da8dcb2a45cb1395ce0cb266
-    Reviewed-on: https://code.wireshark.org/review/17719
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c665926
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Nov 5 15:26:49 2016 +0100
-
-    gsm_abis_pgsl: Fix dissection of PGSL-STATUS-IND
-    
-    The frame number is (as in all messages) three bytes long, not just one
-    byte.
-    
-    Change-Id: I461121d61d2515f51462a3df1086ab988e4afab5
-    Reviewed-on: https://code.wireshark.org/review/18686
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e95519b
-Author: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
-Date:   Fri Nov 4 15:28:28 2016 +0100
-
-    lua: Added new integer sizes in TvbRange
-    
-    * Added support for 3-byte integers in :int() and :le_int()
-    * Added support for 5, 6, and 7-byte integers in :int64() and :le_int64()
-    
-    Change-Id: If9ab4ea806191bc63effe45a081b9c65693c2367
-    Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
-    Reviewed-on: https://code.wireshark.org/review/18672
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f894379
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Nov 5 17:21:23 2016 +0100
-
-    E.212: fix identification of PLMNs with 3 digits MNC ending with a 0
-    
-    Split PLMNs arrays in 2 so as to clearly konw if the MNC is 2 or 3 digits long
-    
-    Bug: 13092
-    Change-Id: Ic5f776f3c1e5141f8739bf2137ebd046f7e4a0d6
-    Reviewed-on: https://code.wireshark.org/review/18679
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5ba5727
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Nov 5 19:31:09 2016 +0100
-
-    Qt: move declaration inside ifdef.
-    
-    Variable col is unused if compiled without extcap.
-    
-    Change-Id: Iffc4951d4655e2649ecf350eefb09988370277e6
-    Reviewed-on: https://code.wireshark.org/review/18680
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d7ef946
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Nov 5 13:37:34 2016 +0100
-
-    6LoWPAN: Use correct full name
-    
-    6LoWPAN is not only used over IEEE 802.15.4, so adjust the full name.
-    
-    Change-Id: I56305baa74c0cc9337dfd5e813965035fd7dcec6
-    Reviewed-on: https://code.wireshark.org/review/18677
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 315c5f0
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Nov 4 09:15:53 2016 +0100
-
-    travis: remove matrix steps from osx
-    
-    Change-Id: I172854246fea1858a622178177ca1524f7b4946f
-    Reviewed-on: https://code.wireshark.org/review/18671
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d143598
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Nov 3 22:52:31 2016 +0100
-
-    travis: move osx first.
-    
-    Change-Id: I08f65a6b5bcc78c4a74ed9f1488bca07cc6a1fd5
-    Reviewed-on: https://code.wireshark.org/review/18670
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit a414df4
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Nov 3 21:26:00 2016 +0100
-
-    bthci_acl: Always show data item
-    
-    Always add the Data (Fragment) item, also for the last frame.
-    Also add link to "Reassembled in #" for all except the last frame.
-    
-    The reassembly logic should be rewritten to use reassemble.h functions
-    to be able to show the fragments frame list, fragment count and
-    reassembled length items.
-    
-    Change-Id: Ib0e17711e182178d0b7ea0fd6903a9144adb757d
-    Reviewed-on: https://code.wireshark.org/review/18659
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 10dc313
-Author: Sharvil Nanavati <sharvil@playground.global>
-Date:   Fri Nov 4 09:53:38 2016 -0700
-
-    Bluetooth: HCI: LE: address review comments from review/18661.
-    
-    Change-Id: Ibb97970e38d98f3564eb57995f3f31bebe88cc13
-    Reviewed-on: https://code.wireshark.org/review/18674
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 4fd2872
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Nov 3 22:39:34 2016 +0100
-
-    debian-setup: remove libssh-gcrypt-dev from trusty.
-    
-    Change-Id: I62080885a0f9a99ee02ecae8e67caefcefdea0e4
-    Reviewed-on: https://code.wireshark.org/review/18660
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 7f033b6
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Oct 25 11:03:52 2016 +0200
-
-    Bluetooth: HCI: Add missing Core4's cmd/evt identifies
-    
-    Add a lof of Command Opcodes.
-    Implement trivial Event: "Inquiry Response Notification"
-    and "Get MWS Transport Layer Configuration"
-    
-    Change-Id: I4ca13878e2f972caae4320e9c0149dc3d75c45a5
-    Reviewed-on: https://code.wireshark.org/review/18668
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit c799699
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Oct 24 15:49:29 2016 +0200
-
-    Qt/Bluetooth: Split LE Meta Events
-    
-    Add 3rd level subtree in Event->LE Meta, because of
-    existance of "Subevent" which is in similar thing to
-    Event or Opcode in CommandComplete.
-    
-    Change-Id: Ib732ab417c5141251736b608de2e4e64b702c20a
-    Reviewed-on: https://code.wireshark.org/review/18667
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 3eae603
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Oct 24 13:03:40 2016 +0200
-
-    Bluetooth: HCI: LE: Dissect all LE Features
-    
-    The implementation is up to Core 4 specification.
-    
-    Change-Id: I3fc3f06f8ec6bdd488cff109bdbca275cd0f0121
-    Reviewed-on: https://code.wireshark.org/review/18666
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit cbd4a46
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Oct 24 12:18:46 2016 +0200
-
-    Bluetooth: HCI: LE: Implement missing Meta Events
-    
-    1. LE Remote Connection Parameter Request
-    2. LE Data Length Change
-    3. LE Read Local P-256 Public Key Complete
-    4. LE Generate DHKey Complete
-    5. LE Enhanced Connection Complete (implies more meta-info present)
-    
-    Change-Id: I4aac5b66808cd15cc5b6825429b2bff848aa88b4
-    Reviewed-on: https://code.wireshark.org/review/18665
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit c9262ac
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Oct 18 22:33:59 2016 +0200
-
-    Bluetooth: Update Assigned Numbers: CompanyIDs
-    
-    It comes from:
-    https://www.bluetooth.com/specifications/assigned-numbers/Company-Identifiers
-    
-    To meet Wireshark requirements make them ASCII in case of some vendors.
-    
-    Change-Id: I66b8ce5a1bc6af03fae6efa18e594d83b586be38
-    Reviewed-on: https://code.wireshark.org/review/18664
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 604fa3e
-Author: Sharvil Nanavati <sharvil@playground.global>
-Date:   Wed Nov 2 16:32:53 2016 -0700
-
-    Implement dissector for the LE Enhanced Connection Complete event.
-    
-    BLE connections that use this event cannot be fully decoded since the
-    connection handle is unknown to Wireshark.
-    
-    Change-Id: I56eb6fc7c918b235fb1d68d89b6f1f2847e648e1
-    Reviewed-on: https://code.wireshark.org/review/18661
-    Reviewed-by: Sharvil Nanavati <sharvil@playground.global>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit dcd0bed
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 3 08:49:10 2016 +0100
-
-    USB Audio: Fix dissection of unit descriptors missing the iFeature field
-    
-    Issue reported by Vladimir Vysotsky
-    
-    Bug: 13085
-    Change-Id: Ibdc1bf662f852818777cfb44fa19d798972390ca
-    Reviewed-on: https://code.wireshark.org/review/18651
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9490f5e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Oct 31 23:16:00 2016 +0100
-
-    autotools: propagate git version info to distribution tarball
-    
-    Store the git describe output in the distribution tarball (make dist)
-    and ensure that this version is always used for builds from this
-    tarball. This will prevent the useless "Git Rev Unknown from unknown"
-    output in tar-based builds.
-    
-    It will also prevent git from being invoked in tarball builds.
-    
-    Remove the git branch name since the commit ID (and git tag) in the git
-    describe output is sufficient to identify the source tree. (In SVN, a
-    revision ID had to be paired with a branch name to identify the source
-    tree, in git this is no longer the case.)
-    
-    Change-Id: Iffe142b6efd81e857802eb604d6310cfd301d207
-    Reviewed-on: https://code.wireshark.org/review/18415
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 4863d81
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Nov 2 22:58:45 2016 +0100
-
-    wsutil: add initializer (found by clang ccc).
-    
-    Warning:
-    
-    wireshark/wsutil/strtoi.c:113:1: warning: The left operand of '<' is a garbage value
-    DEFINE_WS_STRTOI_BITS(32)
-    ^~~~~~~~~~~~~~~~~~~~~~~~~
-    wireshark/wsutil/strtoi.c:83:12: note: expanded from macro 'DEFINE_WS_STRTOI_BITS'
-                            if (val < 0) \
-                                ~~~ ^
-    wireshark/wsutil/strtoi.c:114:1: warning: The left operand of '<' is a garbage value
-    DEFINE_WS_STRTOI_BITS(16)
-    ^~~~~~~~~~~~~~~~~~~~~~~~~
-    wireshark/wsutil/strtoi.c:83:12: note: expanded from macro 'DEFINE_WS_STRTOI_BITS'
-                            if (val < 0) \
-                                ~~~ ^
-    wireshark/wsutil/strtoi.c:115:1: warning: The left operand of '<' is a garbage value
-    DEFINE_WS_STRTOI_BITS(8)
-    ^~~~~~~~~~~~~~~~~~~~~~~~
-    wireshark/wsutil/strtoi.c:83:12: note: expanded from macro 'DEFINE_WS_STRTOI_BITS'
-                            if (val < 0) \
-                                ~~~ ^
-    3 warnings generated.
-    
-    Change-Id: I9eef0f2c0d4500531655a8b43509205a1f4e0684
-    Reviewed-on: https://code.wireshark.org/review/18640
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit da7354a
-Author: John A. Thacker <johnthacker@gmail.com>
-Date:   Thu Jul 7 18:24:43 2016 -0400
-
-    Fragmentation reassembly as in PPP MP (RFC 1990/2686)
-    
-    Add support for defragmentation of fragments that use the defragmentation
-    scheme of PPP MP (RFC 1990). Instead of getting "sequence_number,
-    fragment_number, last" as in other protocols, PPP MP provides a single
-    sequence number that is effectively "seqnum + fragnum", though it provides
-    flags for both the first and last fragment of a reassembly.
-    
-    See Appendix A of RFC 4623 (PWE3 Fragmentation and Reassembly) for a list
-    of protocols that use this style, including PPP MP (RFC 1990), PWE3 MPLS
-    (RFC 4385), L2TPv2 (RFC 2661), L2TPv3 (RFC 3931), ATM, and Frame Relay.
-    
-    Also add support for the Multi-class Extension to Multilink PPP (RFC 2686),
-    which uses some of the previously reserved bits as classes that distinguish
-    otherwise identical sequence numbers.
-    
-    Bug: 12548
-    Change-Id: Ic2ce3c50e61ab2eb50e4d92fd353ca4d2a48fe18
-    Reviewed-on: https://code.wireshark.org/review/16327
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8ea8cb6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Nov 2 20:43:32 2016 -0400
-
-    packet-bthci_cmd.c: Fix typos found by lintian.
-    
-    Change-Id: I7fd66fadd1cc42951745710ef06613ef098c572d
-    Reviewed-on: https://code.wireshark.org/review/18641
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9b25c5e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Nov 2 20:51:10 2016 -0400
-
-    Fix lintian found spelling error "identifer" -> "identifier"
-    
-    Change-Id: I78281ce097e36df546338a5dacb03a11bedd2b24
-    Reviewed-on: https://code.wireshark.org/review/18642
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2c8c42d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Nov 2 20:57:04 2016 -0400
-
-    Fix lintian found spelling error "occurence" -> "occurrence"
-    
-    Change-Id: I4fcff029ec15a1627dde0d311b063a249f0e0c0a
-    Reviewed-on: https://code.wireshark.org/review/18643
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a01fac7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Nov 2 21:01:26 2016 -0400
-
-    Fix lintian found spelling error "occured" -> "occurred"
-    
-    Change-Id: I6010669b880b772ba4a22f13ba03fe48b438e8b7
-    Reviewed-on: https://code.wireshark.org/review/18644
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 79b4a05
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Nov 2 21:03:44 2016 -0400
-
-    Fix lintian found spelling error "splitted" -> "split"
-    
-    Change-Id: I4b00ef460ae1792cd6f14856493f7a58ab8e0b9a
-    Reviewed-on: https://code.wireshark.org/review/18645
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1f6c338
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Nov 2 21:05:16 2016 -0400
-
-    Fix lintian found spelling error "Reciever" -> "Receiver"
-    
-    Change-Id: I51a0c5a7eb69e5ba06dc01ee3be269f61cb02cf4
-    Reviewed-on: https://code.wireshark.org/review/18646
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 44fe180
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Nov 2 21:09:16 2016 -0400
-
-    Fix lintian found "grammar" error "allow to" -> "allowed to"
-    
-    Change-Id: I4dd0e42df00ab27073b55cfce7da173b0e9dab00
-    Reviewed-on: https://code.wireshark.org/review/18647
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit eb56b71
+commit 74858be
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 2 18:57:12 2016 -0700
+Date:   Fri Jun 16 01:49:44 2017 -0700
 
-    RTS_FLAG_NONE is a flags field value, but it's not a flag bit.
+    Change some names to reflect Apple's new UNIX-for-Macs name.
     
-    It's the *absence* of flag bits, so you can't test whether it's set;
-    don't have a field for it.  This gets rid of a dissector assertion.
+    {OS_X,os_x} -> {MACOS,macos}.
     
-    Add some more URLs for information about DCE RPC and MS-RPC.
-    
-    Change-Id: I53e8f11692c66e16ae2ec7fd4ba8eb90b0673da4
-    Reviewed-on: https://code.wireshark.org/review/18648
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 46160ff
-Author: Thomas Wiens <th.wiens@gmx.de>
-Date:   Tue Nov 1 12:54:23 2016 +0100
-
-    proto: Decode negative values in a bitmask field
-    
-    Allows to use negative values (FT_INT) in a bitmask field.
-    If a field type greater or equal (FT_(U)INT40) is used then also
-    a 64 bit value string and 64 bit format function must be used.
-    
-    Change-Id: Ib86d45bee73a71a784068ab717d35810c6f48017
-    Reviewed-on: https://code.wireshark.org/review/18601
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de
+    Reviewed-on: https://code.wireshark.org/review/22161
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 5039d0e57635589208e1d969a57250746e422e06)
+    Reviewed-on: https://code.wireshark.org/review/22162
 
-commit a4f3ca2
-Author: Anders <anders.broman@ericsson.com>
-Date:   Wed Oct 26 10:22:20 2016 +0200
-
-    [PER] Use tvb_new_octet_aligned().
-    
-    Change-Id: Ib29f3cb5b670b4e6e5432922a160f2eb4b780aae
-    Reviewed-on: https://code.wireshark.org/review/18473
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 72ba79b
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Nov 2 20:26:11 2016 +0100
-
-    btl2cap: Initialize reassembly values
-    
-    Values in psm_data structure used in reassembly must be initialized
-    to zero to ensure that the reassembly logic works.
-    
-    Change-Id: I47c636dde60f28a8dcd9a366664fd23019a12323
-    Reviewed-on: https://code.wireshark.org/review/18633
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9e2a9d0
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Nov 2 14:15:41 2016 +0100
-
-    sshdump: use g_shell_quote in the right way.
-    
-    Change-Id: I3f71dabe92d3b00192f36fc57ebb7673b2327620
-    Reviewed-on: https://code.wireshark.org/review/18623
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit c8dd840
-Author: Julian Cable <julian.cable@yahoo.com>
-Date:   Fri Mar 11 12:19:14 2016 -0500
-
-    Bugfix dissection of DCP-ETSI
-    
-    Fix root cause in dissect_af
-    
-    Bug: 12252
-    Change-Id: Ia20fc7bad39e80062e177b4ddd7c7bb87accf328
-    Reviewed-on: https://code.wireshark.org/review/14644
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit afd8163
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 2 13:28:29 2016 +0100
-
-    TLS(1.3): Add new Alert
-    
-    Change-Id: Ice365bf3ca2198b3d81994a5670ac50add3e53dc
-    Reviewed-on: https://code.wireshark.org/review/18620
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 54ee7d6
-Author: Adam Goldman <adam.goldman@intel.com>
-Date:   Wed Nov 2 09:16:56 2016 -0400
-
-    opa-mad: Fix several issues with the SA and SM parse functions
-    
-    Add support for SA(PortGroupTableRecord). Fixed parse errors in
-    SA(CableInfoRecord), SA(BufferControlTable), SA(PathRecord),
-    SA(PortInfo), & SM/SA(SMInfo). Moved SA(FabricInfoRecord) to be in SA
-    Sections. Remove the attribute modifier 'ALL' bit being incorrectly
-    used in SM/SA. Add support for the valid case when SA returns with
-    zero records and a none zero MAD status.
-    
-    Change-Id: I9bdc87d113be045132a78ecf5c8b4ffa3ac29900
-    Signed-off-by: Adam Goldman <adam.goldman@intel.com>
-    Reviewed-on: https://code.wireshark.org/review/18629
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c6c4637
-Author: Rémy Léone <remy.leone@gmail.com>
-Date:   Wed Nov 2 16:53:07 2016 +0100
-
-    ieee802.15.4: fix small typo
-    
-    Change-Id: I23c58ef5cbf116402d25089bae3d83168b8af974
-    Reviewed-on: https://code.wireshark.org/review/18632
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d3e0ce4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 24 09:11:06 2016 +0200
-
-    Update .mailmap
-    
-    Change-Id: I9962ced39ce3fd31cff446a99ba1c0b6ebfb1bbf
-    Reviewed-on: https://code.wireshark.org/review/18596
-    Reviewed-by: Erik de Jong <erikdejong@gmail.com>
-    Reviewed-by: Anish Bhatt <anish@gatech.edu>
-    Reviewed-by: Francisco Javier Sánchez-Roselly <franciscojavier.sanchezroselly@ujaen.es>
-    Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com>
-    Reviewed-by: Franklin Mathieu <snaipe@diacritic.io>
-    Reviewed-by: Boris Bochkaryov <Boris-Bochkaryov@yandex.ru>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 27bd013
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Oct 31 22:49:20 2016 +0100
-
-    make-version.pl: fix --print-vcs output
-    
-    Detect earlier whether to write VCSVERSION to version.h such that the
-    --vcs-version output matches the contents of version.h.
-    
-    Change-Id: I5c05087679bb7861cd5884426b39fa362bf23a16
-    Fixes: v2.1.0rc0-2770-geeded81 ("Add option to disable version.h")
-    Reviewed-on: https://code.wireshark.org/review/18599
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 35e4233
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 2 09:47:48 2016 +0100
-
-    Openflow (v4/v5): Add vOXM vlan mask field
-    
-    Bug: 12979
-    Change-Id: I7f0e806081704dfeaf40ce1e4e41271ffd5e3023
-    Reviewed-on: https://code.wireshark.org/review/18618
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 23eac7d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 2 08:36:33 2016 +0100
-
-    FIX: fix spelling typo found by lintian
-    
-    Change-Id: I3616de3ecd7ca52f2da4af13f35967eeed61414e
-    Reviewed-on: https://code.wireshark.org/review/18613
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dbd762a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 2 13:27:14 2016 +0100
-
-    btatt: fix spelling typo found by lintian
-    
-    Change-Id: I3fdc71e927bdb0d5408db46656c23b23dc31489a
-    Reviewed-on: https://code.wireshark.org/review/18621
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 2a651cf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Nov 2 09:31:52 2016 +0100
-
-    SNA: fix dissection of GDS Variables
-    
-    Decode the header as specified in http://www.retrocomputing.net/info/doc/GA27-3136-20_SNA_Formats.pdf chapter 13.
-    Note that the Information field is not decoded yet.
-    
-    Bug: 13084
-    Change-Id: Iaaee344ef0b2805906a3eeae1134479abf9d403e
-    Reviewed-on: https://code.wireshark.org/review/18616
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 58335bd
-Author: Benoît Canet <benoit@scylladb.com>
-Date:   Tue Oct 18 15:27:37 2016 +0200
-
-    Packaging: Add dependencies for lz4 and snappy packages
-    
-    Do it for Debian-like, RPM-based, and MacOS (via Homebrew) systems.
-    
-    Signed-off-by: Benoît Canet <benoit@scylladb.com>
-    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    
-    Change-Id: I52802301815243021c039da6a27af6c534792439
-    Reviewed-on: https://code.wireshark.org/review/18272
-    Reviewed-by: Benoît Canet <benoit@scylladb.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 4616505
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Oct 31 12:37:14 2016 +0100
-
-    Qt: add "search authors" feature.
-    
-    Add a search field in the authors tab. The list of authors has became
-    huge and it's very hard to find someone in it. Having a fast way to
-    search yourself or your friends would be fun.
-    
-    Change-Id: I0c6a5e8d5893d6f7b5a3258e63bdc91969f53d31
-    Reviewed-on: https://code.wireshark.org/review/18594
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 85c1a45
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 2 09:51:34 2016 +0100
-
-    pre-commit: fix indent
-    
-    Change-Id: I50291be3fd275cde8af42c45c17e52345d1c6215
-    Reviewed-on: https://code.wireshark.org/review/18619
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0f2f66d
+commit 3e828e8
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 2 01:43:34 2016 -0700
+Date:   Fri Jun 16 00:57:54 2017 -0700
 
-    Fix some errors.
-    
-    Th link throughput and latency objects are just 32-bit integers; process
-    them as such and, as they're bytes-per-second and microsecond values,
-    respectively, show them as decimal, rather than as hex, as most of us
-    have 10, not 16, fingers.
+    Rename a routine to match the OS name.
     
-    The ETX metric object is a 16-bit integer; process it as such, and show
-    it in decimal as well.
+    It's now "macOS".
     
-    Attach an expert info representing an error to the item in error.
+    While we're at it, note that the property list from which it fetches
+    version information still calls it "Mac OS X".
     
-    Change-Id: I57dfac0127d263724cc6940a0457d63e17616b64
-    Reviewed-on: https://code.wireshark.org/review/18617
+    Change-Id: I438ef9dc65c2619d7378b0deb5efc84734a2ac6d
+    Reviewed-on: https://code.wireshark.org/review/22159
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 63b91ad3119c64eb8fdaa67303fe37d71a01a1b0)
+    Reviewed-on: https://code.wireshark.org/review/22160
 
-commit 5ec8186
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Nov 2 06:56:30 2016 +0100
-
-    Add snappy compression library setup
-    
-    Change-Id: I060d3056dc386f44aec703ddd0fe024866a51fcf
-    Reviewed-on: https://code.wireshark.org/review/18611
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 8a376d4
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Nov 1 21:29:11 2016 -0400
-
-    Validate the Diameter XML files in the pre-commit script.
-    
-    Validation requires xmllint but will pass (with a complaint) if the committer
-    does not have xmllint installed.
-    
-    Change-Id: I336a1c8ad8e1f98805a284d8c4736810b1a9c54e
-    Reviewed-on: https://code.wireshark.org/review/18609
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e145433
-Author: Adam Goldman <adam.goldman@intel.com>
-Date:   Tue Nov 1 10:24:48 2016 -0400
-
-    opa-mad: Fixed malformed SA(FabricInfoRecord) reserved field
-    
-    Change-Id: I1b20a49008e41728cb10cd11765833a762f66505
-    Reviewed-on: https://code.wireshark.org/review/18603
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 963bd67
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Nov 1 21:11:40 2016 -0400
-
-    Add a few more T6a/T6b and charging AVPs.
-    
-    Fix a mistake in a comment.
-    
-    Change-Id: Ibb12ff3036fb42fe5e3955c67c7c9989f8ffca63
-    Reviewed-on: https://code.wireshark.org/review/18610
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 26e883a
+commit d802138
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Oct 31 01:10:56 2016 -0400
+Date:   Wed Jun 14 12:52:09 2017 -0400
 
-    Move Base32_encode from packet-fc00.c to wsutil (as ws_base32_decode)
-    
-    There could be some reuse out of it, so but it with the rest of the
-    general utilities.
+    packet-btrfcomm.c: Prevent over bit shift in get_le_multi_byte_value.
     
-    Change-Id: I404c135b933660a82678510b9ca2701985c5632a
-    Reviewed-on: https://code.wireshark.org/review/18589
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2163
+    Bug: 13783
+    Change-Id: I92cefec86f9545345d00cf28e32ef7c05064417c
+    Reviewed-on: https://code.wireshark.org/review/22141
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8ba444b
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Sun Oct 30 04:20:48 2016 -0400
-
-    packet-infiniband: Fixed IP based connections & other minor fixes
-    
-    1. Fixed setting right address type instead of AT_IB for RoCE and RRoCE
-    depending on address type given by pinfo where address type would be
-    IPv4 or IPV6.
-    Fail to do so was resulting into infiniband dissector adding
-    conversation info based on AT_IB type vs payload dissectors dissecting
-    based on pinfo. Fixing this allows to add/search based on right
-    address type.
-    (Tested for Infiniband and RRoCE)
-    
-    2. Added support to pass already parsed CM attribute id from infiniand to
-    other mad private data dissectors so that right dissection of private data
-    can be done based on CM attribute id (message type).
-    Moved CM attribute id definitions to header file so that private data
-    dissectors based on CM attribute id can reuse these values without
-    duplicate defines.
-    (Tested for Infiniband and RRoCE)
-    
-    3. Added direction client to server/server to client, (active/passive) to
-    conversation_data for payload dissectors which cannot dissect only based
-    on payload content without knowing the direction.
-    (Tested for RRoCE)
-    
-    4. Fixed IP CM to claim all 92 bytes of private data (including consumer
-    private data), instead of just 36 bytes of header because its part of IP
-    CM private data.
-    (Tested for Infiniband and RRoCE)
-    
-    5. Fixed MAD header to claim all 232 (256-24) bytes of data as it belongs
-    to it in the tree.
-    (Tested for Infiniband and RRoCE)
-    
-    6. Fixed getting ip version by performing AND operation first to extract IP
-    version field.
-    (Tested for RRoCE-IPV4 and Infiniband)
-    
-    Change-Id: I37daca6a089784b61c25e10cdc8f3cf028ca8c58
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/18573
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 552dab08a6ea1b47465d888c613c353f8697e918)
+    Reviewed-on: https://code.wireshark.org/review/22152
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b0eac84
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Oct 31 23:02:44 2016 +0100
+commit 7f8d5f9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 14 19:55:05 2017 -0400
 
-    Small fixes for JSON output
+    udpdump.c: Don't include epan headers.
     
-    - reinitialize the variable used to insert comma between packets when
-    performing a new export
-    - ensure that escaped ASCII characters are code on 4 digits characters
+    udpdump has local copies of the tag values from exported_pdu.h, so the
+    dependency isn't needed.  exported_pdu.h required tv_buff.h and packet_info.h,
+    whose inclusion caused link errors on SPARC.
     
-    Change-Id: Ib557da4843f6b98f793b60e417260ebb27a38b99
-    Ping-Bug: 13073
-    Reviewed-on: https://code.wireshark.org/review/18598
+    Bug: 13801
+    Change-Id: Icbf7b59b8af0d3a0fc73599baad6932e76dc3462
+    Reviewed-on: https://code.wireshark.org/review/22131
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9ff6bb2
-Author: Joakim Karlsson <oakimk@gmail.com>
-Date:   Tue Nov 1 18:57:04 2016 +0100
-
-    gtp: fix and improve user location information
-    
-    * Fixed RAI which was broken
-    * Improved CGI and SAI
-    
-    Change-Id: I1807b628ef54e2f3e94551c26301f1376bef0914
-    Reviewed-on: https://code.wireshark.org/review/18604
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 21b4de0
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Nov 2 01:47:00 2016 +0100
-
-    Add lz4 setup.
-    
-    Change-Id: If3b51e719a0a745eac0862f882b912e1d0f72587
-    Reviewed-on: https://code.wireshark.org/review/18608
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 17503b9
-Author: Joakim Karlsson <oakimk@gmail.com>
-Date:   Tue Nov 1 21:11:05 2016 +0100
-
-    gtp: correction of octet14 in QoSProfile
-    
-    * Added Spare4
-    * Corrected order
-    
-    Change-Id: I93384452d73bd519784b8c11ab5671797d16fc99
-    Reviewed-on: https://code.wireshark.org/review/18606
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2064243
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Tue Nov 1 14:55:35 2016 -0700
-
-    MAUSB: Fix width of Cancel Transfer Status field
-    
-    Width of this field was increased in the 1.0a MA USB Update.
-    
-    Change-Id: Ib1a40dee6fbcfd389c982b53c4b51f538c1973e7
-    Reviewed-on: https://code.wireshark.org/review/18607
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 021c79b
-Author: Arjen Zonneveld <arjen@bz2.nl>
-Date:   Wed Oct 12 22:15:59 2016 +0200
-
-    Add BGP dissector support for draft-heitz-idr-large-community-04
-    
-    Parses large communities as specified in https://tools.ietf.org/html/draft-heitz-idr-large-community-04
-            Path Attribute - LARGE_COMMUNITY: 65536:1:1 65536:1:2 65536:1:3
-                Flags: 0xc0, Optional, Transitive: Optional, Transitive, Complete
-                    1... .... = Optional: Optional
-                    .1.. .... = Transitive: Transitive
-                    ..0. .... = Partial: Complete
-                    ...0 .... = Length: Regular length
-                Type Code: LARGE_COMMUNITY (32)
-                Length: 36
-                Large communities: 65536:1:1
-                    Global Administrator: 65536
-                    Local Data Part 1: 1
-                    Local Data Part 2: 1
-                Large communities: 65536:1:2
-                    Global Administrator: 65536
-                    Local Data Part 1: 1
-                    Local Data Part 2: 2
-                Large communities: 65536:1:3
-                    Global Administrator: 65536
-                    Local Data Part 1: 1
-                    Local Data Part 2: 3
-    
-    Bug: 13083
-    Change-Id: I8db0601f621ceb6fb2e170ed9bfc2747091495ee
-    Reviewed-on: https://code.wireshark.org/review/18172
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f269290
-Author: Joakim Karlsson <oakimk@gmail.com>
-Date:   Tue Nov 1 19:36:32 2016 +0100
-
-    gtp: decoding correlation-id
-    
-    Change-Id: Ie9d399c10b6599bfc463e27ca3cfcb3c06d8b588
-    Reviewed-on: https://code.wireshark.org/review/18605
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9a187cc
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Nov 1 13:14:47 2016 +0100
-
-    [GTPv2] Basic dissection of IE Integer Number and value_string updates.
-    
-    Change-Id: I4b5fa57121b56daf55ac2ae3a966679c5ab874fb
-    Reviewed-on: https://code.wireshark.org/review/18602
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b543471
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 1 10:00:24 2016 +0100
-
-    gsm_dtap:  fix spelling typo found by lintian
-    
-    Change-Id: I4f3895195c61b908dd081dd6950b16832d62519f
-    Reviewed-on: https://code.wireshark.org/review/18600
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 959b13b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Oct 31 21:16:37 2016 +0100
-
-    GPRSCDR: remove obsolete ASN.1 files
-    
-    Change-Id: I4264f594a9c60c07a400187148d6c68120986c3c
-    Reviewed-on: https://code.wireshark.org/review/18597
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a3f5f3e
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Fri Oct 28 15:58:17 2016 +0200
-
-    GPRS_CDR: update record definitions
-    
-    Records defined according to 3GPP TS release 14 in new .asn files.
-    Updated Makefiles and dissector files generated via asn2ws
-    
-    Change-Id: I6da2782c58178550962f63dbd526b827e0d8394b
-    Reviewed-on: https://code.wireshark.org/review/18552
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d7e874c
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Mon Oct 31 08:27:14 2016 +0100
-
-    PW_ACH: Use proper symbolic names
-    
-    Collect all used PW Associated Channel Types and use them in the
-    subdissector table registrations.
-    
-    Change-Id: I5d196bceefdb4560b1f4388ff86898e316e5e2ae
-    Reviewed-on: https://code.wireshark.org/review/18590
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    (cherry picked from commit 828e1f07a82feb821c8169236fde18570ec01313)
+    Reviewed-on: https://code.wireshark.org/review/22151
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b61cfd7
-Author: Thomas Wiens <th.wiens@gmx.de>
-Date:   Mon Oct 31 10:57:49 2016 +0100
-
-    bitmask: add missing break statement
-    
-    Change-Id: Ia9cb54431c8c274c46e299b6a6da8cac14bda88e
-    Reviewed-on: https://code.wireshark.org/review/18591
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7bdcf75
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Oct 26 11:57:29 2016 +0200
-
-    sshdump: remove default filter from capture mode.
-    
-    This allow to capture without any filter.
-    
-    Bug: 13048
-    Change-Id: I29fb1a7367375b9f3d83a4f610789ae159735198
-    Reviewed-on: https://code.wireshark.org/review/18561
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 5aacafb
+commit c6eeecf
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 30 18:47:59 2016 -0700
+Date:   Thu Jun 15 02:14:25 2017 -0700
 
-    Handle -K, -n, -N, and -u in the common dissection option code.
+    Make the short names for USB encspsulation types more regular.
     
-    Also update tfshark to use that code.
+    Have them all be "usb-XXX", where XXX indicates the type of header.
     
-    Change-Id: Ic03fb8ff48c8bfc460298d180b436e53f0076cbe
-    Reviewed-on: https://code.wireshark.org/review/18588
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I7f1bfea7e264b17c57f94c484d64d1cce91b9b78
+    Reviewed-on: https://code.wireshark.org/review/22147
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit ee0dde474c20afb4c493441400926ad7924ca458)
+    Reviewed-on: https://code.wireshark.org/review/22148
 
-commit 706c106
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 30 17:37:10 2016 -0700
-
-    Have the routine that handles dissection options not exit.
-    
-    Have it return TRUE if the option is OK and FALSE if it isn't, and let
-    its caller exit as appropriate.
-    
-    Also, rename it - it's not adding something to a collection, it's just
-    handling the option.
-    
-    Change-Id: I41863cbb67b7c257d900d3011609891b9b4a7467
-    Reviewed-on: https://code.wireshark.org/review/18587
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 45a023f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 30 16:06:24 2016 -0700
-
-    Don't use proto_tree_add_{uint,uint64}() to add signed integer values.
-    
-    Change-Id: I8c5506b746f16e5b79d024be5594cb71f95eced1
-    Reviewed-on: https://code.wireshark.org/review/18584
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 03c6937
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 30 14:07:33 2016 -0700
-
-    Have routines for parsing options that affect dissection.
-    
-    Have them handle -d, -t, --disable-protocol, --disable-heuristic, and
-    --enable-heuristic for TShark and both flavors of Wireshark.
-    
-    Change-Id: I612c276b1f9df8a2092202d23ab3d48be7857e85
-    Reviewed-on: https://code.wireshark.org/review/18583
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e3b2b2f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Oct 30 19:41:26 2016 +0100
-
-    POP: replace wmem_strndup by tvb_memcpy
-    
-    gdd3b977 introduced the use of wmem_strndup to ensure that the string is
-    NULL terminated.
-    But it also stops as soon as it finds a NULL character, which can happen
-    with malformed packets. So let's copy all the bytes with tvb_memcpy and
-    add manually a NULL character at the end of the buffer for safeness.
-    
-    Bug: 13074
-    Change-Id: I9ae65d739a92bc6167e4acfc275e1909f3890815
-    Reviewed-on: https://code.wireshark.org/review/18582
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d8fca58
-Author: Roland Knall <rknall@gmail.com>
-Date:   Sun Oct 30 19:48:16 2016 +0100
-
-    InterfaceList: Fix build without pcap
-    
-    Change-Id: I2b1a955270e7d3fe0097b09517a268263facd1be
-    Reviewed-on: https://code.wireshark.org/review/18580
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit e3b751f
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Oct 30 08:12:17 2016 -0700
-
-    [Automatic update for 2016-10-30]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I192e3989204931901b9890366860abdfddf990a4
-    Reviewed-on: https://code.wireshark.org/review/18577
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 211f321
+commit 6e694c6
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 30 02:08:15 2016 -0700
+Date:   Thu Jun 15 02:05:08 2017 -0700
 
-    Update libssh to 0.7.3.
-    
-    Also, don't try to uninstall it, as CMake helpfully provides no
-    uninstall target.
+    Better names for various USB headers.
     
-    Change-Id: I936a8adeecc3c1f0ca71d044467846ffc33ae7b2
-    Reviewed-on: https://code.wireshark.org/review/18574
+    Change-Id: Iec2126fa1b71d9923ef0fb9ca2a027f7752d71f3
+    Reviewed-on: https://code.wireshark.org/review/22144
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 6f8bc61c3323b959900f125234e7055018d62e4b)
+    Reviewed-on: https://code.wireshark.org/review/22145
 
-commit 670a373
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sat Oct 29 18:08:18 2016 +0100
-
-    dnp3: improve data link layer dissection
-    
-    Improve the dissection of the data chunks.
-    
-    Change-Id: Ic87c84f0c3ea2ccceecb376698eed6b2f6a4e614
-    Reviewed-on: https://code.wireshark.org/review/18566
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 70b2967
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 18 17:10:20 2016 +0200
-
-    wlan_statistics_dialog (Qt): Fix display when there is no packets_
-    
-    Make sure we don't pass an invalid value to PercentBarDelegate. Make
-    sure PercentBarDelegate handles invalid values more gracefully.
-    
-    Change-Id: I18f07542be3432d0fcf5dff479eef2ea4d5e7931
-    Reviewed-on: https://code.wireshark.org/review/18276
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit f184dff
-Author: erikdejong <erikdejong@gmail.com>
-Date:   Thu Oct 20 22:14:50 2016 +0200
-
-    sip: fix Authorization header with mixed quoted parameters
-    
-    Fix to correctly read unquoted parameter values in Authorization lines.
-    Code in master branch will look for double quotes as the end of a
-    parameter value even in case the value is not enclosed in double quotes.
-    This fix checks if the first character in a value is a double quote in
-    which case it will scan until a non-escaped finishing double quote is
-    found to determine the end of the value string. If no double quote is
-    found as the start of the parameter value it will scan for a comma as
-    the end of the value string.
-    
-    Change-Id: I5322caa146d3213bc94ad24528c2fa23cdea10f2
-    Bug: 13035
-    Reviewed-on: https://code.wireshark.org/review/18344
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit c9b5b6c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 28 23:00:24 2016 +0200
-
-    hpfeeds: restore channel name in tree.
-    
-    The channel name is also set in pinfo->match_string to be printed
-    by the json subdissector.
-    
-    Change-Id: I9a1c4576ce6d253ef415bda7392b37f2c063c2db
-    Reviewed-on: https://code.wireshark.org/review/18560
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit b86d72a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Oct 27 20:58:23 2016 -0400
-
-    Allow ampq messages to be bigger than 64k
-    
-    Also fix a field type conflict noticed in provided capture
-    
-    Bug: 13050
-    Change-Id: I3d2643299b6db2729641c72b2e1f054f170b4907
-    Reviewed-on: https://code.wireshark.org/review/18571
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 42f0695
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sat Oct 29 08:59:18 2016 +0200
-
-    Fix two warnings when compiling with rpcap support on macOS.
-    
-    One is an unused variable warning turning error, the other is
-    
-    [ 71%] Building C object ui/CMakeFiles/ui.dir/recent.c.o
-    /Users/jmayer/worktmp/wireshark/git/ui/recent.c:494:23: error: implicit conversion loses integer precision:
-          'glong' (aka 'long') to 'gint' (aka 'int') [-Werror,-Wshorten-64-to-32]
-          rh->auth_type = auth_type;
-                        ~ ^~~~~~~~~
-    1 error generated.
-    
-    Please review.
-    
-    Change-Id: If838f8fa1e8a76dc8c6cc78db495befdd527da92
-    Reviewed-on: https://code.wireshark.org/review/18544
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit b8a766a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 21:38:35 2016 +0200
-
-    DHCPv6: Remove check for Relay Data option about Bulk Leasequery reply
-    
-    Bug: 13025
-    Change-Id: Ie9c12d4f013b5b88b9cce6a09577bc017a3ed655
-    Reviewed-on: https://code.wireshark.org/review/18480
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d1a7ed1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Oct 30 00:14:04 2016 +0200
-
-    OpenFlow 1.4: check length to avoid rewinding offset
-    
-    Bug: 13071
-    Change-Id: Ia9d55212fe8423311222330ed516da35ee9f53de
-    Reviewed-on: https://code.wireshark.org/review/18565
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 929ad38
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Oct 29 20:15:45 2016 +0200
-
-    DCERPC: save strings in wmem file scope
-    
-    Bug: 13072
-    Change-Id: Ib5f3d91be822a3d7180d95e3299dec978941c1d5
-    Reviewed-on: https://code.wireshark.org/review/18564
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1e1679d
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sat Oct 29 16:42:19 2016 +0100
-
-    dnp3: fix indent and variable names
-    
-    Change-Id: I86339a47f78c7b54e57896cc42184a27b5326cb0
-    Reviewed-on: https://code.wireshark.org/review/18563
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 23b79f9
-Author: Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>
-Date:   Fri Oct 28 21:07:48 2016 +0200
-
-    ieee802154: avoid extra dissection on Payload IEs & Cmd ID
-    
-    Bug:13068
-    Change-Id: I4db500030ac2608e57bab4281f44576de9792076
-    Reviewed-on: https://code.wireshark.org/review/18558
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0420dc1
-Author: Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>
-Date:   Fri Oct 28 21:47:38 2016 +0200
-
-    ieee802154: handle multiple slotframe descriptors properly
-    
-    Bug: 13069
-    Change-Id: Ia89b29413b565235c8af40adb5722b9e2528d651
-    Reviewed-on: https://code.wireshark.org/review/18559
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 54bbff9
-Author: Jörg Mayer <jmayer@loplof.de>
-Date:   Sat Oct 29 06:34:17 2016 +0000
-
-    Revert "Instead of supressing the warning of policy 42, set MACOSX_RPATH.":
-    ---------
-    CMake Warning (dev):
-      Policy CMP0042 is not set: MACOSX_RPATH is enabled by default.  Run "cmake
-      --help-policy CMP0042" for policy details.  Use the cmake_policy command to
-      set the policy and suppress this warning.
-    
-      MACOSX_RPATH is not specified for the following targets:
-    
-       epan
-       wiretap
-       wscodecs
-       wsutil
-    
-    This warning is for project developers.  Use -Wno-dev to suppress it.
-    -----------
-    
-    This reverts commit 4728bc201bddc34a7834aedf65704c7aa1c9daf1.
-    
-    Change-Id: I7ea056d56c0352b54be5bebadc35de6173ef593f
-    Reviewed-on: https://code.wireshark.org/review/18562
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 4728bc2
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Oct 28 11:49:06 2016 +0200
-
-    Instead of supressing the warning of policy 42, set MACOSX_RPATH.
-    
-    Fixes picking up the system libpcap instead of the one in /usr/local/lib/
-    
-    Change-Id: I488c8512fc2cde145107062a6e8b7815ad764a3b
-    Reviewed-on: https://code.wireshark.org/review/18545
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 183856f
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Thu Oct 27 17:43:33 2016 +0200
-
-    ISAKMP: Rename identifiers for readability
-    
-    Rename attribute dissecting functions and their local variables to
-    improve code readability, and adjust white space.
-    
-    old                               new
-    ------------------------------------------------------------------
-    dissect_rohc_supported            dissect_rohc_attribute
-    dissect_transform_ike2_attribute  dissect_ike2_transform_attribute
-    option                            attribute
-    optlen                            value_len
-    
-    rohc                              attr_type
-    transform_attr_type               attr_type
-    cfg_attr_type                     attr_type
-    
-    rohc_tree                         tree
-    transform_attr_type_tree          tree
-    cfg_attr_type_tree                tree
-    
-    sub_rohc_tree                     attr_tree
-    sub_transform_attr_type_tree      attr_tree
-    sub_cfg_attr_type_tree            attr_tree
-    
-    rohc_item                         attr_item
-    transform_attr_type_item          attr_item
-    cfg_attr_type_item                attr_item
-    ------------------------------------------------------------------
-    
-    Change-Id: I135e5deb802edc575e7fddd1bb397272aac0888c
-    Reviewed-on: https://code.wireshark.org/review/18553
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d36a0c9
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 28 17:10:02 2016 +0200
-
-    hpfeeds: don't pass channel name to heuristic dissector.
-    
-    Change-Id: Id7dd6e680b1bf798970c513561139bf19891129c
-    Reviewed-on: https://code.wireshark.org/review/18554
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 882a6ac
-Author: Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>
-Date:   Fri Oct 28 17:37:59 2016 +0200
-
-    ICMPv6: resolve type errors on proto_tree_add_bitmask()
-    
-    Bug: 13066
-    Change-Id: Ia00441a6eea49c56f75f1757041bc7732ff32d00
-    Reviewed-on: https://code.wireshark.org/review/18555
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d475519
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Wed Oct 26 17:07:47 2016 +0100
-
-    Implement registration of capture dissectors by name
-    
-    Mirror it after protocol dissector API.
-    
-    Change-Id: I7985bcfa9e07654c7cf005efec94efc205d7a304
-    Reviewed-on: https://code.wireshark.org/review/18496
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 01147f8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 21:09:43 2016 +0200
-
-    LACP: Add HP IRF vendor TLV
-    
-    Change-Id: I8c0d18f104bf37686b9b53ad9e7d1b9f8a709f5c
-    Reviewed-on: https://code.wireshark.org/review/18519
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fa0e6ad
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 09:03:07 2016 +0200
-
-    LACP: Add field for extra bytes (vendor specific)
-    
-    Change-Id: I0b9725ed8972de3cb84215face3bae65eb27d575
-    Reviewed-on: https://code.wireshark.org/review/18518
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b92292b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 08:04:25 2016 +0200
-
-    LACP: Remove if(tree) check
-    
-    and reindent
-    
-    Change-Id: I3c8835f03e52858e7cb3262043a3fc895b1c4d19
-    Reviewed-on: https://code.wireshark.org/review/18517
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8c1a550
+commit 3f3d229
 Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Fri Oct 28 07:37:52 2016 +0200
-
-    MPLS: Mark only Bottom-of-Stack label as flow label
-    
-    When preference 'Assume bottom of stack label as flow label' is set
-    all labels are shown as flow labels. This has to be limited to that
-    MPLS label where Bottom-of-Stack is TRUE.
-    
-    Change-Id: Iaa8abd095edb7de7f745a78c742a9347d4dbf3d9
-    Reviewed-on: https://code.wireshark.org/review/18516
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9c9b866
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 28 12:24:38 2016 +0200
-
-    Qt: fix typo in layout_preferences_frame.
-    
-    Change-Id: I3827557445670c4a5b86b1fde0871c8828e91e68
-    Reviewed-on: https://code.wireshark.org/review/18546
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 77005d3
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Oct 15 20:18:16 2016 +0200
-
-    gsm_abis_om2000: Issue Expert Info when Enable Result != ENABLED
-    
-    The point of sending an Enable Request is to enable the respective MO.
-    If the MO responds with any MO state != ENABLED there is something
-    fishy.  Let's inform the user with some Expert Info about it.
-    
-    Change-Id: Ib33e5dbc37894049b93bb71782787b8c96c04326
-    Reviewed-on: https://code.wireshark.org/review/18454
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 64b5ae0
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Oct 27 17:36:39 2016 -0400
-
-    automake: separate crypt C and header files.
-    
-    Only pass the C files files to checkAPIs (to match cmake and to allow
-    checkAPIs to pass this directory).
-    
-    Change-Id: I305aeaaf1882061bad166957ae83383a0f35dfb7
-    Reviewed-on: https://code.wireshark.org/review/18513
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3b1d991
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Oct 28 14:41:40 2016 +0200
-
-    ANSI IS-637 A: fix decoding of IA5 SMS
-    
-    Give the right buffer to the decoding function
-    
-    Bug: 13065
-    Change-Id: I0e41e04fb68602d95ea6f060c1a37c8b8596134d
-    Reviewed-on: https://code.wireshark.org/review/18548
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3c55e12
-Author: Joakim Karlsson <oakimk@gmail.com>
-Date:   Thu Oct 27 21:18:13 2016 +0200
-
-    diameter: improvement of AVP 18
-    
-    Will now show country and operator
-    
-    Change-Id: Ic16623c226228ab0c3e31d33cda81953c80551d6
-    Reviewed-on: https://code.wireshark.org/review/18512
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 33f8c27
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Oct 27 09:24:06 2016 +0100
-
-    make-version: Clean up handling of VCSVERSION
-    
-    Change-Id: If8228267da4a9290f5abf99c5ac518c3dec0a283
-    Reviewed-on: https://code.wireshark.org/review/18443
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit bdf9916
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:22:30 2016 +0200
-
-    btavdtp: fix fix spelling typo found by lintian
-    
-    Change-Id: I15d4343787a7c6b1c16ca8aa77ef2ddd159e6ef0
-    Reviewed-on: https://code.wireshark.org/review/18543
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 9f564e6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:19:09 2016 +0200
-
-    btatt: fix fix spelling typo found by lintian
-    
-    Change-Id: I405e73d15badfa98c311391f22c57314e83bb9d0
-    Reviewed-on: https://code.wireshark.org/review/18542
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit c553cb1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:16:13 2016 +0200
-
-    bthci_cmd: fix fix spelling typo found by lintian
-    
-    Change-Id: Ic7fd85db374df24358e53be66cd2432dca6a23d2
-    Reviewed-on: https://code.wireshark.org/review/18541
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 90720b3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:15:04 2016 +0200
-
-    carp: fix fix spelling typo found by lintian
-    
-    Change-Id: I6a6b305863d5ecf2de7acad485d8079dca6993f4
-    Reviewed-on: https://code.wireshark.org/review/18540
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8881c60
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:13:56 2016 +0200
-
-    glusterfs: fix fix spelling typo found by lintian
-    
-    Change-Id: I8f9f7b237b0191bbccfd65e3f70bf3f638a7c5ad
-    Reviewed-on: https://code.wireshark.org/review/18539
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bb85c6b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:13:00 2016 +0200
-
-    diameter_3gpp: fix fix spelling typo found by lintian
-    
-    Change-Id: Ibee969abd9d393a7d5b4c6ab5b2eb204f54654a1
-    Reviewed-on: https://code.wireshark.org/review/18538
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 78c0516
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:09:35 2016 +0200
-
-    FIX: fix fix spelling typo found by lintian
-    
-    Change-Id: I090457663759a5ee012402ef746d358aacfbe08c
-    Reviewed-on: https://code.wireshark.org/review/18537
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 12611c6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:07:26 2016 +0200
-
-    RSVP: fix fix spelling typo found by lintian
-    
-    Change-Id: I191473b1b95b293665b5617721c33ce978f5ce08
-    Reviewed-on: https://code.wireshark.org/review/18536
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1f1c16e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:06:07 2016 +0200
-
-    gsm_rlcmac: fix fix spelling typo found by lintian
-    
-    Change-Id: I949067c5f18f48ba954e54e6ca0c224744f85e41
-    Reviewed-on: https://code.wireshark.org/review/18535
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8f92ca7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:05:03 2016 +0200
-
-    hartip: fix fix spelling typo found by lintian
-    
-    Change-Id: I89798a1dc1931ce44bc511da90726ff27ddfe583
-    Reviewed-on: https://code.wireshark.org/review/18534
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8ab6d8b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:04:37 2016 +0200
-
-    usb-audio: fix fix spelling typo found by lintian
-    
-    Change-Id: I853bc068cfca477c2ec5968d8b9a17873ec8011c
-    Reviewed-on: https://code.wireshark.org/review/18533
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 63b6eab
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:02:29 2016 +0200
-
-    ieee802154: fix fix spelling typo found by lintian
-    
-    Change-Id: I0d3d56447aab6f012338016875bc05a9eaf3a2be
-    Reviewed-on: https://code.wireshark.org/review/18532
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 236f25d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:01:53 2016 +0200
-
-    RADIUS: fix fix spelling typo found by lintian
-    
-    Change-Id: Iea8c96064c39d0e4aee5db6c72a8c120c56e495e
-    Reviewed-on: https://code.wireshark.org/review/18531
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 120e515
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:00:47 2016 +0200
-
-    homeplug-av: fix fix spelling typo found by lintian
-    
-    Change-Id: If75ea5e7e9ce16d270244f2a5aac86ad3abb30eb
-    Reviewed-on: https://code.wireshark.org/review/18529
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4eb3f7f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 17:59:46 2016 +0200
-
-    NTLMSSP: fix fix spelling typo found by lintian
-    
-    Change-Id: I1f4c9340fcb33e2d92fc3d85d2e212da0ab6e1e2
-    Reviewed-on: https://code.wireshark.org/review/18528
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1fd33fd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 17:59:08 2016 +0200
-
-    WAI: fix fix spelling typo found by lintian
-    
-    Change-Id: I3d468c3b1ff0eb79136bc07859442ebd184c456f
-    Reviewed-on: https://code.wireshark.org/review/18527
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d3290b5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 17:58:39 2016 +0200
-
-    SSL: fix fix spelling typo found by lintian
-    
-    Change-Id: Ied94f5fa5858fd6d9da7183eb05e32430554ec33
-    Reviewed-on: https://code.wireshark.org/review/18526
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3aba4d5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 17:57:17 2016 +0200
-
-    mausb: fix fix spelling typo found by lintian
-    
-    Change-Id: I23c5b35d4d55c3d1c78b9a631a1eb728ecf365fa
-    Reviewed-on: https://code.wireshark.org/review/18525
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2c0cfe3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 17:56:18 2016 +0200
-
-    MIH: fix fix spelling typo found by lintian
-    
-    Change-Id: Ie8000bfaf086582f36dd88a06cb0b01e0a377096
-    Reviewed-on: https://code.wireshark.org/review/18524
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f668368
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 17:55:26 2016 +0200
-
-    OSPF: fix fix spelling typo found by lintian
-    
-    Change-Id: I8058a9277163fbcdb5ad2e67b44bf0d4e3ea2283
-    Reviewed-on: https://code.wireshark.org/review/18523
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1408f96
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 18:01:16 2016 +0200
-
-    mac-lte: fix fix spelling typo found by lintian
-    
-    Change-Id: Ifeff48a14f06e58a4e667d5b9f343b5bfc61911a
-    Reviewed-on: https://code.wireshark.org/review/18530
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit cad7665
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 17:54:41 2016 +0200
-
-    CMAkelists: fix typo on comment
-    
-    Change-Id: I572ebbbae9ac91e2d566a39d0dae462bc40bcac8
-    Reviewed-on: https://code.wireshark.org/review/18522
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c9f1a60
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 17:53:34 2016 +0200
-
-    quic: fix fix spelling typo found by lintian
-    
-    Change-Id: Ifeadd5f7b9760e0ce2a58b2c1a3c497bc5f4cda0
-    Reviewed-on: https://code.wireshark.org/review/18521
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5b9934c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 17:51:48 2016 +0200
-
-    rpcrdma: fix fix spelling typo found by lintian
-    
-    Change-Id: If057ecf07b6707a5b72b8a29ccf6388b16f4826a
-    Reviewed-on: https://code.wireshark.org/review/18520
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dd3b977
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Oct 27 21:28:17 2016 +0200
-
-    POP: ensure that line buffer is NULL terminated
-    
-    Bug: 13054
-    Change-Id: Id3bdbaa1b8d6d445daaa66d922bac74ec097b79b
-    Reviewed-on: https://code.wireshark.org/review/18511
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 6500a66
-Author: Roland Knall <rknall@gmail.com>
-Date:   Tue Oct 25 14:27:56 2016 +0200
-
-    ManageInterfacesDialog: New handling of pipes
-    
-    This moves the handling of pipes to the new InterfaceTreeModel as well.
-    It also includes a new PathChooserDelegate and cache handling for adding
-    data to an interface list without putting it into storage
-    
-    Change-Id: Id255a81161b4da517e26127abe8ea7f5eb36d55a
-    Reviewed-on: https://code.wireshark.org/review/18497
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 1fae142
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Oct 27 23:41:51 2016 +0200
-
-    merge.c: do not give a NULL pointer when saving SHB comment option
-    
-    Bug: 13060
-    Change-Id: Ib3dd019f73305e4006b312d324502e4a138c6a16
-    Reviewed-on: https://code.wireshark.org/review/18514
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7dfaab3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Oct 24 16:15:22 2016 +0200
-
-    checkAPI: move atoi from soft-deprecated to prohibited.
-    
-    The atoi function has been completely removed from the tree.
-    It's still present in the GTK code, but, since GTK compilation
-    has been removed in the default, checkAPI target doesn't complain,
-    as well as the buildbot.
-    
-    Change-Id: I436d6f333b99b9188734155c1f92273420354947
-    Reviewed-on: https://code.wireshark.org/review/18432
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit f347af2
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Oct 24 16:04:02 2016 +0200
-
-    ajp13: remove unused variable.
-    
-    Also add expert info for failing conversion.
-    
-    Change-Id: I75bb385c430527e41775822ab0495684ab660c08
-    Reviewed-on: https://code.wireshark.org/review/18431
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 64279d3
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Oct 15 20:04:41 2016 +0200
-
-    gsm_abis_om2000: Introduce expert info for unusual situations
-    
-    In OM2000, it is not usual to receive NACK, REJECT or "performed not
-    according to request" type messages.  Let's highlight them using expert
-    info as a convenience to the user.
-    
-    Change-Id: I47b865c32fd9ec82ec63699babd31f3849f3006c
-    Reviewed-on: https://code.wireshark.org/review/18453
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 94b4617
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 25 14:32:44 2016 +0200
-
-    wsutil: add check for input pointers to ws_strtoi functions.
-    
-    Change-Id: I7353a3b00392aa606fad04ef76e8b18ffbabbf5e
-    Reviewed-on: https://code.wireshark.org/review/18449
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 428c631
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 07:44:54 2016 +0200
-
-    gsm_abis_om2000: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I980d684676a9c21afe0dced75a35cc40a962619f
-    Reviewed-on: https://code.wireshark.org/review/18499
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 24895a0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 08:24:10 2016 +0200
-
-    s7comm: fix fix spelling typo found by lintian
-    
-    Change-Id: I38da03260d082aaf977f4f32e9206d07e55c1432
-    Reviewed-on: https://code.wireshark.org/review/18509
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7466f39
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 08:21:36 2016 +0200
-
-    openwire: fix spelling typo found by lintian
-    
-    Change-Id: I586edf633cf3a5b1e95ade69727d5f70e9ff7bf4
-    Reviewed-on: https://code.wireshark.org/review/18508
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1643e37
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 08:20:57 2016 +0200
-
-    gsm_abis_om2000: fix spelling typo found by lintian
-    
-    Change-Id: Ie52831aa218551e0f55d5479f47cc7cf92c2b069
-    Reviewed-on: https://code.wireshark.org/review/18507
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d3a9f62
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 08:19:50 2016 +0200
-
-    simple: fix spelling typo found by lintian
-    
-    Change-Id: I39cfc929466418f73b5a019d0c2df4315d879ced
-    Reviewed-on: https://code.wireshark.org/review/18506
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cfa159e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 08:18:49 2016 +0200
-
-    smb2: fix spelling typo found by lintian
-    
-    Change-Id: If633d15b34b14f548d2b67c5913685e6587aa98d
-    Reviewed-on: https://code.wireshark.org/review/18505
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 832852f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 07:47:40 2016 +0200
-
-    gryphon (plugins): fix spelling typo found by lintian
-    
-    Change-Id: I82f87f809ff0a261dacf38a2fb52aa4788403490
-    Reviewed-on: https://code.wireshark.org/review/18500
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 908fd98
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 08:15:34 2016 +0200
-
-    wkssvc(dcerpc): fix spelling typo found by lintian
-    
-    Change-Id: I899cd6fd108ff7fe3ec8908e8cd575c2dc520735
-    Reviewed-on: https://code.wireshark.org/review/18504
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 43ae42d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 07:51:47 2016 +0200
-
-    ncp: fix spelling typo found by lintian
-    
-    Change-Id: Ib6f44590671ac48461b09af7e297dc5737c3459f
-    Reviewed-on: https://code.wireshark.org/review/18503
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 38bf499
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 07:50:19 2016 +0200
-
-    docsis (plugins): fix spelling typo found by lintian
-    
-    Change-Id: I730c8df46165d4778174d6931785765d2434d14d
-    Reviewed-on: https://code.wireshark.org/review/18502
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4f39ed9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 27 07:48:46 2016 +0200
-
-    ethercat (plugins): fix spelling typo found by lintian
-    
-    Change-Id: I85a86953c89979e975e178fed1ae13dddab304d0
-    Reviewed-on: https://code.wireshark.org/review/18501
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 978cbf0
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Oct 21 21:52:51 2016 +0200
-
-    gsm_abis_pgsl: make Incremental Redundancy (IR) IEs conditional
-    
-    There are some IEs in the Downlink Data Indication which are
-    conditional.  As the condition cannot be found in the packets
-    themselves (to my knowledge), let's introduce a preference.
-    
-    Change-Id: I408c73e5f48018d3ea4ebcacb7bd94358a9eaac5
-    Reviewed-on: https://code.wireshark.org/review/18482
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 565f1b1
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Oct 26 20:33:10 2016 -0400
-
-    Fix compile errors in GTK build
-    
-    Change-Id: Ib28c63e0ead6950b3b11b7c87adc543f80c070ed
-    Reviewed-on: https://code.wireshark.org/review/18498
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5c82f91
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 22:06:41 2016 +0200
-
-    bthci_cmd: fix spelling typo found by lintian
-    
-    Change-Id: I6ebc828eb7eafd3ca41275a9b0b9b45a0994a7d3
-    Reviewed-on: https://code.wireshark.org/review/18493
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4e31c0c
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Oct 26 14:28:00 2016 -0700
-
-    Qt: WLAN Statistics performance improvements.
-    
-    In the WLAN statistics dialog, add our stations to the tree in the
-    background. This returns control to the user immediately after tapping.
-    
-    Add notes about further performance improvements.
-    
-    Change-Id: Ie7ff818b8d835ecb38f5ff702a0d0e8f2635abb2
-    Reviewed-on: https://code.wireshark.org/review/18495
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 7a09f52
-Author: Dave Pifke <dave@pifke.org>
-Date:   Wed Oct 26 08:56:18 2016 +0200
-
-    packet-mbtcp: Allow decode as Modbus RTU over USB
-    
-    Modbus RTU is typically seen over serial links, which can be captured
-    by sniffing USB traffic.  This patch enables decoding USB payloads as
-    Modbus RTU.
-    
-    Bug: 13055
-    Change-Id: I70d970760aa1b37b0f56dda9d3384e72d27c9d0a
-    Reviewed-on: https://code.wireshark.org/review/18468
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c52d920
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 21:45:02 2016 +0200
-
-    Driver.pm (pidl): fix spelling typo found by lintian
-    
-    Change-Id: Idb288beb54c91e100c164e0026b39bfe27daec39
-    Reviewed-on: https://code.wireshark.org/review/18485
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1a7e21d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 21:53:59 2016 +0200
-
-    wccp: fix spelling typo found by lintian
-    
-    Change-Id: I9ce35505d4b35e2c2bcacd13eca075005e05c307
-    Reviewed-on: https://code.wireshark.org/review/18488
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8d0af2f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 25 11:52:28 2016 +0200
-
-    Gtk: remove atoi calls and use ws_strtoi functions.
-    
-    Change-Id: Ie38bdd27d9e3810e3a64b985dfd5621a3aa6d073
-    Reviewed-on: https://code.wireshark.org/review/18445
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dab4ea5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Oct 26 21:06:58 2016 +0200
-
-    Update libssh to 0.7.3
-    
-    Change-Id: Ib5f93d0e3be2866e665713af3a1fa95a4f3253b7
-    Reviewed-on: https://code.wireshark.org/review/18481
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3a05d00
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 22:05:18 2016 +0200
-
-    synphasor: fix spelling typo found by lintian
-    
-    Change-Id: I9ab5b6c20b544ec09f808cee62a3aa611baf3dae
-    Reviewed-on: https://code.wireshark.org/review/18492
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit ddaf566
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 22:04:04 2016 +0200
-
-    spice: fix spelling typo found by lintian
-    
-    Change-Id: Ie558ae44a8978cc61679ffeb4b2c1c800b2d6371
-    Reviewed-on: https://code.wireshark.org/review/18491
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 752c2dd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 22:01:19 2016 +0200
-
-    u3v: fix spelling typo found by lintian
-    
-    Change-Id: I03f79e4502694042a78762f4711712a31f7ca028
-    Reviewed-on: https://code.wireshark.org/review/18490
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 133031d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 21:58:30 2016 +0200
-
-    uds: fix spelling typo found by lintian
-    
-    Change-Id: I78efa2fd9d3a4d1261f0276af85329ee05dbb5e3
-    Reviewed-on: https://code.wireshark.org/review/18489
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 39bfca1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 21:52:55 2016 +0200
-
-    mpeg-audio: fix spelling typo found by lintian
-    
-    Change-Id: Ie4f5db3f3f07388d3a6194839e33c939dbc0e92d
-    Reviewed-on: https://code.wireshark.org/review/18487
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a92058e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 21:47:23 2016 +0200
-
-    ncp2222.py: fix spelling typo found by lintian
-    
-    Change-Id: If077e05568efc4dc8981da9558047fe147b5d139
-    Reviewed-on: https://code.wireshark.org/review/18486
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 4d368de
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 26 21:44:25 2016 +0200
-
-    wslua_pref(.c): fix spelling typo found by lintian
-    
-    Change-Id: Ie371e144a9b385d893ead67c03688841039b8319
-    Reviewed-on: https://code.wireshark.org/review/18484
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ecfee35
-Author: Anders <anders.broman@ericsson.com>
-Date:   Wed Oct 26 16:30:57 2016 +0200
-
-    [DTAP] Add an expert info when DTAP_TIE_PRES_MASK is there and the length
-    is less than 3.
-    
-    Bug 13052
-    Change-Id: I62aabf93059ec763eff629125084a45aba84cb3a
-    Reviewed-on: https://code.wireshark.org/review/18474
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 5afe1a7
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Oct 26 10:15:07 2016 -0700
-
-    Qt: Set uniformRowHeights for some of our trees.
-    
-    Set the uniformRowHeights property for a few of our QTreeWidgets. This
-    can improve performance, particularly when we have many items.
-    
-    Change-Id: I2685646a533aa7accfb3a8578b5198894d873fb2
-    Reviewed-on: https://code.wireshark.org/review/18476
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a7bc4b8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 26 11:16:26 2016 -0700
-
-    Properly align the text in an error message.
-    
-    Change-Id: Id8081c26bbe1349f9a7c89daf1188ba9de7da210
-    Reviewed-on: https://code.wireshark.org/review/18477
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5134cf1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Oct 26 17:21:20 2016 +0200
-
-    quakeworld: fix a complain from gcc 4.4.7
-    
-    This is not a real issue, but that old version of gcc still
-    complains about it.
-    
-    Change-Id: I5d13c5e906a560d31b6f8da0b7c58302104985ff
-    Reviewed-on: https://code.wireshark.org/review/18475
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5172ec9
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Oct 15 22:02:47 2016 +0200
-
-    gsm_abis_om2000: Add very basic dissection of "MO Record"
-    
-    The MO Record is returned in response to a Capabilities Request and
-    describes the capabilities of he MO in more detail.  The exact coding of
-    the contents is not yet known at this point.
-    
-    Change-Id: Iddfe60d286a85585bec58d340bdee793d3bfca2e
-    Reviewed-on: https://code.wireshark.org/review/18456
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 61e3569
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Tue Oct 25 15:46:21 2016 +0200
-
-    L2TP: Dissect three formerly unknown bytes in Ericsson Transport Cfg
-    
-    The meaning of the last three bytes of a Transport configuration has
-    been uncovered: They control the batching/bundling of signalling
-    messages: All signalling messages are delayed + bundled until either
-    the timeout expires, or the message exceeds the limit.
-    
-    Change-Id: I794658e99e3c66145627652de4269fb08bc74ca3
-    Reviewed-on: https://code.wireshark.org/review/18471
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 88868c9
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Oct 26 14:18:30 2016 +0200
-
-    qt: fix build without pcap_create
-    
-    Fixes a build failure on the OS X buildbot which has libpcap disabled.
-    
-    Change-Id: I5564c0e3f2097cb45905bb503f45bb03561bf748
-    Fixes: v2.3.0rc0-1237-g6eee29b ("InterfaceTreeList: Enable all editable columns")
-    Reviewed-on: https://code.wireshark.org/review/18472
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 41c4cd8
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Wed Oct 26 03:11:04 2016 -0400
-
-    packet-infiniband: Add support to sub dissect CM messages private data
-    
-    1. This patch enables sub dissectors to parse RTU, REJ,
-    DREQ, DRSP CM messages private data.
-    (Sub dissection for CM REQ and RSP private data was
-    already present).
-    
-    2. For dissecting non CM data specific packets, connection
-    context needs to be active until connection is closed. So instead of
-    removing hash table entry during CM response message,
-    it keeps it around until DRSP (when connection is closed).
-    
-    3. This patch moves CM messsage dissection to their individual
-    functions for cleanup, so that main parser remains readable code.
-    
-    4. created smaller functions for reusing in different message parsing
-    functions.
-    
-    REQ, RSP, DREQ, DRSP message are tested.
-    REJ is untested.
-    
-    Change-Id: I3b4695402d1dbe93fc003d4b43424ae0aa96ba43
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/18469
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d0bb041
-Author: Anish Bhatt <anish@gatech.edu>
-Date:   Tue May 31 02:50:36 2016 -0400
-
-    Add support to dissect iperf2 packets
-    
-    Change-Id: Ieb36a77a98da1ce6e5de34010806cdc05f8e6533
-    Reviewed-on: https://code.wireshark.org/review/15637
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anish Bhatt <anish@gatech.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ca2dc53
-Author: Roland Knall <rknall@gmail.com>
-Date:   Wed Oct 26 10:03:50 2016 +0200
-
-    InterfaceList: Make storing preferences optional
-    
-    If multiple proxy models are used, not all should change
-    the preferences if types are being displayed or hidden. Only
-    the main list should have that option.
-    
-    Change-Id: I8617e402b6608eda98d7ecc0167cd0ccc3c43eaa
-    Reviewed-on: https://code.wireshark.org/review/18470
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 6eee29b
-Author: Roland Knall <rknall@gmail.com>
-Date:   Tue Oct 25 11:26:26 2016 +0200
-
-    InterfaceTreeList: Enable all editable columns
-    
-    In preparation for moving to the new interface list, adding all
-    necessary editors and changes to allow all columns, which are being
-    handled by CaptureInterfacesDialog or ManageInterfacesDialog to be
-    edited correctly
-    
-    Change-Id: I8bfabff92a07950c74a4d7243dadd99ecd2024f4
-    Reviewed-on: https://code.wireshark.org/review/18446
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit dcb49539d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Oct 25 16:13:35 2016 -0400
-
-    ICMPv6: Convert flag fields to use proto_tree_add_bitmask
-    
-    Change-Id: Ib037b8ac6e16901408597696e1d4cd8cc95b2230
-    Reviewed-on: https://code.wireshark.org/review/18465
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7719bd5
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Tue Oct 25 15:36:06 2016 +0200
-
-    L2TP: Fix decoding of SC-TEI Map in Ericsson ALTCRQ
-    
-    The SuperChannel-TEI maps in the Abis Lower Transport Config Request
-    were not properly displayed due to an erroneous additional offset
-    increment.
-    
-    Change-Id: Ieebc43cd73f0c939daad2f853edeed854a12e5f5
-    Reviewed-on: https://code.wireshark.org/review/18463
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2eb823f
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Oct 22 15:25:27 2016 +0200
-
-    l2tp: Dissect multiple Ericsson Transport Config Groups
-    
-    ... and put each group into a separate subtree.  Also, put each item of
-    a TEI to SC map into its own subtree.
-    
-    Change-Id: Id4cdaa883fa3eacdd53284b284bce5e67c97fcfb
-    Reviewed-on: https://code.wireshark.org/review/18462
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 00e2198
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sun Oct 16 14:08:42 2016 +0200
-
-    gsm_abis_tfp: Detect + display AMR rate based on payload length
-    
-    Change-Id: I1af7e3be87da9416ded02b09c480ea69ec58afff
-    Reviewed-on: https://code.wireshark.org/review/18459
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 14 22:55:02 2017 +0200
 
-commit 470a44a
-Author: Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>
-Date:   Tue Oct 25 14:27:47 2016 +0200
-
-    ICMPv6: fix dissection of MPL (dissect_mpl_control)
-    
-    An MPL Seed Info of 2 bytes length (length_of_fixed_part), which does
-    not have seed-id nor buffer-mpl-messages, is compliant and should be
-    accepted.
-    
-    Bug:13045
-    Change-Id: I6c4c8864fdc8d6e590a5d28d68e5aaff8c1535c3
-    Reviewed-on: https://code.wireshark.org/review/18448
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 149627a
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Oct 15 19:16:39 2016 +0200
-
-    gsm_abis_om2000: Decode the IWD Type/Gen/Rev in Negotiation Request
-    
-    The Negotiation Request and Negotiation Requeset ACK contain IWD (Inter
-    Working Document) revision numbers for the different A-bis protocols
-    OML, RSL, GSL (GPRS) and TRA (TRAU).  Decode them in a way suitable
-    for human consumption.
-    
-    Change-Id: I5b11e64ca252b7349900ba5b700c2faefd568441
-    Reviewed-on: https://code.wireshark.org/review/18452
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1e65231
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Oct 22 14:42:58 2016 +0200
-
-    packet-ehdlc: Decode details of XID messages
-    
-    We so far only dumped the XID as raw hex bytes.  Now we actually decode
-    the header and internal data structure of the XID.
-    
-    Change-Id: I2901486222d84166291e071bc07cb82a2f480974
-    Reviewed-on: https://code.wireshark.org/review/18461
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3e82f42
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Fri Oct 21 20:45:59 2016 +0200
-
-    gsm_abis_om2000: Dissect TLV structure of 0xa3/0xa5/0xa6 TLVs
-    
-    We have no idea what those TLVs are, but the message hex-dumps clearly
-    indicate a 8-bit tag followed by 8-bit length and then 'length' amount
-    of bytes, so we can at least dissect that high-level structure for now.
-    
-    They appear in equally unknown message type 0x126, which appears to be
-    sent in intervals of 300s by the RBS.
-    
-    Change-Id: I91817eb20de1a4557399235c1fc42b638b9c935b
-    Reviewed-on: https://code.wireshark.org/review/18460
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 517e777
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Oct 25 21:19:26 2016 +0200
-
-    NAS EPS: use E212_TAI fields for TAI and TAI List Information Elements
-    
-    Change-Id: If53bfea77ad27b41823d3a653513b71604b92d49
-    Reviewed-on: https://code.wireshark.org/review/18464
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 40ce00f
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sun Oct 16 14:07:39 2016 +0200
-
-    gsm_abis_tfp: Fix bit-mask for frame type
-    
-    The frame type is only a select number of bits in the given byte,
-    so we must make sure to mask all other bits away using 0x1E.
-    
-    Change-Id: I6c7a1a256bd93b6e5149f50ed64f033836a26673
-    Reviewed-on: https://code.wireshark.org/review/18458
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 180cbcf
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Oct 15 22:01:51 2016 +0200
-
-    gsm_abis_om2000: Add "TG" and "DP" MO Class names
-    
-    Change-Id: Ice9d0601b2b1aa0691b7fcacaf61b4e287c7725c
-    Reviewed-on: https://code.wireshark.org/review/18455
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ff41263
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Oct 15 23:26:17 2016 +0200
-
-    packet-rsl: Add some extensions to RSL shared by Osmocom + Ericsson
-    
-    Activation of (dynamic) PDCH uses some slight extensions of the
-    definitions found in 3GPP TS 48.058 when used on Ericsson RBS2000 or
-    Osmocom OsmoBTS.
-    
-    The extensions are backwards-compatible, so I don't think it's worth to
-    introduce a preference for this.
-    
-    Change-Id: I8e28d75bd8be15044a605ced8825b9b074ffbb22
-    Reviewed-on: https://code.wireshark.org/review/18457
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d8db564
-Author: Snaipe <franklinmathieu@gmail.com>
-Date:   Tue Oct 25 00:56:37 2016 +0200
-
-    lua: Added support for FT_IPv6 fields
-    
-    * Implement Tvb:ipv6()
-    * Handle FT_IPv6 protofields during insertion in the lua tree
-    * Implement Address.ipv6(hostname)
+    Miscellaneous texual corrections and addition
     
-    Change-Id: I585c392681b3aef02ed8ee956f74051d77fb28d4
-    Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
-    Reviewed-on: https://code.wireshark.org/review/18442
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 60a926d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Oct 22 21:13:14 2016 +0200
-
-    pop: use ws_strtoi function.
+    Correct some symbolic references in source file comments
+    and add a note about the CMake configuration options.
     
-    Change-Id: Icaaa73a0dc9e0ffb7a1c37de9138857c45dcc56c
-    Reviewed-on: https://code.wireshark.org/review/18400
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 346bda4
-Author: Hessam Jalali <hessam.jalali@gmail.com>
-Date:   Tue Oct 25 11:59:54 2016 +0330
-
-    e212: added 3 new filters (CGI, ECGI, TAI)
-    
-    Added these new filters to enhance mcc/mnc filtering in GTP protocol.
-    
-    Change-Id: I595b5fde4fa358886fbe5c58f6ecab496d9ef08c
-    Reviewed-on: https://code.wireshark.org/review/18444
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Idb670a2c798c2a52cdce142340ce8fc5a2022508
+    Reviewed-on: https://code.wireshark.org/review/22138
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c63f895
-Author: ruengeler <ruengeler@wireshark.org>
-Date:   Wed Oct 19 17:10:53 2016 +0200
-
-    SCTP: find right assoc id
-    
-    Change-Id: I107b7f4c585ef5e080d6473a37b3db9a97f12365
-    Reviewed-on: https://code.wireshark.org/review/18325
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ae88dbc
-Author: erikdejong <erikdejong@gmail.com>
-Date:   Sat Oct 22 11:32:51 2016 +0200
-
-    Qt: Enhancements to VoIP call dialog:
-    
-    1) Added checkbox to toggle format in start and stop time columns from
-    relative time to time of day.
-    2) Added column to show duration of call in between the protocol and
-    packets column.
-    
-    Change-Id: I56347fa36885e3a71646e2c9cdde2b8b5fb88846
-    Reviewed-on: https://code.wireshark.org/review/18383
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5b216db
-Author: Hessam Jalali <hessam.jalali@gmail.com>
-Date:   Mon Oct 24 12:55:29 2016 +0330
-
-    e212: fix for e212.sai in GTP packet
-    
-    geo location type 1 represents SAI, but for GTP v1 it is returned as e212, hence not aggregating with GTP v2
-    the patch also opens up a way to add e212.cgi (Cell Global Identity) which is shared between GTP vesions.
-    
-    Change-Id: I853cd26037533aac2735b9d965793362c16f3f04
-    Reviewed-on: https://code.wireshark.org/review/18428
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 2a5cb8e32e31ed0fb64b97318dd38470886d9154)
+    Reviewed-on: https://code.wireshark.org/review/22142
 
-commit 446dbea
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Mon Oct 24 11:31:25 2016 -0400
-
-    Fix a couple typos in the Diameter XML.
-    
-    Also:
-     - Move new T6a/T6b AVPs into TGPP.xml (to keep them all together).
-     - Put back a comment that was (accidentally?) deleted; add some similar notes
-       in other places.
-    
-    Change-Id: I2a468aa3be0069cd8124dd9e5b0a27e333849059
-    Reviewed-on: https://code.wireshark.org/review/18433
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2695053
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 24 21:31:57 2016 +0200
-
-    semcheck: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I000f9df1e41cab7fa0132153ff95caf31f3f6a6a
-    Reviewed-on: https://code.wireshark.org/review/17892
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 04761f2
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Oct 22 22:33:23 2016 +0100
-
-    Add wmem_list_find_custom()
-    
-    Change-Id: I5c4f85df0a1899d629386581de2c2c3ec0812d54
-    Reviewed-on: https://code.wireshark.org/review/18440
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 79de3f5
+commit 588c1f5
 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sun Oct 16 04:26:14 2016 +0100
+Date:   Wed Jun 14 21:01:11 2017 +0100
 
-    packet.c: split register_dissector into two separate functions
+    RADIUS: Fix dissection for non-default VSA lengths
     
-    Allows for better code reuse.
-    
-    Change-Id: I0f929e2548cf60905285d62c1095f85565a1c147
-    Reviewed-on: https://code.wireshark.org/review/18439
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 749ffd9
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Oct 10 21:07:39 2016 +0100
-
-    Remove some code duplication in packet.c
-    
-    Change-Id: I60d71e0e4e7f3c35bec33910ecf4230569a1718c
-    Reviewed-on: https://code.wireshark.org/review/18438
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit e226abd
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Wed Oct 19 05:57:23 2016 +0100
-
-    Parenthesize HFILL_INIT macro properly
-    
-    Change-Id: Ib1c347a290f57a1173c876de6e3c6cb6f5a1ca19
-    Reviewed-on: https://code.wireshark.org/review/18436
+    Ping-Bug: 13745
+    Change-Id: I1c9f69d0015ba9bea16d8300fbfd85abe110f829
+    Reviewed-on: https://code.wireshark.org/review/22136
     Reviewed-by: João Valverde <j@v6e.pt>
-
-commit b558737
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Oct 22 14:25:35 2016 -0400
-
-    Overhaul AMQP dissector
-    
-    1. Remove AMQP_INCREMENT macro.  Bounds checking mostly handled already
-    by proto_tree_add_xxx and tvb_get_xxx.  Needed to add a few more
-    tvb_reported_length_remaining() calls for completeness.
-    2. Fill in some of the gaps of unaccounted for bytes.  Still have way
-    too many instances where bytes aren't claimed by a field.
-    3. Some small reordering of functions allowed for massive removal of
-    formal declarations.
-    4. Add amqp_0_10_get_32bit_size_new to add a field, check for size and
-    add expert info if size > 0xFFFF
-    5. Remove "hf_" from list type items as they are not real hf_ fields
-    and could cause confusion.  Also made items static.
-    6. Convert some FT_STRING and FT_BYTES fields to FT_UINT_STRING and
-    FT_UINT_BYTES.  Helps account for some "missing" bytes.
-    
-    Change-Id: I7ed269221d294ce89feacc0642b2070681288172
-    Reviewed-on: https://code.wireshark.org/review/18423
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit e3ecb93
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Mon Oct 24 11:43:25 2016 -0400
-
-    packet-infiniband: Added support to dissect ip cm request private data
-    
-    This patch adds support to dissect 36 bytes of private data of Table 560
-    of spec 1.3.1 whenever CM request message is of IP CM type.
-    
-    Change-Id: I66b65b066a0034cf95c4c4f38549882c265b7ef5
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/18434
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit a9ec5f8
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sun Oct 23 09:51:16 2016 +0100
-
-    IPv6: Remove some duplicate address code
-    
-    Change-Id: I3736d7f40479a05130db9da3032a952633180b0e
-    Reviewed-on: https://code.wireshark.org/review/18426
+    (cherry picked from commit 9ed4046e0f3e8872c3adec3f11376ee392834525)
+    Reviewed-on: https://code.wireshark.org/review/22139
     Petri-Dish: João Valverde <j@v6e.pt>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit def19ee
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Mon Oct 24 10:17:08 2016 +0200
-
-    Update several AVPs according to latest 3GPP TS
-    
-    Change-Id: Iada3166c93801d3f693714ad8c08bd4f68a70d3e
-    Reviewed-on: https://code.wireshark.org/review/18425
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 7de4c23
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Oct 22 21:28:40 2016 +0200
-
-    Qt: use ws_strtou function in sctp_chunk_statistics_dialog.
-    
-    Change-Id: Iffa2d633ef7a0f636c595fb05ad1790d1ea61df0
-    Reviewed-on: https://code.wireshark.org/review/18402
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8be90aa
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Oct 22 21:05:00 2016 +0200
-
-    ajp13: use ws_strtoi function.
-    
-    Change-Id: Ibe85cbb993eba8e76ed6c645609e9cea114a6c9d
-    Reviewed-on: https://code.wireshark.org/review/18399
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4f94dce
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Oct 22 20:59:44 2016 +0200
-
-    catapult: use ws_strtou function.
-    
-    Change-Id: Iceaa2e0240a86dd6aed087617c0a3200b3170d38
-    Reviewed-on: https://code.wireshark.org/review/18398
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit cd64e4e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 24 02:19:50 2016 -0700
-
-    Move --fullscreen out of LONGOPT_CAPTURE_COMMON.
-    
-    It's not a capture option, so it doesn't belong there.
-    
-    Change-Id: I8aa6719a5a8e90c734c7acfc01b1ba2818498de3
-    Reviewed-on: https://code.wireshark.org/review/18427
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3acf73e
-Author: franciscojavier.sanchezroselly <franciscojavier.sanchezroselly@ujaen.es>
-Date:   Fri Sep 23 14:32:01 2016 +0200
-
-    ICMPv6: Add support for LLN Routing Metrics (RFC 6551)
-    
-    Bug: 12951
-    Change-Id: I0b1985699ae853a295c1ddbe38d2861ed9cac21d
-    Reviewed-on: https://code.wireshark.org/review/17889
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit c786aa5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 24 01:15:59 2016 -0700
-
-    Fix a copy-and-pasteo.
-    
-    Fix the handling of the case of a "matches" operator with a field and a
-    character constant as operands.
-    
-    Change-Id: I6451cee907d8486db96937173d0098de91ce7956
-    Reviewed-on: https://code.wireshark.org/review/18424
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 681b97a
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Oct 4 09:10:38 2016 +0200
-
-    Qt: Make horizontal spacer size to be fixed
-    
-    The Search Frame can be used to find frames by a display filter
-    expression that can be very long, so stretch a text field instead
-    of free space.
-    
-    Example of a display filter expression that can be used in
-    the "search bar":
-    bthci_cmd.opcode == 0x200d || bthci_evt.le_meta_subevent == 0x0a
-    
-    Change-Id: I52b30386e96a726824c25a926742a24d653dfcfe
-    Reviewed-on: https://code.wireshark.org/review/18234
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 3b502c8
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Oct 22 23:29:56 2016 +0200
-
-    Qt: fix possible crash on sorting custom columns
-    
-    The sorting function must maintain a strict weak ordering, otherwise it
-    may result in crashes. In the case of custom columns, this was violated
-    when exactly one of the two rows had a non-numeric value.
-    
-    Bug: 13023
-    Change-Id: Ie338b1cce5156eeb313dd33491ee3d3f2eaddf1c
-    Reviewed-on: https://code.wireshark.org/review/18406
-    Reviewed-by: Jim Young <jim.young.ws@gmail.com>
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 20e2edc
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Sun Oct 23 21:45:33 2016 -0400
-
-    Add some Diameter AVPs referenced by (recently added) grouped AVPs.
-    
-    ... In order to make the Diameter XML valid again.
-    
-    This includes adding T6a/T6b and most of the AVPs of that application.
-    
-    Fix up some white space while at it.
-    
-    Change-Id: Ie39b3e574065628fdba215cc9c045eebcbd3077e
-    Reviewed-on: https://code.wireshark.org/review/18422
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit af7fc8b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Oct 19 20:53:40 2016 +0200
-
-    Qt: add fullscreen feature.
-    
-    The feature activates/deactivates fullscreen mode of Qt UI.
-    A new menu item has been added as well as a shortcut (F11 or Ctrl+Cmd+F)
-    according to browsers common shortcut.
-    
-    Change-Id: I01906b494d0a13ce70d27c00ebbe03e6ec87cbd7
-    Reviewed-on: https://code.wireshark.org/review/18332
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 3156980
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Thu Oct 20 07:06:07 2016 -0400
-
-    packet-infiniband: Fixed displaying reserved field
-    
-    1. Added Extended transport type field instead of reserved as per latest
-    release 1.3.1 in CM Req msg.
-    2. Defined reserved bits and bytes for CM messages
-    3. Minor code refactor to move to smaller functions for CM Req Rsp
-    parsing instead of 200+ lines function which is hard to read and
-    is expected to grow for more features
-    4. Cleanup around primary and alternate fields which were crossing byte
-    boundary
-    
-    CM request and response messages are tested.
-    Reject message reserved fields change is untested but it a minor change
-    that is expected to work.
-    
-    Change-Id: I94da62614f854218249b4e14c780f4168f44751c
-    Reported-by: Alexis La Goutte
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/18340
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 875b3e2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Oct 23 19:20:15 2016 +0200
-
-    ZigBee: fix the first parameter of memcpy
-    
-    key_record.key is already a pointer on an array
-    
-    Change-Id: I9bcc715be54817f8daa3928fff72d9ef98d586f9
-    Reviewed-on: https://code.wireshark.org/review/18417
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a3a2053
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Oct 23 18:51:09 2016 +0200
-
-    ZigBee Green Power: fix loading of keys during runtime
-    
-    Register a post update calback to ensure that the keys are loaded
-    for all entries and not only the ones last edited
-    
-    Bug: 13031
-    Change-Id: Ib670f9e1c702546631df5fe6094b02484806dd00
-    Reviewed-on: https://code.wireshark.org/review/18416
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3c3f592
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Oct 23 08:11:53 2016 -0700
-
-    [Automatic update for 2016-10-23]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I5127251ce46aa668cd12daacc7c6702564c04c8f
-    Reviewed-on: https://code.wireshark.org/review/18412
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 3576394
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Oct 22 19:53:00 2016 +0200
-
-    interface_sort_filter_model: don't dereference a NULL pointer
-    
-    This fixes a crash in InterfaceSortFilterModel::mapToSource().
-    
-    sourceModel was set to match the sourceModel of the underlying
-    InterfaceFrame. When Wireshark is closed,
-    InterfaceSortFilterModel::mapToSource() is called after
-    InterfaceFrame was freed, the sourceModel is NULL in this case.
-    
-     #0  0x000000000079a81e in InterfaceSortFilterModel::mapToSource
-     (this=0xe9fab0, proxyIndex=...)
-     /home/martin/src/wireshark.git/ui/qt/interface_sort_filter_model.cpp:250
-     ...
-     #7  0x0000000000797ed9 in InterfaceTreeModel::~InterfaceTreeModel
-     (this=0xe9ff90, __in_chrg=<optimized out>)
-        at /home/martin/src/wireshark.git/ui/qt/interface_tree_model.cpp:72
-     #8  0x00000000006c4e20 in InterfaceFrame::~InterfaceFrame
-     (this=0xe643b0, __in_chrg=<optimized out>)
-        at /home/martin/src/wireshark.git/ui/qt/interface_frame.cpp:109
-     #9  0x00000000006c4ec9 in InterfaceFrame::~InterfaceFrame
-     (this=0xe643b0, __in_chrg=<optimized out>)
-        at /home/martin/src/wireshark.git/ui/qt/interface_frame.cpp:112
-    
-    Change-Id: Ibe7f75ccd7a0af5f04febf967c47ada1a05bc3d3
-    Reviewed-on: https://code.wireshark.org/review/18411
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 892246a
-Author: Joakim Karlsson <oakimk@gmail.com>
-Date:   Sun Oct 23 01:44:11 2016 +0200
-
-    diameter: improvement of AVP 1066
-    
-    Printing ascii value in the same way as AVP 1005
-    
-    Change-Id: I058be87974bf8197e207fdd61be6354031ed8d35
-    Reviewed-on: https://code.wireshark.org/review/18409
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 903eab0
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Oct 22 20:20:26 2016 +0200
-
-    sip: use ws_strtoi functions.
-    
-    Change-Id: I69cdc1118f62ed86661ccfb9fb522ad0bb00596e
-    Reviewed-on: https://code.wireshark.org/review/18397
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2e962d3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Oct 22 15:40:33 2016 +0200
-
-    dtls: use ws_strtoi function.
-    
-    Change-Id: I4feacfa8e4739faf555c05e3c4823ad8487a994c
-    Reviewed-on: https://code.wireshark.org/review/18392
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6b25798
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Oct 22 17:38:50 2016 +0200
-
-    fc00: get rid of if(tree)
-    
-    Make sure that the newly added expert info will show up in the expert
-    info window. Expert infos should never be under if (tree).
-    
-    Change-Id: I55daa693d4dc910eab38028340a934062d351e98
-    Reviewed-on: https://code.wireshark.org/review/18393
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1c7b431
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Oct 22 23:13:10 2016 +0200
-
-    LSD: avoid dereferencing a null pointer
-    
-    Bug: 13038
-    Change-Id: I701aa8cf89d8c53091974d6329f340316df8a870
-    Reviewed-on: https://code.wireshark.org/review/18405
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ed18759
-Author: Joakim Karlsson <oakimk@gmail.com>
-Date:   Sun Oct 23 00:41:30 2016 +0200
-
-    diameter: add new standardized QCI
-    
-    Change-Id: If8c29934515b61081d0cbd44a0356144d5d3c466
-    Reviewed-on: https://code.wireshark.org/review/18407
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d3b2ee9
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Oct 22 21:28:09 2016 +0200
-
-    wsutil: add statements for c++ calls.
-    
-    Change-Id: I082eb462b0a6ce77f9ca82c51d79d65516c92b53
-    Reviewed-on: https://code.wireshark.org/review/18401
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6b03eea
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Oct 22 19:15:38 2016 +0200
-
-    GTPv2: add dissection of a few Information Elements
-    
-    This commit adds the following IEs:
-    - CSG ID
-    - CSG Membership Indication (CMI)
-    - Service Indicator
-    - Detach Type
-    - Local Distinguished Name (LDN)
-    
-    Change-Id: I1e3db7ffd217e3644acf6de0ad5002e65c73a9ea
-    Reviewed-on: https://code.wireshark.org/review/18396
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 812e5fd
-Author: boris.bochkarev <Boris-Bochkaryov@yandex.ru>
-Date:   Thu Oct 20 17:45:53 2016 +0700
-
-    AMPQ: Fix malformed packed in session.expected and session.confirmed.
-    
-    Bug: 13037
-    Change-Id: I935ff68050eb085789d9bd99b5ec833609c6fdca
-    Reviewed-on: https://code.wireshark.org/review/18336
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 48972d8
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Oct 22 12:02:50 2016 +0200
-
-    tpncp: load hf array in the handoff function
-    
-    tpncp reads hf entries from a database. There's a boolean preference
-    defining if the database is actually read. We can't access this
-    preference until the preferences are initialized. The code as it is now
-    wil always default to false and never read the database.
-    
-    Check the preference in the handoff function and initialize the hf
-    entries if they are not yet initialized.
-    
-    Change-Id: I545a49a946b78e1a0bc23e9803eb671d8765bba4
-    Reviewed-on: https://code.wireshark.org/review/18386
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 49a525a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Oct 21 19:47:11 2016 +0200
-
-    fc00: skip sha512 calculations for glib < 2.36
-    
-    Our minimum supported version of glib is 2.22 at the moment.
-    SHA512 support was added in glib 2.36.
-    
-    Bring up an expert info if checksum calculation is not supported
-    by our glib version.
-    
-    Change-Id: I116b32f63a4342a7e4198eaae8a35189fcc92edc
-    Reviewed-on: https://code.wireshark.org/review/18391
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ce9405b
-Author: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date:   Fri Oct 21 18:43:06 2016 +0200
-
-    cleanup: move extra libs to EPAN_EXTRA_LIBS
-    
-    Every program linking with epan lib added some extra dependencies.
-    Keep these in EPAN_EXTRA_LIBS.
-    
-    Change-Id: I3fac0974ef6a46675d35ee7b9862674923369b67
-    Reviewed-on: https://code.wireshark.org/review/18356
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 28bbd56
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Oct 22 18:15:51 2016 +0200
-
-    Add SBC decoding support to Windows
-    
-    Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131
-    Reviewed-on: https://code.wireshark.org/review/18394
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a2d4912
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Oct 22 18:26:47 2016 +0200
-
-    cmake, qt4: check if QT4_FOUND
-    
-    AFAICS, FindQt4.cmake sets QT4_FOUND, not Qt4_FOUND
-    
-    This fixes compilation on Debian Wheezy (cmake 2.8.9, Qt 4.8.2).
-    
-    Change-Id: I08b3ac6ae4292b8c8d3f9e8752780459e5329e29
-    Reviewed-on: https://code.wireshark.org/review/18395
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 44cf0bd
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Oct 22 12:15:49 2016 +0200
-
-    main_welcome: include QUrl
-    
-    This fixes compilation with Qt4.
-    
-    .../main_welcome.cpp: In member function ‘void MainWelcome::on_helpLabel_clicked()’:
-    .../main_welcome.cpp:509:69: error: invalid use of incomplete type ‘class QUrl’
-    
-    Change-Id: Ib31a4e28f67a27d3f644e8a8cfd3e6d848e034c4
-    Reviewed-on: https://code.wireshark.org/review/18388
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit e858829
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Oct 21 16:05:10 2016 -0700
-
-    CMake: Disable Qt4 && (Windows || macOS).
-    
-    We haven't built the Windows and macOS installers with Qt4 for quite
-    some time. In the case of macOS+Qt4 it looks like there's a problem with
-    the main screen size (bug 13009) and it's a safe bet that there are
-    other problems. There's not much we can do exept say "don't do that." Do
-    so at build time rather than after the user has installed Wireshark and
-    is trying to use it.
-    
-    Change-Id: I22f47b9705ea044238046676b6336aa5feab3f60
-    Reviewed-on: https://code.wireshark.org/review/18364
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7dfaec9
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Oct 21 00:50:03 2016 +0200
-
-    alljoyn: fix signature length adjustments
-    
-    Ensure that the signature pointer and length always matches, otherwise a
-    buffer overrun (read) is possible.
-    
-    Tested with the original captures from bug 12953, the PDML output is
-    still the same while the fuzzed capture does not crash anymore.
-    
-    Bug: 12953
-    Change-Id: I8843a5daf98a79fb19906e824326cdf619164484
-    Reviewed-on: https://code.wireshark.org/review/18347
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit e80a8ac
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 22 03:18:06 2016 -0700
-
-    Clean up conditional code for getting creation time.
-    
-    Define a macro to get the creation time from a stat structure, or to
-    return 0 if the creation time is unavailable, and use that in both
-    places where we fetch the creation time.
-    
-    Change-Id: I15354f2d52a40cb1227f30ae274120575eec2055
-    Reviewed-on: https://code.wireshark.org/review/18387
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5f68435
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 22 01:56:48 2016 -0700
-
-    Fix the #defines for the presence of structure names.
-    
-    AC_CHECK_MEMBER() and AC_CHECK_MEMBERS() use a standard name for the
-    {structurename} being the name of the structure type, complete with
-    "struct" if a typedef wasn't used, and with all letters mapped to upper
-    case, and with {membername} being the name of the structure member, with
-    all letters mapped to upper case.
-    
-    check_struct_has_member() lets you choose the name; choose the same name
-    that the autoconf macros use, and fix the code to check for them.
-    
-    Change-Id: Ifb3cf65e7e94907ad0a2f8aacca0c21a531f0c5b
-    Reviewed-on: https://code.wireshark.org/review/18382
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d32fee2
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Oct 7 11:52:32 2016 +0200
-
-    Qt/Bluetooth: Add Display Filter Edit field to HCI Summary dialogue
-    
-    Display Filter can be useful for this summary dialogue,
-    for example to reduce number of frame that were analyzed, like:
-    "frame.number >= 100 && frame.number <= 4674"
-    
-    Change-Id: I19587b9d41f3b253d1ca2683d198f7d7af2ad50f
-    Reviewed-on: https://code.wireshark.org/review/18265
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 0cb4d0d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Oct 22 09:20:10 2016 +0200
-
-    C1222: update auto generated file
-    
-    Change-Id: I9c29ebe0ef24dcf9f5db5f5e767f910644bb9762
-    Reviewed-on: https://code.wireshark.org/review/18379
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a63b5eb
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Oct 20 14:35:20 2016 -0700
-
-    Qt: Make "Learn" on the welcome screen clickable.
-    
-    Make the "Learn" header a ClickableLabel to match "Open" and "Capture".
-    Link to the docs page for now. Adjust its stylesheet and properties to
-    match ast well.
-    
-    Change-Id: Id9c7c05269de8134af28f0f9c1e2820a60442236
-    Reviewed-on: https://code.wireshark.org/review/18358
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 528894e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 21 22:19:46 2016 -0700
-
-    On UN*X, st_ctime is the last status change time, not the creation time.
-    
-    That's the time the file's inode last changed, so size changes,
-    permission changes, etc. affect it.  It's *not* the time the file was
-    created; most UN*Xes don't provide that.  Newer versions of FreeBSD,
-    NetBSD, OpenBSD, and macOS do, but other UN*Xes don't appear to.
-    
-    On Windows, at least according to Microsoft's documentation, st_ctime
-    *is* the creation time.  Hopefully that's not the result of confusion on
-    the part of somebody at Microsoft.
-    
-    Change-Id: I20743703f6ef66e40dff9004dc91bed46af6fad0
-    Reviewed-on: https://code.wireshark.org/review/18378
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d16295b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 21 20:46:48 2016 -0700
-
-    Suppress "discarding const" warning.
-    
-    Change-Id: I5f97b70d7f423cb5b7792863fb2bd07516aa1951
-    Reviewed-on: https://code.wireshark.org/review/18375
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 321b756
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Oct 21 10:10:06 2016 +0200
-
-    Add T.61 character set support
-    
-    Bug: 13032
-    Change-Id: I6bf2cc2c43a6262d899a304df6576d9831115966
-    Reviewed-on: https://code.wireshark.org/review/18350
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 53d3e3c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 21 19:53:32 2016 -0700
-
-    Fix some errors from the previous commit.
-    
-    Pro tip: if you're modifying GTK+ code, make sure you explicitly
-    configure to build the GTK+ version.
-    
-    Change-Id: Ia24321a5037dff67d9acf1444fa0b74f5aed089e
-    Reviewed-on: https://code.wireshark.org/review/18371
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 10ca4c7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 21 19:18:15 2016 -0700
-
-    More checks for localtime() and gmtime() returning NULL.
-    
-    And some comments in the case where we're converting the result of
-    time() - if your machine's idea of time predates January 1, 1970,
-    00:00:00 UTC, it'll crash on Windows, but that's not a case where a
-    *file* can cause the problem due either to a bad file time stamp or bad
-    time stamps in the file.
-    
-    Change-Id: I837a438e4b875dd8c4f3ec2137df7a16ee4e9498
-    Reviewed-on: https://code.wireshark.org/review/18369
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 49cf42c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 21 17:08:03 2016 -0700
-
-    localtime() can return NULL, even if it's unlikely.
-    
-    ANSI C says it can return NULL - and, at least on Windows with the MSVC
-    library, it *will* return null for dates prior to the Epoch.  Check for
-    a null return and handle it.
-    
-    Fixes CID 1374109.
-    
-    Change-Id: Ib18566d1a75e4109adb21834b157e87532fcac10
-    Reviewed-on: https://code.wireshark.org/review/18365
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b3363fb
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Fri Oct 21 00:31:44 2016 +0200
-
-    ISAKMP: update protocol parameters
-    
-    Update IKE authentication methods and config attributes.
-    
-    Change-Id: I103beaf79eebaa0704424ad89f4d38a2701ae50b
-    Reviewed-on: https://code.wireshark.org/review/18357
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 362b83f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 21 15:48:34 2016 -0700
-
-    gmtime() can return NULL, even if it's unlikely.
-    
-    ANSI C says it can return NULL - and, at least on Windows with the MSVC
-    library, it *will* return null for dates prior to the Epoch.  Check for
-    a null return and handle it.
-    
-    Fixes CID 1374110.
-    
-    Change-Id: I78bf92cfbb94a86544442269cc3b53338eb19778
-    Reviewed-on: https://code.wireshark.org/review/18361
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1b9d46a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Oct 20 23:46:16 2016 +0200
-
-    tests: do not invoke missing unit tests
-    
-    If the "test-programs" target is not built, then it should not try to
-    invoke the last program (wireshark-gtk in my case).
-    
-    Change-Id: Ida60a71d1dc47305ef8abe10e6c96c8a1cb8dcbb
-    Reviewed-on: https://code.wireshark.org/review/18346
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a6d81ef
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 21 15:29:59 2016 -0700
-
-    Clean up file handle management.
-    
-    The main reason fclose() could fail is if the file is open for writing,
-    not all the buffered data has been written out at the time fclose() was
-    called, and the attempt to write it out fails.  In any case, the file
-    handle is no longer valid after fclose() completes, whether the close
-    succeeds or not, so there's no reason to keep it around.
-    
-    There's no reason to check whether it's null in a loop called in code
-    where it's not null to start with and where it's not set to null in the
-    loop.
-    
-    This should fix CID 1374111.
-    
-    Change-Id: Ib8067a17731b41d6b184a5a415addc2ecaa7c00c
-    Reviewed-on: https://code.wireshark.org/review/18359
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7f6a492
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Oct 20 23:33:48 2016 +0200
-
-    test: make GTK support optional
-    
-    Current Ubuntu buildbot is failing because GTK support was removed.
-    Tests should not fail if GTK is not available, so make it optional.
-    
-    Change-Id: I1640c8bcea5208299f6846eb366e105c39a3ebf3
-    Reviewed-on: https://code.wireshark.org/review/18345
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 10a1e8d
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Fri Oct 21 00:31:44 2016 +0200
-
-    ISAKMP: fix typos and whitespace
-    
-    Change-Id: I8fd34acac2562ffea6f1e726b71d63f9f631bb54
-    Reviewed-on: https://code.wireshark.org/review/18355
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d142e7f
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Oct 21 10:41:52 2016 +0200
-
-    Fix build for Qt 4.8
-    
-    setCurrentText is only available in Qt5, so select the item manually.
-    https://doc.qt.io/qt-5/qcombobox.html#currentText-prop
-    
-    Fixes: v2.3.0rc0-1002-g1cd2255 ("Qt: convert UatDialog to model/view pattern, improve UX")
-    Change-Id: I402e7d159d512e870849ee54d851276c4cc7cf34
-    Reviewed-on: https://code.wireshark.org/review/18351
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 991e074
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Oct 21 13:59:11 2016 +0200
-
-    Qt: fix weird tree expander that results in a crash
-    
-    According to the Qt documentation, rowCount and columnCount must return
-    0 when a valid parent index is passed to a table model. Otherwise deep
-    recursion would occur resulting in a stack overflow in Qt4.
-    
-    Change-Id: I60bb15384470861013591e149c0f285ea1bdf9a7
-    Fixes: v2.3.0rc0-1002-g1cd2255 ("Qt: convert UatDialog to model/view pattern, improve UX")
-    Reviewed-on: https://code.wireshark.org/review/18354
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 67bfdf2
-Author: Roland Knall <rknall@gmail.com>
-Date:   Fri Oct 21 11:28:18 2016 +0200
-
-    capchild: Fix loading of extcap with no winpcap.dll
-    
-    If the loading of the physical interface list failed, no extcap
-    interfaces will be loaded as well. Fix that, so that we search for
-    the extcap interfaces, even when no other interfaces have been found
-    
-    Change-Id: Ib8e86f1f8d2a1565724ef3532d41ecea3ceddb55
-    Reviewed-on: https://code.wireshark.org/review/18352
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 25207d7
-Author: Anders <anders.broman@ericsson.com>
-Date:   Fri Oct 21 12:20:59 2016 +0200
-
-    [Diameter] Add some 3GPP AVPs fom TS 39.299 v 14.1.0
-    
-    Change-Id: Ie3995e81de8faee844dbcb794796ecacb6bfe28e
-    Reviewed-on: https://code.wireshark.org/review/18353
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b50888d
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Fri Oct 21 08:17:54 2016 +0200
-
-    WelcomeUI: Enhance Open and Capture clickable labels
-    
-    Open and Capture are now clickable labels, but they are sensitive
-    throughout the whole width of the central column. Without background
-    highlighting, as in the file list, this may be non-intuative.
-    To more closely resemble a button, limit the sensitivity to the text
-    of the label only, by limiting the label size.
-    
-    Change-Id: I0b703af02abc71a48dfbcee81f336bba955b4a70
-    Reviewed-on: https://code.wireshark.org/review/18349
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit efde624
-Author: Vladlen Popov <vladlen.popov@yahoo.com>
-Date:   Thu Oct 20 18:51:20 2016 +0300
-
-    ZigBee Green Power: add dissector for Sink Commissioning Mode cmd
-    
-    Change-Id: I9775927781a38ff6fd112247c59a60cf1a80ba08
-    Reviewed-on: https://code.wireshark.org/review/18341
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3756c0e
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Fri Oct 21 00:05:36 2016 +0200
-
-    ISAKMP: Fix defragmentation of EAP-TLS in IKEv2
-    
-    Remove NULL check to ensure IKEv2 encrypted payloads are dissected
-    during first pass, which is required for EAP-TLS fragment reassembly.
-    
-    Change-Id: I7fd46ee2163188c1a8dd256a43f1457441b1b95a
-    Reviewed-on: https://code.wireshark.org/review/18348
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 53400e0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Oct 19 12:19:02 2016 +0200
-
-    cmake/FindPOD: improve parallelism
-    
-    HTML and manual pages can be generated in parallel.
-    
-    Change-Id: I2301e8bdc5ae1179a8ac0c24f412e5435993a764
-    Reviewed-on: https://code.wireshark.org/review/18281
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 511e801
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Tue Oct 18 13:52:04 2016 +0200
-
-    debian: Ship ciscodump and sshdump
-    
-    Both binaries use libssh. Libssh can be linked to OpenSSL or to
-    Libgcrypt. Since the ciscodump and sshdump executables are
-    covered by GPL-2+ the Debian package build depends on the libssh
-    flavor built with libgcrypt.
-    
-    Change-Id: If2dd85beb08e4b04f0c3aac46966fce67828b473
-    Reviewed-on: https://code.wireshark.org/review/18263
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit 3fb3266
-Author: Roland Knall <rknall@gmail.com>
-Date:   Thu Oct 20 09:34:49 2016 +0200
-
-    InterfaceList: Add button to toggle hidden interfaces
-    
-    Add a button to the context menu, to allow for easy display of hidden
-    interfaces, and make that a storable preference
-    
-    Change-Id: I8df5562b3ce8119b0ed38f9893c1879127f40c47
-    Reviewed-on: https://code.wireshark.org/review/18005
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 4a87ecb
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Oct 20 13:45:10 2016 +0200
-
-    Qt: remove unused private member (found by clang).
-    
-    Error:
-    ui/qt/wlan_statistics_dialog.cpp:462:9: error: private field 'retry_packets_'
-    is not used [-Werror,-Wunused-private-field]
-    
-    Change-Id: I10785eab098db14a53ef8085421c0f1046c269f3
-    Reviewed-on: https://code.wireshark.org/review/18337
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 269b54c
-Author: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
-Date:   Wed Oct 19 16:24:59 2016 +0200
-
-    Fix compilation error without PCAP (using correct define)
-    
-    Incorrect define HAVE_PCAP was checked for. That one was
-    never set even with PCAP enabled and thus broke the wireless
-    toolbar functionality.
-    
-    Change-Id: I856c836de75b198340661d5e5b734c7d8ada70ac
-    Reviewed-on: https://code.wireshark.org/review/18335
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7b38c6b
-Author: Vladlen Popov <vladlen.popov@yahoo.com>
-Date:   Thu Oct 20 13:00:26 2016 +0300
-
-    ZigBee Green Power: add dissectors for some GP Cluster attributes
-    
-    Change-Id: I80df7ff3a69998be40db67b538a7af719e29782d
-    Attributes: gppFunctionality, gppActiveFunctionality, gpsFunctionality, gpsActiveFunctionality, gpsCommissioningExitMode, gpsCommunicationMode and gpsSecurityLevel
-    Reviewed-on: https://code.wireshark.org/review/18333
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit a9b391d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Oct 20 15:16:14 2016 +0200
-
-    NAS EPS: add a missing space
-    
-    Change-Id: I0339b7a70f0fd7b9bef43922d1093f9392c0eefe
-    Reviewed-on: https://code.wireshark.org/review/18338
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c9fa9b5
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Oct 19 15:54:32 2016 +0200
-
-    cmake: add dependency to build manual pages
-    
-    "add_custom_command" outputs are only available as dependency in the
-    same directory, so create a new target such it can be used from the main
-    directory.
-    
-    This fixes the OS X build with no parallelism (-j1).
-    
-    Change-Id: I66aa5ae307be38ee715456a05fd55f55e4fa76e9
-    Reviewed-on: https://code.wireshark.org/review/18299
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 9e42cad
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Oct 19 15:37:06 2016 +0200
-
-    ucp: use ws_strtou function.
-    
-    A lot of work added to pass the pinfo structure around.
-    
-    Change-Id: Ia550bc48cb03edcac1663eff355f0ba3103ec142
-    Reviewed-on: https://code.wireshark.org/review/18320
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 60f5c57
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 18 16:51:51 2016 +0200
-
-    wlan_statistics_dialog (Qt): Add percent of retry
-    
-    Change-Id: I1b77805d0bb71cda0ba8296f88854eec7111eff4
-    Reviewed-on: https://code.wireshark.org/review/18307
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1e69a5e
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Oct 20 10:36:36 2016 +0200
-
-    Support setting up sbc on macOS.
-    
-    Not tested with an actual capture file.
-    Should not be too hard to get this working on Windows as well.
-    
-    Change-Id: Iae4b744361f0c4b62e919ad77e3d2b69ba45a8f3
-    Reviewed-on: https://code.wireshark.org/review/18331
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit afcbcdf
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Apr 30 19:13:29 2016 +0200
-
-    Qt/Bluetooth: Add Mark/Unmark functionality
-    
-    Add Mark/Unmark functionality for tree/table widget items, user can now
-    mark row or cell.
-    
-    Change-Id: I31b9ca128d97da4fb959ae2d92f5c1646ebea478
-    Reviewed-on: https://code.wireshark.org/review/18266
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 82696ca
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 18 22:44:51 2016 +0200
-
-    bt-dht: use ws_strtou function.
-    
-    Change-Id: I105ceb0053d5ff3f595611cf919d44d40f5df037
-    Reviewed-on: https://code.wireshark.org/review/18287
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d821c72
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Tue Oct 18 15:31:01 2016 -0400
-
-    packet-infiniband: Add support for IP CM serviceid
-    
-    Added support for decoding IP CM Service id for CM Connect requests.
-    Annex 11.2 defines a specific prefix of serviceid for IP CM based
-    ULPs.
-    
-    Corrected typo error which got introduced as part of bad local merge for
-    hf_cm_drsp_privatedata. Corrected now.
-    
-    Change-Id: I18235ea86d82a224dcc7110a1c45c08f698fa9a6
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/18284
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 961b053
-Author: Roland Knall <rknall@gmail.com>
-Date:   Wed Oct 19 10:19:28 2016 +0200
-
-    WelcomeUI: Make Open and Capture clickable
-    
-    Make the texts "Open" and "Capture" clickable, and have them open
-    the FileOpen and CaptureOptions dialogs respectively
-    
-    Change-Id: I2a3efbc4cdf160aa0b4efc6496d09228affbff46
-    Reviewed-on: https://code.wireshark.org/review/18303
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f0cb70b
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Tue Oct 18 21:00:56 2016 +0200
-
-    Exclude scanner-generated headers from ABI check
-    
-    They break the check by not including header files for custom types
-    and they are not part of the API anyway.
-    
-    Bug: 13018
-    Change-Id: Ia0f81f861251b5659af723b9da795daeb7454eb3
-    Reviewed-on: https://code.wireshark.org/review/18297
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9c3d81a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Oct 19 12:27:11 2016 +0200
-
-    Officially require Qt 4.8 or newer
-    
-    Since v2.3.0rc0-1002-g1cd2255, Qt 4.8 became mandatory, reflect this in
-    the version requirements. This will not affect a lot of distributions
-    (RHEL and SLES only had Qt 4.6).
-    
-    For a more complete list of supported platforms, see
-    https://wiki.wireshark.org/Development/Support_library_version_tracking
-    
-    While at it, correct some other minimum versions in documentation.
-    
-    Change-Id: I11f2dfba72c75429f6838404a81ed3b3dc302d5f
-    Reviewed-on: https://code.wireshark.org/review/18314
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d38ed8e
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Oct 19 21:40:22 2016 -0400
-
-    Put the SS7 PC name resolution feature in the release notes.
-    
-    Fix the casing of the preference while at it (it now matches other name
-    resolution preferences).
-    
-    Change-Id: Ibfecbc94f9eccefa7d3b1a50ae2598dfefb707a2
-    Reviewed-on: https://code.wireshark.org/review/18330
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f252831
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 18 16:13:03 2016 +0200
-
-    wlan_statistics_dialog: Add number of retry
-    
-    Change-Id: I27194670dcd2e6c2ec6502c562e50ee6925c4c45
-    Reviewed-on: https://code.wireshark.org/review/18306
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 404c314
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Oct 19 11:03:15 2016 -0400
-
-    Skype: Remove TCP heuristic dissection
-    
-    It was taking any/all TCP packets.
-    
-    Also clean up a little of the UDP heuristic.
-    
-    Change-Id: Iae08e79c0d71e4676cfc7821372ab9581c1d1cfc
-    Ping-Bug: 13029
-    Reviewed-on: https://code.wireshark.org/review/18322
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bd057c8
-Author: Vladlen Popov <vladlen.popov@yahoo.com>
-Date:   Wed Oct 19 18:33:26 2016 +0300
-
-    ZigBee Green Power: add dissector for commands Proxy Table resp and Sink Table resp
-    
-    Change-Id: I6623a389551a727f933f8600ceba9d3050a51b25
-    Reviewed-on: https://code.wireshark.org/review/18326
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d561afc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 18 10:57:20 2016 +0200
-
-    raknet: remove if(tree) no longer needed
-    
-    also remove item_size variable (replace directly by the value)
-    
-    Will be also fix some Clang analyzer warning about used variable
-    
-    Change-Id: I4bf3b118efb2b0846012a92e5bf596ca95043414
-    Reviewed-on: https://code.wireshark.org/review/18318
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fbf4f6c
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Oct 20 00:27:30 2016 +0200
-
-    Add the wlan_mgt -> wlan renaming to the release notes
-    
-    Change-Id: Iae346329ad90035a3f047d748783c6f9f2dd4e1e
-    Reviewed-on: https://code.wireshark.org/review/18327
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit d3995b5
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 18 10:16:39 2016 +0200
-
-    Disable GTK+ by default.
-    
-    I suggested disabling GTK+ by default at Sharkfest EU and no one
-    objected, hence this patch.
-    
-    Disable it by default in both Autotools and CMake. Make sure it's
-    enabled for Debian packaging. The RPM packaging enables GTK3 explicitly
-    so no change appears to be necessary there.
-    
-    Change-Id: If5daeaef4bb26cf60006bc8883be15b2cf6c6ae4
-    Reviewed-on: https://code.wireshark.org/review/18256
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 5ab49c6
-Author: Roland Knall <rknall@gmail.com>
-Date:   Wed Oct 19 15:33:35 2016 +0200
-
-    InterfaceList: Changing text clears the cell
-    
-    If the cell is double-clicked to edit an existing text, it is cleared
-    upon start of the edit widget
-    
-    Change-Id: I9d718635de5c4b091aab1f88c2482434aaae1286
-    Reviewed-on: https://code.wireshark.org/review/18319
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c92cc9c
-Author: dsrsupport <eugene.exarevsky@dsr-company.com>
-Date:   Tue Sep 6 17:56:15 2016 +0300
-
-    ZigBee ZDO dissector: fix for r21 in column description in ZDO Node Desc Resp.
-    
-    Fixed display for Server flags:
-    a) introduce a flag 'show_ver_flags' to display stack revision only for ZDO Node Desc Resp;
-    b) fix crash in zdp_parse_node_desc when passed NULL as pinfo. Now never pass NULL there.
-    
-    Change-Id: Ibdb7fe2da54a902b39e20e07aa2aa5c9c23beeee
-    Reviewed-on: https://code.wireshark.org/review/18313
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 11e8bac
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Oct 19 11:53:30 2016 +0200
-
-    Qt: add include to fix compilation without pcap.
-    
-    Regression introduced in 864f750be560a7a739c7453f19a8f5679cf7d6b3.
-    
-    Change-Id: I306903e8252d932425f420e1901a8f3e949f5568
-    Reviewed-on: https://code.wireshark.org/review/18309
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b31bdfd
-Author: Hessam Jalali <hessam.jalali@gmail.com>
-Date:   Wed Oct 19 15:57:46 2016 +0330
-
-    e212: Fix for e212.*.mnc
-    
-    when mnc was not detected as long, the value was shown as e212.mnc instead of e212.*.mnc (e.g e212.rai.mnc)
-    
-    Change-Id: Ic0d275f259e1121abb1b7812651fadb9d475053e
-    Reviewed-on: https://code.wireshark.org/review/18317
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Michael Mann <mmann78@netscape.net>
-
-commit 5c8f4de
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Oct 19 13:50:26 2016 +0200
-
-    androiddump: Update help
-    
-    Minor changes in androiddump implies minor changes in help file.
-    
-    Change-Id: Ifbf4dbdca427e8b19272c2b4f28e06fd6a548834
-    Reviewed-on: https://code.wireshark.org/review/18316
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit afc2034
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Oct 19 11:16:58 2016 +0200
-
-    bt-dht: add bencoding terminators.
-    
-    Change-Id: I367495fb11aa09f1c8cb7f1df8812e179d41d9b9
-    Reviewed-on: https://code.wireshark.org/review/18305
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Michael Mann <mmann78@netscape.net>
-
-commit dbb391a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Oct 18 22:42:09 2016 +0200
-
-    Kafka: add Snappy decompression support
-    
-    Change-Id: Ida8d941809a4e0f2fd4d9f142363187a757d0278
-    Reviewed-on: https://code.wireshark.org/review/18288
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 25122f5
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Oct 19 09:59:47 2016 +0200
-
-    [GIOP] Use g_slist_prepend().
-    
-    Change-Id: I3a6c43f617f7634ce0007bc75aa6293eb5e1cad6
-    Reviewed-on: https://code.wireshark.org/review/18302
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Michael Mann <mmann78@netscape.net>
-
-commit b4f86c9
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Sep 12 19:49:50 2016 +0200
-
-    androiddump: Fix help - interfaces
-    
-    Fix help output that describes interfaces provided by tool
-    to reflect reality - add missed DEVICE_ID that is part of interface.
-    
-    Change-Id: Ib6374db28d8d4696ce27c5358da49d3ebfcf31e1
-    Reviewed-on: https://code.wireshark.org/review/18267
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Tested-by: Michael Mann <mmann78@netscape.net>
-
-commit 4ef14c7
-Author: Vladlen Popov <vladlen.popov@yahoo.com>
-Date:   Tue Oct 18 19:08:53 2016 +0300
-
-    ZigBee Green Power: add dissectors for Sink Table and Proxy Table attributes (GP Cluster)
-    
-    Change-Id: I9d18aa84e24a713951d5e537dcbc2dee6998192c
-    Reviewed-on: https://code.wireshark.org/review/18278
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d399bfa
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Oct 19 12:19:38 2016 +0200
-
-    cmake/FindPOD: improve formatting, add modelines
-    
-    CMake standard style is to use lowercase function names, do that.
-    
-    Change-Id: I893825cfac0cc402177ffb1a0f43f0ffc6341c45
-    Reviewed-on: https://code.wireshark.org/review/18312
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 10c46fc
-Author: Hessam Jalali <hessam.jalali@gmail.com>
-Date:   Wed Oct 19 14:50:09 2016 +0330
-
-    Qt: declare one_em to fix compile error when HAVE_PCAP_REMOTE is defined
-    
-    Occured on Windows(10) x64 build.
-    
-    Change-Id: I04d88bec1660dae20f459d2e03c88864c9366dc3
-    Reviewed-on: https://code.wireshark.org/review/18315
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 1d35c7f
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Wed Oct 19 09:51:23 2016 +0200
-
-    IP: Fix evil flag expert item text
-    
-    When creating the expert info item definition the copied line wasn't
-    updated with the correct message text. This change sets the right text.
-    
-    Change-Id: I9a98126c0b8a650e5ab195f97c53bb32e3053e89
-    Reviewed-on: https://code.wireshark.org/review/18301
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 59c3704
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 18 15:54:43 2016 +0200
-
-    Add a Kerberos decryption test.
-    
-    Test Kerberos decryption using files from krb-816.zip on the
-    SampleCaptures page.
-    
-    Change-Id: Ic1360b637ca6a1f6cb86d09a6aebfd7f5ff89419
-    Reviewed-on: https://code.wireshark.org/review/18275
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a0e1d28
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Oct 19 10:45:23 2016 +0200
-
-    Do not update register.c's timestamp if it is unchanged, otherwise it gets recompiled
-    every time one of its dependencies is touched.
-    
-    Change-Id: I8c0c4caea8355748e5abf9b9fe3804834353075f
-    Reviewed-on: https://code.wireshark.org/review/18304
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 9672913
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Sep 30 10:31:52 2016 +0200
-
-    Bluetooth: ATT: Add missing expert info for Regulatory Certification
-    
-    Add missed expert info for IEEE 11073-20601
-    Regulatory Certification Data List.
-    
-    Change-Id: Id9520e1c604ee38bf11ce42248357ca007bffcfd
-    Reviewed-on: https://code.wireshark.org/review/18233
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7edf3ee
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Tue Oct 18 16:50:33 2016 +0200
-
-    Use the proper include dirs for ABI check
-    
-    Ping-Bug: 13018
-    Change-Id: I05203c56e6b595c5bff6d8e475f16b66264bdd0e
-    Reviewed-on: https://code.wireshark.org/review/18296
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit e68247e
-Author: Roland Knall <rknall@gmail.com>
-Date:   Tue Oct 18 22:28:28 2016 +0200
-
-    InterfaceTree: Change foreach to const_iterator
-    
-    Change all occurences of the foreach macro to while loops with
-    const_iterator for performance reasons
-    
-    Change-Id: I1cd378696136b3d6cc100b9bfff95295baa2ff83
-    Reviewed-on: https://code.wireshark.org/review/18286
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 864f750
-Author: Roland Knall <rknall@gmail.com>
-Date:   Mon Oct 17 15:01:24 2016 +0200
-
-    ManageInterfacesDialog: Implement View/Data Model
-    
-    Implement the same interface view/data model as used for
-    the interface_tree selection in this dialog, to encapsulate
-    all access to global_capture_devices from the dialog.
-    
-    Change-Id: I0e568fe236d077befa2a79765638db8bb3ed1a3f
-    Reviewed-on: https://code.wireshark.org/review/18062
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5cbdbec
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Wed Oct 19 09:27:36 2016 +0200
-
-    GTPv2: Add support for NB-IoT features
-    
-    Bug: 13026
-    Change-Id: I75de63bd58a35e234eef308fa592922e01ea3c18
-    Reviewed-on: https://code.wireshark.org/review/18300
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b83ea46
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Oct 18 19:52:49 2016 +0200
-
-    extcap: put missed parameters into the help
-    
-    "--debug" and "--extcap-version" are part of extcap-base helper,
-    do not hide them.
-    
-    Change-Id: I287b68dbed5344c188fede69d112ab007a6ee18b
-    Reviewed-on: https://code.wireshark.org/review/18279
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit ba00be5
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 18 21:01:00 2016 +0200
-
-    mgcp: use ws_strtou function.
-    
-    Change-Id: Ia2a7fac5d1bd86d4f163117993e2e897e5dd315e
-    Reviewed-on: https://code.wireshark.org/review/18280
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bf96599
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Tue Oct 18 22:41:55 2016 +0200
-
-    Drop redundant SIZEOF() macro
-    
-    Change-Id: I6db2033746f5f22dd0229c96727bb352bdb1e866
-    Reviewed-on: https://code.wireshark.org/review/18298
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 739bdfb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Oct 18 09:14:35 2016 -0400
-
-    Some Pref <-> Decode As bugfixes.
-    
-    1. If a deprecated port preference is found, populate the new port preference with the value
-    2. Mark preferences as changed to trigger preference callback at startup.
-    
-    Change-Id: Ic271841686617e847d2e0ed8800bbb0fa874df47
-    Reviewed-on: https://code.wireshark.org/review/18274
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 09b4359
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Tue Oct 18 22:56:28 2016 +0200
-
-    While the channelwidth was dissected the information was not passed to the phdr
-    
-    No other flags were verified.
-    
-    Change-Id: I77e35af8accb83595d3046dc804f0c6a7e1d1000
-    Reviewed-on: https://code.wireshark.org/review/18295
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 6a14408
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 18 13:48:51 2016 -0700
-
-    Fix typo.
-    
-    Change-Id: Ie28490c93736c7e95f0b1eaed1e075e61f005e16
-    Reviewed-on: https://code.wireshark.org/review/18289
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 537705a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Oct 2 18:02:22 2016 +0200
-
-    wslua: prepare for split class/instance (meta)methods
-    
-    Previously the metatables for classes were the same for the class and
-    its instances. This results in issues like calling __gc on the class
-    table on exit.
-    
-    Make it possible to declare separate class methods (functions) and
-    instance methods. Observe that all attributes apply to the instances
-    only, so make these just available on the instance.
-    
-    The attribute/methods lookup method (via __index/__newindex) have been
-    rewritten to use upvalues, removing the technical need for the
-    properties __getters/__setters/__methods. The "lua globals" test still
-    checks for these, but it could be removed in the future.
-    
-    To fix bug 12968, the __gc method is removed from the class method.
-    Future patches should remove the WSLUA_REGISTER_CLASS,
-    WSLUA_REGISTER_META and WSLUA_REGISTER_ATTRIBUTES macros completely and
-    create split class functions/methods (such that __call for an instance
-    cannot accidentally be invoked on the class).
-    
-    Removed duplicate "fragmented" property from Pinfo (which triggered an
-    error) and replaced exit() by g_error() for debugger friendliness.
-    Remove lua_shiftstring since checkstring always returns non-NULL.
-    
-    Bug: 12968
-    Change-Id: I57f8a93d08bb84c79b0e94cf2c82d8402fc16646
-    Reviewed-on: https://code.wireshark.org/review/18026
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit 41c6b94
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 18 13:07:42 2016 -0700
-
-    Rename a function to have a name different from a data object's name.
-    
-    Change-Id: Iefef8b2161b43900fd81fb1b163a4feee69fd069
-    Reviewed-on: https://code.wireshark.org/review/18285
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2898c2a
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Oct 18 21:28:45 2016 +0200
-
-    Fix wrong local function names
-    
-    Copy->Paste issue.
-    
-    Change-Id: I77bc755c772df0fb95a9e4ce91b8b3bc8a8e019d
-    Reviewed-on: https://code.wireshark.org/review/18282
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7a906dc
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Oct 18 08:57:54 2016 -0400
-
-    Ensure http_tcp_range gets initialized through preference callback.
-    
-    Bug: 13016
-    Change-Id: I814c901898790045be0e2003ebe5a8000704b8af
-    Reviewed-on: https://code.wireshark.org/review/18273
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4a46982
-Author: Roland Knall <rknall@gmail.com>
-Date:   Tue Oct 18 15:00:39 2016 +0200
-
-    WiresharkApplication: Add signal emitter for Interface Changes
-    
-    Change-Id: I468ef9462aa91d02c5568cec0d08081a2b3840bb
-    Reviewed-on: https://code.wireshark.org/review/18269
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 63eb48a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 18 14:21:46 2016 +0200
-
-    sdp: use ws_strtou function.
-    
-    Change-Id: Idd624170cf8d3bb0441c765ecfebcbe51f99deaf
-    Reviewed-on: https://code.wireshark.org/review/18264
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 397065b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Oct 17 22:24:03 2016 +0200
-
-    mrcpv2: use ws_strtou function.
-    
-    Change-Id: I2d3ddf1f376ac44e3ccc618d94aebdba9c86e3df
-    Reviewed-on: https://code.wireshark.org/review/18250
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 47e9345
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 18 11:13:15 2016 +0200
-
-    fc00: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I3c494b190f93e9a1d042fa666d4f7037cd69c986
-    Reviewed-on: https://code.wireshark.org/review/18262
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 41e9bba
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 18 13:35:48 2016 +0200
-
-    Qt: Main welcome show/hide interface updates.
-    
-    Pluralize the text in the main welcome show/hide interfaces button.
-    Remove the styling, which matches other places we use a pushbutton +
-    menu.
-    
-    Change-Id: I7559f98d0c1afbfb2920b09c3885d9b1fbdf76f1
-    Reviewed-on: https://code.wireshark.org/review/18260
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 9796e81
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 18 13:29:24 2016 +0200
-
-    BGP: fix bgp.ls.tlv.link_protection_type_value is not of an FT_{U}INTn type]
-    
-    Bug: 13021
-    Change-Id: I3464c7af61323efb25dd89655865d536aeae6e59
-    Reviewed-on: https://code.wireshark.org/review/18261
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5d2c54e
-Author: Vladlen Popov <vladlen.popov@yahoo.com>
-Date:   Tue Oct 18 13:56:31 2016 +0300
-
-    ZigBee Green Power: fix commissioning cmd dissection
-    
-    Dissect fields: number of gpd commands, GPD cmd list, Cluster list
-    
-    Change-Id: Ifda60987072c3526d5f0ae4687ddf2b6e46bfb93
-    Reviewed-on: https://code.wireshark.org/review/18259
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 256f834
-Author: Babak Farrokhi <babak@farrokhi.net>
-Date:   Tue Oct 18 12:46:54 2016 +0330
-
-    Update MNC list for MCC 432 (Iran)
-    
-    The official E.212 list does not contain the latest
-    MNC codes that are in use for MCC 432. This commit
-    contains an up to date list according to:
-    
-    http://mcclist.com/mobile-network-codes-country-codes.asp#Iran
-    
-    Change-Id: I847d31b1d77825c6f95f4e5879ee1f688834ed88
-    Reviewed-on: https://code.wireshark.org/review/18258
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 418b7d1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Oct 18 10:26:37 2016 +0200
-
-    CQL: free buffer earlier in case of Snappy decompression failure
-    
-    Change-Id: I3048823b4057caf49f2f6bf28cf2389dc3c88f27
-    Reviewed-on: https://code.wireshark.org/review/18255
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 2c07129
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Mon Oct 17 01:38:46 2016 -0400
-
-    packet-infiniband: Add support for CM DREQ/DRSP
-    
-    Added support for decoding CM Disconnect and CM Disconnect response
-    packets.
-    Reusing ATTR macros in CM_Attributes definition.
-    
-    Change-Id: Ic6065b67d2007fc68848441e0c866e4a637a3657
-    Tested-by: paravpandit@yahoo.com
-    Reviewed-on: https://code.wireshark.org/review/18229
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c7e7577
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Oct 2 12:29:38 2016 +0200
-
-    wslua: add support for negative indices
-    
-    Internal change, this allows use of negative indices for
-    lua_rawgetfield/lua_rawsetfield convenience functions and is closer to
-    lua_getfield/lua_setfield semantics in terms of indices.
-    
-    Add lua_absindex for compatibility with Lua 5.1 (do not bother exporting
-    it yet since it is only used in this file, also do not rename it since
-    it is the same functionality with no Wireshark-specific changes.)
-    
-    Change-Id: I322954ef461164ec514ed9f034ae2691775e67da
-    Reviewed-on: https://code.wireshark.org/review/18025
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8a1adf1
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Oct 17 02:08:44 2016 +0200
-
-    wslua: fix errors in documentation, add notational conventions
-    
-    Improve example with better formatting, clarification comments and more
-    common variable names.
-    
-    Extend make-wsluarm.pl to support arguments containing underscores.
-    Fixes the description of dissect_tcp_pdus.
-    
-    Change TvbRange.tvb(tvb) into tvbrange:tvb() and ByteArray.tvb(name)
-    into bytearray:tvb(name), these are really instance methods.
-    
-    Change-Id: I1e20ef46195dc6c06f9ac790d3432db283d21a5e
-    Reviewed-on: https://code.wireshark.org/review/18226
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f07b1bc
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Oct 17 14:29:20 2016 +0200
-
-    debian: Update lintian-overrides to cover updated manpages
-    
-    Change-Id: Ie69b82b752ab82910ee3126a25c49da8bc383a97
-    Reviewed-on: https://code.wireshark.org/review/18243
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 954e7c4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Oct 17 17:06:08 2016 +0200
-
-    wslua: Do not crash on the root tree item
-    
-    ti->item is NULL for the root item, prevent a NULL-deref by Lua script.
-    
-    Bug: 13017
-    Change-Id: I5e7f71d014a01bab615288df76509b3ef97b1bf6
-    Reviewed-on: https://code.wireshark.org/review/18247
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3039485
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Oct 17 21:04:49 2016 +0200
-
-    CQL: add LZ4/Snappy decompression support on Windows
-    
-    Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d
-    Reviewed-on: https://code.wireshark.org/review/18249
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 867f282
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 17 16:28:58 2016 -0700
-
-    Separate "Link Access Control Protocol" and the version number with a space.
-    
-    Change-Id: I11d3e3b5b25d8f42fac613f464620371d2643ab5
-    Reviewed-on: https://code.wireshark.org/review/18251
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7b73a04
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Oct 17 21:04:37 2016 +0200
-
-    $Id$ is useless with git - treat it exaclty like this
-    
-    Change-Id: I607ce7ded40864c1b4dcc0a2d577a65923af4225
-    Reviewed-on: https://code.wireshark.org/review/18248
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 47649d1
-Author: Benoît Canet <benoit@scylladb.com>
-Date:   Mon Sep 26 16:25:11 2016 +0200
-
-    cql: add lz4 and snappy decompression
-    
-    We do not use the STARTUP negotiation since a stream
-    can be captured in its middle but try to decompress
-    if the flag is present and fallback if it fails.
-    
-    Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694
-    Signed-off-by: Benoît Canet <benoit@scylladb.com>
-    Reviewed-on: https://code.wireshark.org/review/17952
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 5c42d8a
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Oct 17 14:57:18 2016 +0200
-
-    debian: Override Lintian warning for missing wireshark-gtk man page
-    
-    Change-Id: I16e09c88046c55b3a7d610bf81c28850e2984f9a
-    Reviewed-on: https://code.wireshark.org/review/18244
-    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit b973b00
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Oct 17 12:34:10 2016 +0200
-
-    debian: Bump standards version to 3.9.7 used in Ubuntu 16.04
-    
-    Change-Id: I4a2a3dfad440f17f1b9cfae282623038d9b0981a
-    Reviewed-on: https://code.wireshark.org/review/18242
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit 3b3185e
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Oct 17 12:12:44 2016 +0200
-
-    debian: Build-depend on cmake (>= 2.8.8)
-    
-    Change-Id: I3097a06fa7cbe858f7b8b2af22d56da6ae027974
-    Reviewed-on: https://code.wireshark.org/review/18240
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit dca176c
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Oct 17 12:13:48 2016 +0200
-
-    debian: Drop unused renaming of wireshark-qt binary
-    
-    Change-Id: I9ff77d97016f33d1a276c7392f076413590a1099
-    Reviewed-on: https://code.wireshark.org/review/18241
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit f3ae5f1
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Oct 17 12:06:51 2016 +0200
-
-    debian: Update changelog timestamp to silence Lintian warning
-    
-    Change-Id: I4a27c10766587c3b61b088290a5f05a34d3c3cd8
-    Reviewed-on: https://code.wireshark.org/review/18239
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit 511bb81
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Oct 17 11:55:19 2016 +0200
-
-    debian: Stop using hardening-check during .deb package build
-    
-    Hardening-check script has been removed from Debian unstable. Checking
-    binaries' security features is implemented in Lintian instead which
-    will raise proper warnings for not Position Independent Executables
-    and binaries missing "bindnow" linker flag.
-    
-    This also fixes the Lintian error complaining about dependency on
-    obsolete hardening-includes package.
-    
-    Change-Id: If3387aa1f2297927c19d85f27361ba639203aad9
-    Reviewed-on: https://code.wireshark.org/review/18238
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit ad3fe15
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Oct 17 11:08:41 2016 +0200
-
-    debian: Update symbols file for new symbols
-    
-    Change-Id: I2a38196fe8aa93b72a94a1b95caf665e2de645f3
-    Reviewed-on: https://code.wireshark.org/review/18237
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit 81904c7
-Author: Roland Knall <rknall@gmail.com>
-Date:   Mon Oct 17 11:57:00 2016 +0200
-
-    InterfaceList: Change Buttons to combobox
-    
-    Change the buttons to a combobox selector, and move that selector
-    to the right of the capture filter box.
-    
-    Bug: 12971
-    Change-Id: Ib85d51cca128ed76eb08886e92660ede51d5982f
-    Reviewed-on: https://code.wireshark.org/review/18186
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 0c4eb27
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 11 12:48:52 2016 +0200
-
-    ftp: use ws_strtou function.
-    
-    Change-Id: Idd0496f5afe41506ae3b5e22bc0aec09b737be6c
-    Reviewed-on: https://code.wireshark.org/review/18146
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a30dcd9
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Oct 17 00:35:50 2016 +0200
-
-    cmake: fix missing docbook dependency
-    
-    Running "ninja developer_guide_html" somehow did not produce a new HTML
-    docbook once wsluarm.ascii (a dependency of developer-guide.xml) was
-    modified.
-    
-    It turns out that output file docbook/wsdg_html/index.html only had a
-    ordering-only dependency on target generate_developer-guide.xml. An
-    extra dependency is needed on the output file to ensure that the HTML
-    file gets rebuild on changes.
-    
-    See the last note on
-    https://samthursfield.wordpress.com/2015/11/21/cmake-dependencies-between-targets-and-files-and-custom-commands/
-    
-    Fixes v2.1.0rc0-2137-gd544ecd ("cmake: fix parallel docbook build").
-    
-    Change-Id: I7689c71994f13b29cf7f8561f7c993aa8298632d
-    Reviewed-on: https://code.wireshark.org/review/18225
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 632b7d1
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Oct 17 15:47:04 2016 +0200
-
-    Fix typo in a message
-    
-    Change-Id: Ic1651c4ff0fd7ba7f13cd52b596f3d54cf6c3e00
-    Reviewed-on: https://code.wireshark.org/review/18245
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit e5c5946
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Sep 30 10:31:52 2016 +0200
-
-    Bluetooth: HFP: Fix incorrect field name
-    
-    In some AT commands field description was "Number", should be "Type".
-    
-    Change-Id: I33e3c8deb4f1fd0d51c3faae7a7ec45baacd82ca
-    Reviewed-on: https://code.wireshark.org/review/18232
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fbc816a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Oct 17 11:55:56 2016 +0200
-
-    Qt: Read our dynamic recent entries a bit earlier.
-    
-    Call recent_read_dynamic a bit earlier in the startup process. Note that
-    it determines when we fill in the recent files list, so the earlier we
-    call it the better.
-    
-    Change-Id: Iad37d3aa2222873259d6c96ba79672236c8e4cd5
-    Reviewed-on: https://code.wireshark.org/review/18235
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1d09420
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 16 23:02:06 2016 +0200
-
-    MQ: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I62a67c4fff4604a3d1e335500b2453bae4f95f37
-    Reviewed-on: https://code.wireshark.org/review/18223
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 913225b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 11 13:58:27 2016 +0200
-
-    quakeworld: use ws_strtou function.
-    
-    Change-Id: I2d4d97229ee4fee37b26a2dabab9d373a0401e13
-    Reviewed-on: https://code.wireshark.org/review/18149
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 5546400
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Oct 17 10:49:40 2016 +0200
-
-    frame: print debug line according to new console preference.
-    
-    Change-Id: I4e4b7d08e7765c43904469bbf8ba5c0581428382
-    Reviewed-on: https://code.wireshark.org/review/18231
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 51f3161
-Author: Emery Hemingway <emery@vfemail.net>
-Date:   Fri Oct 7 17:30:28 2016 +0200
-
-    Add fc00 dissector
-    
-    http://fc00.io/
-    
-    Bug: 13014
-    Change-Id: I846d4dc28a8cb03bc877f0b4a392864100019d2d
-    Reviewed-on: https://code.wireshark.org/review/18117
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cd426f3
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Oct 17 07:40:21 2016 +0200
-
-    Add a comment how to run git review after using --no-verfiy.
-    
-    Change-Id: I07cde41ef6f8074efbb77eacde91b46b62c2f59e
-    Reviewed-on: https://code.wireshark.org/review/18230
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 4ff7799
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Oct 17 07:32:00 2016 +0200
-
-    Some get rid of the remaining trivial Q_UNUSED cases.
-    Fix the placement of Q_UNUSED inside #ifdef
-    
-    Change-Id: I015ff87fcb300a701bf8ccb42bd85e3068a08138
-    Reviewed-on: https://code.wireshark.org/review/18228
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit e552b31
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Oct 17 07:15:27 2016 +0200
-
-    Get rid of the trivial Q_UNUSED cases
-    
-    Change-Id: Ia7ddde278158f3321eb4244189375bdd51c8976d
-    Reviewed-on: https://code.wireshark.org/review/18227
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 763a059
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Oct 16 17:05:46 2016 +0200
-
-    extcap_example.py: fix hang on exit
-    
-    I guess that when SIGINT is intercepted, then the writes are restarted
-    and the doExit condition is never checked. Remove this racy check in
-    favor of catching the KeyboardInterrupt exception.
-    
-    Test: tshark -i example1; kill tshark; check process list for python.
-    
-    Bug: 11657
-    Change-Id: Ia8b1ee560b9dcd31dd91df27fbfb8e91237581c9
-    Reviewed-on: https://code.wireshark.org/review/18218
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 2176423
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Oct 16 11:59:32 2016 +0200
-
-    extcap_example.py: fixes for Python 3
-    
-    Fixes trivial syntax error in try/except, ensure that the message are
-    bytes instead of a string and remove unnecessary use of an append_bytes
-    function.
-    
-    Did not try to fix the other Python issues, at least it runs now.
-    
-    Change-Id: Ib24f6116bc9d3cf177bc940da9f89aff90695a93
-    Reviewed-on: https://code.wireshark.org/review/18212
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7b06095
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 16 22:14:36 2016 +0200
-
-    CIP: no previous prototype for ‘dissect_cip_attribute’ [-Wmissing-prototypes]
-    
-    Change-Id: I61f388b136e66db9c4b909c4509db0441b1f1865
-    Reviewed-on: https://code.wireshark.org/review/18221
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 133a7e9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 16 22:34:54 2016 +0200
-
-    addr_resolv(.c): no previous prototype for ‘add_ss7pc_name/ss7pc_name_lookup_init’ [-Wmissing-prototypes]
-    
-    Change-Id: Ice8c901e41e1881210c0f4bf70851810ca480e81
-    Reviewed-on: https://code.wireshark.org/review/18222
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e84c20e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 16 23:04:59 2016 +0200
-
-    raknet: fix Value stored to 'ti' is never read
-    
-    Change-Id: I2b3fe3a2b951cc99f6e6091389ec17bba367e8c6
-    Reviewed-on: https://code.wireshark.org/review/18224
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dc1cd78
-Author: dsrsupport <eugene.exarevsky@dsr-company.com>
-Date:   Tue Sep 6 17:56:15 2016 +0300
-
-    ZigBee MAC and ZDO dissectors: put useful information into column description for Association req and ZDo Node Desc Resp.
-    
-    I added that information to column description because I always need it when analyzing logs.
-    For Association request it is joining device type (FFD or RFD), for Node Descriptor Response this is stack version (r21 or legacy).
-    
-    Change-Id: Ic7ca237b1f4b598f9354b406f105c2befe45140d
-    Reviewed-on: https://code.wireshark.org/review/17534
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b240082
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Oct 16 08:11:48 2016 -0700
-
-    [Automatic update for 2016-10-16]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I016f035d04c44a68163ea0670e27fa454f4ba660
-    Reviewed-on: https://code.wireshark.org/review/18217
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit faa74f8
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Oct 16 16:09:51 2016 +0200
-
-    Inspired by prevous commit: grep for wlan_mgt turned up a few more occurrences. Fix them.
-    
-    Change-Id: I6661f483f7bf1e34c96467917358dbddf45f808e
-    Reviewed-on: https://code.wireshark.org/review/18216
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 95c9448
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Oct 16 15:58:09 2016 +0200
-
-    More wlan_mgt cleanup:
-      - Fix test script to use wlan instead of wlan_mgt
-      - Remove a now useless test in the dissector
-    
-    Change-Id: I9a7644947c3002c759a7ae5728a8559682cfd4fd
-    Reviewed-on: https://code.wireshark.org/review/18215
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 9711d22
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Oct 16 14:00:41 2016 +0200
-
-    Get rid of wlan_mgt. Handle these elements as part of wlan. The separation was artificial
-    and irritiating.
-    
-    Change-Id: I45d4c3f5d518466df1d0b88ba6e10226662ee6e1
-    Reviewed-on: https://code.wireshark.org/review/18214
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit c59f7fc
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Oct 16 13:25:25 2016 +0200
-
-    dmp: Fix UDP ports preference conversion
-    
-    The preferences change in 2eb7b05b had a typo for the old preference name.
-    
-    Change-Id: Ie4d85160050f5bea01b59a1803011b49a6c4d748
-    Reviewed-on: https://code.wireshark.org/review/18213
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 93b2b2c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 15 16:02:38 2016 -0700
-
-    Eliminate a global variable.
-    
-    Have the packet length be a local variable, and pass it to routines.
-    Yes, that means we fetch it twice - no great loss.
-    
-    Change-Id: Id9f95b3d8a19bf235d6b19993165e0f73a2e5732
-    Reviewed-on: https://code.wireshark.org/review/18211
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7417436
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 15 14:27:17 2016 -0700
-
-    Fix bin2hex().
-    
-    It was repeatedly overwriting the first character in the buffer, rather
-    than appending characters.
-    
-    Change-Id: Ie34d194d69ac3d685416323c93764aa401d78faa
-    Reviewed-on: https://code.wireshark.org/review/18209
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5d5f58f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 11 13:00:42 2016 +0200
-
-    megaco: use ws_strtoi function.
-    
-    Change-Id: I8e4807e29524976898f2656f2c6f06d890748f36
-    Reviewed-on: https://code.wireshark.org/review/18148
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ebede2a
-Author: Vladlen Popov <vladlen.popov@yahoo.com>
-Date:   Fri Oct 14 16:05:37 2016 +0300
-
-    ZigBee Green Power: implement dissection for Proxy Table Request and Sink Table Request commands of GP Cluster
-    
-    Change-Id: Ib6d538eebd9f74be168f49b8570463bda97c7a8a
-    Reviewed-on: https://code.wireshark.org/review/18199
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 91aef09
-Author: Vladlen Popov <vladlen.popov@yahoo.com>
-Date:   Fri Oct 14 17:51:24 2016 +0300
-
-    ZigBee green Power: fix commissioning reply, fix PAN ID field
-    
-    Parse field frame counter in comm_reply
-    
-    Fix PAN ID field name in comm_reply
-    
-    Change-Id: I2f30437fe7eef81af982fb8388ad43341043eb64
-    Reviewed-on: https://code.wireshark.org/review/18200
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a19c12b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 14 14:36:27 2016 +0200
-
-    udpdump: fix issues from coverity.
-    
-    Change-Id: I1d82d8166abe8eda6588ae2970ae9f2d096adf9d
-    Reviewed-on: https://code.wireshark.org/review/18198
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit fb9ce27
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 15 01:07:44 2016 -0700
-
-    Add the directory containing the executables to a file in /etc/paths.d.
-    
-    Do for executables what we do for man pages.
-    
-    Change-Id: I066f0199fd6064cae21e6ad079a1f344e1002c66
-    Reviewed-on: https://code.wireshark.org/review/18205
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3868252
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Oct 6 10:26:27 2016 -0400
-
-    Lua: allow creating TVBs after calling other (Lua) dissectors.
-    
-    Don't set `lua_tvb` (or any of the other global variables) to NULL after a
-    Lua dissector is called: it's possible that the caller is also a Lua dissector
-    which may want/need that (global) variable to still be set (to the value it
-    had before the sub-dissector was called).
-    
-    This fixes the problem reported in:
-    https://ask.wireshark.org/questions/56110/lua-error-tvbs-can-only-be-created-and-used-in-dissectors
-    
-    Making these variables not be a globals (as suggested at the top of
-    init_wslua.c) might be a better solution--for another day.
-    
-    Change-Id: I14fb8ec35b62abeda3f3471a323b88c80537a06e
-    Reviewed-on: https://code.wireshark.org/review/18095
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 3a08906
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Fri Oct 14 08:07:18 2016 +0200
-
-    Retrieve CLNP option values from the right place
-    
-    Use proper offsets when getting and presenting option values
-    for error reports. Limit the use of the error position
-    highlighting feature to 'field' only.
-    
-    Bug: 12993
-    Change-Id: Ie9d6644203cf849dbb8efe15e87249a3aace3b5c
-    Reviewed-on: https://code.wireshark.org/review/18195
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit db690aa
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Thu Oct 13 21:16:55 2016 +0200
-
-    Append Integer32 value to varbind also.
-    
-    Integer32 is handled slightly different from other values, but
-    that doesn't mean its pi_value shouldn't be saved to add to the
-    varbind later on.
-    
-    Bug: 13013
-    Change-Id: I6789a75ffd3bb95b7dd68f9cb356dbd85fc669d4
-    Reviewed-on: https://code.wireshark.org/review/18189
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 0aae3b1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Oct 14 08:20:02 2016 +0200
-
-    MAC LTE: add dissection of NB-IoT RAR
-    
-    Change-Id: I81b6ad65732dd11e5af040ec79b0175a7f06b070
-    Reviewed-on: https://code.wireshark.org/review/18196
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 66f1baa
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 13 18:24:37 2016 +0200
-
-    CQL: Enhance version dissection
-    
-    Display on hex (like spec)
-    Add (sub) field for protocol version and direction
-    
-    Ping-Bug 12818
-    Change-Id: I6947f82915f54095f86cd0e2125982af42e9bbf9
-    Reviewed-on: https://code.wireshark.org/review/18188
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d9c4f60
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Sep 6 07:49:09 2016 +0200
-
-    CQL: Add support of version 4
-    
-    Add new flag and new option
-    
-    Bug: 12818
-    Change-Id: I36a49cef407a5049f45ff3746d809a46c2520164
-    Reviewed-on: https://code.wireshark.org/review/17628
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1a42bc0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 13 07:51:45 2016 +0200
-
-    CQL: Enhance flags dissection
-    
-    Always display unused/reserved field
-    5th argument of proto_tree_add_bitmask is ett_ value
-    add a display field for query flags
-    
-    Ping-Bug: 12818
-    Change-Id: I9f906f75c5fe8328bba41e560878dafdb6b6608d
-    Reviewed-on: https://code.wireshark.org/review/18187
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3725263
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Oct 13 15:45:45 2016 -0700
-
-    UI: Free up the -m flag.
-    
-    The -m (monospace font) flag was deprecated in 2.2. Go ahead and remove
-    it in 2.3 / 2.4.
-    
-    Change-Id: I6b4911174675cedec979621c2776353314e73eb1
-    Reviewed-on: https://code.wireshark.org/review/18193
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9a65399
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Wed Oct 12 21:55:54 2016 +0200
-
-    CMakeLists: Add man files
-    
-    Current Wireshark.app bundle on OS X doesn't include man pages.
-    
-    This is the second try after commit 7da23ca1a5bba4af5e1104f4d3d3d44e918552b0
-    has been reverted. Now cmake gets the information that the man files
-    are generated.
-    
-    Bug: 12746
-    Change-Id: I34dfec65bd57587ee048d7e1e2557fc9ab2b32eb
-    Reviewed-on: https://code.wireshark.org/review/18170
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 25e7b63
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Oct 13 16:12:11 2016 -0400
-
-    Fix a few typos in the Diameter XML to make it (mostly) valid XML again.
-    
-    Fix up some white space while at it.
-    
-    Change-Id: I41efa63ad33288046b56c2eee6a20e066ac6b334
-    Reviewed-on: https://code.wireshark.org/review/18190
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit b1cc056
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Fri Aug 26 15:18:29 2016 +0200
-
-    Remove nghttp2 code and use system' nghttp2
-    
-    Update debian, macos (setup / homebrew) download script
-    Update testsuite (don't try HPACK when build without nghttp2)
-    
-    Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112
-    Reviewed-on: https://code.wireshark.org/review/17347
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ad0a016
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Oct 12 10:48:59 2016 -0700
-
-    Qt+macOS: Fix the default font name.
-    
-    "SF Mono" is the name of the new monospace font in Sierra. Note that it
-    appears to have limited availability and that we're outside those
-    limits.
-    
-    Fix up a comment.
-    
-    Change-Id: I97f0077098ea78d4550b58fb92645f4d62342b2e
-    Reviewed-on: https://code.wireshark.org/review/18168
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit fcbb771
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 11 09:29:26 2016 +0200
-
-    iso8583: use unsigned and fix bug in conversion routine.
-    
-    Change-Id: I0ba30bda3abec004f51f9402d65c38b3b1081113
-    Reviewed-on: https://code.wireshark.org/review/18144
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Paulo Roberto Brandão <betobrandao@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 2534b8e
-Author: Vladlen Popov <vladlen.popov@yahoo.com>
-Date:   Thu Oct 13 13:02:26 2016 +0300
-
-    ZigBee Green Power: dissect endpoint and security_counter for gpdf with app_id = 010 and 001
-    
-    Change-Id: I94ec94dbd6c81cf6a209e26c132557279d3c6ee2
-    Reviewed-on: https://code.wireshark.org/review/18182
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a40f3ee
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Oct 13 14:26:59 2016 +0200
-
-    Fix compilation error without PCAP.
-    
-    Change-Id: I414f11387ec5a48dfe7c1debb3bcef1dbc846b28
-    Reviewed-on: https://code.wireshark.org/review/18184
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7ce85a9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Oct 13 14:10:26 2016 +0200
-
-    MAC LTE: fix dissection of Extended PHR Control Element
-    
-    It has the same value as the DL SC-MCCH/SC-MTCH CE, so take into account direction
-    
-    Change-Id: I75848f92342cfc67f2e6aee1f8bc42616e662cdc
-    Reviewed-on: https://code.wireshark.org/review/18183
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 4f6ed38
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Oct 13 09:11:50 2016 +0200
-
-    Interface List: Fix display of zero entries
-    
-    If WS is started with zero entries, no text is being displayed, and
-    pushing a button does not yield the display of the list. This fixes
-    it.
-    
-    Change-Id: I70b0637e5f95e805b54780afb7eb2e43b3e5f21c
-    Reviewed-on: https://code.wireshark.org/review/18180
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Tested-by: Roland Knall <rknall@gmail.com>
-
-commit 8b0e66f
-Author: Jonathan Muñoz <jonathan.munoz@inria.fr>
-Date:   Tue Oct 11 10:19:11 2016 +0200
-
-    Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector.
-    
-    This patch adds one more Payload Information Element called 6P or sixtop
-    defined by the IETF 6TiSCH Working Group. Here it is shown the following
-    6P-sixtop information:
-            -The 6P-sixtop version.
-            -The 6P-sixtop code.
-            -The 6P-sixtop Scheduling Function ID.
-    
-    Then, depending of the 6P-sixtop code, a specific information is shown.
-    The supported codes -commands- for this patch are:
-            -Add.
-            -Delete.
-            -Count.
-            -List.
-            -Clear.
-            -Return Code Success.
-    
-    For more information about the 6P-sixtop protocol, go to:
-    
-    https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02
-    
-    Bug 13005
-    
-    Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67
-    Reviewed-on: https://code.wireshark.org/review/18151
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2e3e285
-Author: Robert Grange <robionekenobi@bluewin.ch>
-Date:   Sat Oct 8 12:49:49 2016 +0200
-
-    packet-mq: Handle MQV9
-    
-    Handle Put Message Option V3
-    Add various new defines
-    Fix a typo
-    
-    Bug: 13006
-    Change-Id: I022de9f131558bb8a0144d840a6484944f75cffe
-    Reviewed-on: https://code.wireshark.org/review/18121
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5da38b6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 12 22:37:30 2016 +0200
-
-    QUIC: Add STTL (Server Config TTL) tag
-    
-    and add FHOL forget value_string
-    
-    Change-Id: I0473ca17fba3c277124a46309c4b7d158d1b9f72
-    Reviewed-on: https://code.wireshark.org/review/18173
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ddb6513
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 13 00:16:57 2016 -0700
-
-    Fix call to ws_strtoi32().
-    
-    Change-Id: I536ee3fbda563f4b544eea334c5d7e9a642c69e2
-    Reviewed-on: https://code.wireshark.org/review/18181
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 198df02
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 11 12:51:24 2016 +0200
-
-    idl2wrs: use ws_strtou function.
-    
-    Missed from previous patch gb15079b.
-    
-    Change-Id: I3fce792608e989c8ac100f1f57cb11fdb7b35142
-    Reviewed-on: https://code.wireshark.org/review/18147
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2eb7b05
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Oct 5 16:33:54 2016 -0400
-
-    Convert most UDP dissectors to use "auto" preferences.
-    
-    Similar to the "tcp.port" changes in I99604f95d426ad345f4b494598d94178b886eb67,
-    convert dissectors that use "udp.port".
-    
-    More cleanup done on dissectors that use both TCP and UDP dissector
-    tables, so that less preference callbacks exist.
-    
-    Change-Id: If07be9b9e850c244336a7069599cd554ce312dd3
-    Reviewed-on: https://code.wireshark.org/review/18120
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4d8581d
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Wed Oct 12 09:36:24 2016 -0400
-
-    CIP: Improve string handling
-    
-    1. Add support for STRINGI
-    2. Add File Name attribute that is a STRINGI
-    3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII
-    4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte.
-    5. Minor: Fix byte highlighting for CCO I/O Mapping tree
-    6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes
-    
-    Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64
-    Reviewed-on: https://code.wireshark.org/review/18166
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 464e6cd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 10 21:18:57 2016 +0200
-
-    .mailmap: fix typo
-    
-    Change-Id: Iff3d1c4d74a8cf03111cb776cfce09120afb361d
-    Reviewed-on: https://code.wireshark.org/review/18139
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b36382a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 12 22:30:23 2016 +0200
-
-    TLS(1.3): with draft-16, Server Hello return draft release (0x7fxx)
-    
-    set server_version to TLS 1.3
-    
-    Change-Id: Id4d3d5d21ae996f447d826e98c0cf60880e7c0ce
-    Reviewed-on: https://code.wireshark.org/review/18171
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit f404ac0
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Oct 12 16:00:44 2016 -0700
-
-    WSDG: Add Qt installation information.
-    
-    Change-Id: I7c468c9d22f1923acb488bd06176314c4f023f09
-    Reviewed-on: https://code.wireshark.org/review/18179
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit e4fd250
-Author: Olga Kornievskaia <olga.kornievskaia@gmail.com>
-Date:   Wed Oct 12 15:06:54 2016 -0400
-
-    nfs: Fixing COPY decoding to match the spec
-    
-    Current decoding of the COPY operation gets a netloc4 instead
-    of a stateid from the write_response4 structure.
-    
-    Change-Id: Icde8adde8613d50e7a03ee779aad4c62f6f195f4
-    Reviewed-on: https://code.wireshark.org/review/18169
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5ace3b9
-Author: Binh Trinh <beango@gmail.com>
-Date:   Tue Sep 13 00:46:06 2016 -0400
-
-    MTP3: Added SS7 Point Code Name Resolution
-    
-    bug: 7592
-    
-    Change-Id: I1af2c5d6664e172c358cd19bc20e9352c2582eae
-    Reviewed-on: https://code.wireshark.org/review/17677
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 04143d1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 12 22:49:39 2016 +0200
-
-    MQ: fix typo found by lintian
-    
-    Change-Id: I8fefb89116685b39567fe8041ca781612f67dbce
-    Reviewed-on: https://code.wireshark.org/review/18177
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 750b10a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 12 22:48:29 2016 +0200
-
-    OPA MAD: fix typo found by lintian
-    
-    Change-Id: I93ee3f1fed97b06ff582909f4c59da60c783e909
-    Reviewed-on: https://code.wireshark.org/review/18176
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7eaa5b7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 12 22:47:23 2016 +0200
-
-    PPP: fix typo found by lintian
-    
-    Change-Id: I2634a3b07b36133f14eeb91911338c51a34e35b4
-    Reviewed-on: https://code.wireshark.org/review/18175
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0674a92
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Oct 12 17:40:12 2016 +0200
-
-    RakNet: fix heuristic dissector
-    
-    RAKNET_OFFLINE_MESSAGE_DATA_ID starts with 0x0, which means NULL
-    character. this give a string of length 0 and RakNet heuristic was
-    wrongly catching all UDP packets.
-    Let's do a memcmp instead of a strncmp.
-    
-    Change-Id: I38e98838b114037bf37a218003bade88261a2dd8
-    Reviewed-on: https://code.wireshark.org/review/18167
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6ae3ba0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Oct 12 14:22:55 2016 +0200
-
-    M3AP: register dissector by name
-    
-    Change-Id: Idbc06c512e42674e28e84237a2fe59d0e5635d40
-    Reviewed-on: https://code.wireshark.org/review/18165
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d267e2e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Oct 12 14:22:31 2016 +0200
-
-    M2AP: register dissector by name
-    
-    Change-Id: I2d734d892fa67cb5843675cb423641c0eb433cea
-    Reviewed-on: https://code.wireshark.org/review/18164
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a62637a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 4 11:56:17 2016 +0200
-
-    quic: use ws_strtou function.
-    
-    Change-Id: Ibe1c9e48d2843fd8442d43f90a8e529a4c591fc8
-    Reviewed-on: https://code.wireshark.org/review/18061
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 84cfd3b
-Author: Francesco Fondelli <francesco.fondelli@gmail.com>
-Date:   Wed Oct 12 11:19:55 2016 +0200
-
-    HL7: fix missing struct initialization spotted by Clang Static Analyzer
-    
-    Change-Id: Icb3e924f48b8fa00d7a39fcbdc4400ad2c4c2b89
-    Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/18163
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9934fff
-Author: Marius Paliga <mareko.paliga@gmail.com>
-Date:   Tue Oct 11 16:36:56 2016 +0200
-
-    Add support for Enhanced-Diagnostics AVP
-    
-    Bug: 13004
-    Change-Id: I20a3faec635a8c86e2d45eb17ce24e2a9db81b5e
-    Reviewed-on: https://code.wireshark.org/review/18154
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d78c5e0
-Author: Jan Spevak <jan.spevak@nokia.com>
-Date:   Wed Oct 12 10:33:00 2016 +0200
-
-    Diameter: Upadte AVPs 1003, 1094 and 1099
-    
-    Bug: 13010
-    Change-Id: I8a3f8ea551ec959e1e5344f825c8bba7bd4ff866
-    Reviewed-on: https://code.wireshark.org/review/18160
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c06189f
-Author: PHO <pho@cielonegro.org>
-Date:   Mon Oct 3 09:22:35 2016 +0900
-
-    raknet, mcpe: Improve dissectors
-    
-    packet-raknet.c now correctly dissects the following offline messages:
-    * ID_UNCONNECTED_PING
-    * ID_UNCONNECTED_PING_OPEN_CONNECTIONS
-    * ID_OPEN_CONNECTION_REQUEST_1
-    * ID_OPEN_CONNECTION_REPLY_1
-    * ID_OPEN_CONNECTION_REQUEST_2
-    * ID_OPEN_CONNECTION_REPLY_2
-    * ID_OUT_OF_BAND_INTERNAL
-    * ID_CONNECTION_ATTEMPT_FAILED
-    * ID_ALREADY_CONNECTED
-    * ID_NO_FREE_INCOMING_CONNECTIONS
-    * ID_CONNECTION_BANNED
-    * ID_INCOMPATIBLE_PROTOCOL_VERSION
-    * ID_IP_RECENTLY_CONNECTED
-    * ID_UNCONNECTED_PONG
-    
-    packet-raknet.c now correctly dissects the following system messages:
-    * ID_CONNECTED_PING
-    * ID_CONNECTED_PONG
-    * ID_CONNECTION_REQUEST
-    * ID_CONNECTION_REQUEST_ACCEPTED
-    * ID_NEW_INCOMING_CONNECTION
-    
-    packet-raknet.h exports the following functions:
-    * raknet_add_udp_dissector()
-    * raknet_delete_udp_dissector()
-    * raknet_conversation_set_dissector()
-    
-    packet-raknet.c now dissects message flags, reliability, reliable message number and so on. It now reassembles fragmented packets, supports heuristics, supports dissecting combined packets, and gives up dissecting messages when they are encrypted.
-    
-    packet-raknet.c now calls subdissectors with a tvbuff buffer only having a message ID and payload. It first tries to locate a subdissector based on the port, and then tries heuristic dissectors if any.
-    
-    packet-mcpe.c is updated so that it uses the new raknet interface, and it now correctly dissects the following game packets:
-    * 0x01 Login
-    * 0x03 Server to Client Handshake
-    * 0x06 Batch
-    
-    packet-mcpe.c now supports heuristics, and gives up dissecting packets in a conversation once it sees a "Server to Client Handshake" packet because everything, including packet ID, are encrypted after that.
-    
-    Change-Id: I92c0b3ff0f18d22d4513bb014aeb4ea6475fb06c
-    Reviewed-on: https://code.wireshark.org/review/18044
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1cd2255
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Oct 4 01:47:26 2016 +0200
-
-    Qt: convert UatDialog to model/view pattern, improve UX
-    
-    Fixes:
-     - Fix crash (heap-use-after-free) on removing a record while editing.
-     - Mark a record as invalid if any of the fields fail the validation.
-       (Fixes crash in at least the ISAKMP dissector.)
-     - Prevent saving of invalid UAT entries (e.g. empty UATs).
-     - Do not close the dialog on pressing Enter/Escape while editing,
-       close the editor instead.
-     - Fix HTML injection in the error messages.
-    
-    Improvements:
-     - Tab-navigation now works between fields.
-     - The field editor is now closed once the focus is lost.
-     - Fields that fail validation are marked (currently with a pink color).
-     - The error hint selection has become smarter (see comments in
-       UatDialog::checkForErrorHint).
-     - Properly recognizes PT_TXTMOD_HEXBYTES formats like "aa:bb"
-       (previously it would not expect the ":" and report a bad length).
-       A validator prevents invalid strings from being entered.
-     - The OK button is disabled when new/edited records are bad. Notably,
-       existing (possibly invalid) records are skipped. (Bug 7471).
-    
-    Live validation (while typing in the editor) was dropped during
-    conversion, but it can be added later if desired.
-    
-    Drag and drop reordering still needs to be implemented.
-    
-    Bug: 11714
-    Bug: 7471
-    Change-Id: Ic0b6a177f90503fbd65b5001d8a87a10e38f4d64
-    Reviewed-on: https://code.wireshark.org/review/17994
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9434f25
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Oct 7 12:35:41 2016 +0200
-
-    TLS(1.3): Add Supported Versions (43) Hello extension
-    
-    Ping-Bug: 12779
-    Change-Id: Ia8dcfcb300f4da3bf270d9512fbcc85a7b1a8671
-    Reviewed-on: https://code.wireshark.org/review/18108
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit aa78460
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Oct 11 21:58:29 2016 +0200
-
-    SMPP: use mktime_utc to convert struct tm to time_t
-    
-    Bug: 12632
-    Change-Id: Ie340facff86d988b7a85f6351d85343169042ce9
-    Reviewed-on: https://code.wireshark.org/review/18155
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 50ddeaa
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Tue Sep 27 17:36:28 2016 +0300
+commit d7f1dc8
+Author: Robert Sauter <sauter@locoslab.com>
+Date:   Wed Jun 14 07:52:59 2017 +0200
 
-    PROFINET: Don't display expert information when implicit AR is used.
-    
-    According to specification:
-    Value(UUID): 00000000-0000-0000-0000-000000000000
-    Meaning: Reserved
-    Use: The value NIL indicates the usage of the implicit AR.
+    IEEE 802.15.4: Fix IE/MIC handling of secured packets without payload
     
-    Change-Id: Iea807f14bf6da36700b778a1383ebd970aa105a5
-    Reviewed-on: https://code.wireshark.org/review/17951
+    Change-Id: Icdcb770723e3783013f525524c3fe745d5dd862d
+    Reviewed-on: https://code.wireshark.org/review/22122
     Reviewed-by: Michael Mann <mmann78@netscape.net>
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit ae085f7338b356f249bbc639ce70412ece42a708)
+    Reviewed-on: https://code.wireshark.org/review/22133
 
-commit 31a35aa
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Oct 10 23:36:25 2016 -0400
-
-    Cleanup from adding Decode As TCP preferences.
-    
-    1. Fix bug caught by scan build (module not read)
-    2. Remove range preference call that should have been part of original patch.
-    
-    Change-Id: I24b1fb253548bffddc4c8ebfc3ede666d8fd9dcd
-    Reviewed-on: https://code.wireshark.org/review/18143
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a1ecd56
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Oct 11 23:32:38 2016 +0200
-
-    GSM A GM: add specific filters for IPv4 / IPv6 Protocol ID
-    
-    Bug: 13001
-    Change-Id: I6bdaa5cd034b9ccf608fe0f6913d099ee920f0db
-    Reviewed-on: https://code.wireshark.org/review/18157
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 13139a9
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 11 14:01:20 2016 -0700
-
-    dumpabi: Fix log paths.
-    
-    Make sure the paths we pass to "cat" and "abi-compliance-checker
-    -log-path" match.
-    
-    Change-Id: Ie68b445b9d92d85c0ed1eb508a78c0bcc960d061
-    Reviewed-on: https://code.wireshark.org/review/18156
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f92daa1
-Author: Moeller, Thies <thies.moeller@baslerweb.com>
-Date:   Sat Oct 8 22:38:36 2016 +0200
-
-    u3v / gvsp update the PFNC pixelformat definitions according
-            to http://www.emva.org/wp-content/uploads/GenICamPixelFormatValues.pdf
-    
-    Change-Id: I744248d0ca73c2ad9a90f1e662ccd6b90bcade5c
-    Reviewed-on: https://code.wireshark.org/review/18126
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7cef0cb
+commit 75e2c7e
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Oct 9 20:01:45 2016 -0400
+Date:   Tue Jun 13 23:05:24 2017 -0400
 
-    Add Local Service Discovery (LSD) protocol
+    WBXML: Fix some more potential infinite loops.
     
-    Bug: 12985
-    Change-Id: Iceacd3d122337091380d56bd7fa9875bf7cb4d47
-    Reviewed-on: https://code.wireshark.org/review/18134
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 53c20dd
-Author: Jonathan Muñoz <jonathan.munoz@inria.fr>
-Date:   Thu Sep 8 09:40:09 2016 +0200
-
-    ieee802.15.4: Increments the offset for not defined/unknown Payload IEs
+    tvb_get_guintvar can generate some unrealistic values so do some
+    sanity checking on them.
     
-    Change-Id: If8d5fe86c6c1bedd468de437e503039428c648b0
-    Reviewed-on: https://code.wireshark.org/review/18150
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 082424f
-Author: Moeller, Thies <thies.moeller@baslerweb.com>
-Date:   Tue Oct 11 14:17:35 2016 +0200
-
-    u3v fix typo in descriptor
-    
-    Change-Id: Ib62546216faa8d231cc004ab214a7ca4931919f2
-    Reviewed-on: https://code.wireshark.org/review/18153
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2ad87fa
-Author: Juanjo Martin <juanjo@rti.com>
-Date:   Tue Oct 11 12:09:42 2016 +0200
-
-    RTPS: Fixed octet to next header dissection when submessage is unknown
-    
-    Change-Id: If18d4797a8ace9f93546cac0d2d6f09bf7086cc3
-    Reviewed-on: https://code.wireshark.org/review/18145
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Bug: 13796
+    Change-Id: I2d5f7a48c2e982a419ea6ab3ac0000be3b6bcbc7
+    Reviewed-on: https://code.wireshark.org/review/22121
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 71232b6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Oct 10 23:34:41 2016 -0400
-
-    fix: break loop on failed string->number conversion
-    
-    Bug: 12998
-    Change-Id: I3e9739dd9863e615c2ca0fc91f043c8562e4203e
-    Reviewed-on: https://code.wireshark.org/review/18142
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 50fa2d95833ec2e2b0de3000eda7b290fc23eaeb)
+    Reviewed-on: https://code.wireshark.org/review/22128
 
-commit 203f12d
-Author: Francesco Fondelli <francesco.fondelli@gmail.com>
-Date:   Fri Sep 16 09:25:47 2016 +0200
-
-    HL7 protocol support
-    
-    Bug: 12906
-    Change-Id: I0dafdd74b21b27189d0a532c679e449c536f76f0
-    Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17725
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 754d03c
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Oct 10 20:10:23 2016 +0100
-
-    Disable wslua GRegex unit test
-    
-    It's broken for recent GLib versions and there is no time frame for
-    a fix.
-    
-    Ping-Bug: 12997
-    Change-Id: Ia687af9b0df8fc37121179ba20761c878bf57057
-    Reviewed-on: https://code.wireshark.org/review/18140
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7715d48
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Oct 10 22:25:28 2016 +0200
-
-    LPPa: upgrade dissector to v13.1.0
-    
-    Change-Id: I8afddebf9b75b992a1cd9cb75f8cf7bb5223c6f9
-    Reviewed-on: https://code.wireshark.org/review/18141
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 9c20527
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Oct 10 10:36:24 2016 -0700
-
-    fuzz-test: Fix an exit status check.
-    
-    Make sure we check the exit status of the Valgrind process, not the most
-    recently executed command.
-    
-    Change-Id: I3b6bd427383e4271b9ed38a10da6db506a511dc1
-    Reviewed-on: https://code.wireshark.org/review/18138
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit cebf038
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Fri Oct 7 16:21:13 2016 -0400
-
-    CIP: Attribute updates
-    
-    1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All.
-    2. Connection Manager: Dissect more attributes
-    3. Port: Display the Port Type name
-    4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed.
-    5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree.
-    6. Display Attribute ID as DEC, since the specification tables are in decimal.
-    7. Update Class list
-    8. Minor: Remove some unused variables, typos
-    
-    Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1
-    Reviewed-on: https://code.wireshark.org/review/18118
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e1059891
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Oct 8 22:16:30 2016 +0200
-
-    fix: use ws_strtoi function.
-    
-    Change-Id: I537a7b349ea31e02cf538a782301c94053bb82dc
-    Reviewed-on: https://code.wireshark.org/review/18125
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e8022a9
+commit 9adc7af
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Oct 9 22:54:03 2016 -0400
-
-    Profinet I/O: Sanity check number of I/O objects
-    
-    Can prevent really long loops from fuzz testing.
-    
-    Bug: 12851
-    Change-Id: I85e00af2c4753ce4c5bcb650a7df188d7f679c9a
-    Reviewed-on: https://code.wireshark.org/review/18136
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3473951
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Oct 9 21:00:59 2016 -0400
-
-    HARTIP: Fix infinite loop
-    
-    Bug: 12967
-    Change-Id: Ic7a52d4ee5dea896044c1c97b7b48f13e21f2762
-    Reviewed-on: https://code.wireshark.org/review/18135
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 050cc46
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Oct 9 22:22:59 2016 +0200
-
-    M3AP: upgrade dissector to v13.2.0
-    
-    Change-Id: Iaedd4d3205e44a391a12be71eea0ccdc237fe790
-    Reviewed-on: https://code.wireshark.org/review/18133
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 83df30e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Oct 9 08:12:24 2016 -0700
-
-    [Automatic update for 2016-10-09]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I84adcfee2652783d1b3b7d7e3ff9b209f8b23d96
-    Reviewed-on: https://code.wireshark.org/review/18130
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jun 13 20:37:11 2017 -0400
 
-commit a10b505
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 7 15:38:07 2016 +0200
-
-    xcsl: use ws_strou function.
+    DOCSIS: Prevent infinite loop from unknown FCParm.
     
-    Change-Id: I1c054253b77b266a162d09e8da107e5ebb9eceb8
-    Reviewed-on: https://code.wireshark.org/review/18111
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9b2dc3e
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Oct 8 19:38:29 2016 +0200
-
-    E212: use ws_strtou function.
-    
-    Change-Id: Ifaeaf7ceb7addba95237852529ae1aa3e8a8b46b
-    Reviewed-on: https://code.wireshark.org/review/18124
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6c26ed9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Oct 7 14:58:43 2016 +0200
-
-    TLS(1.3): Add new cipher from TLS 1.3
+    concatlen was not updated if FCParm was unknown, leading to an infinite loop.
     
-    Change-Id: I8f39ea55763e925e15896efc9c519297c1288ccf
-    Reviewed-on: https://code.wireshark.org/review/18110
+    Bug: 13797
+    Change-Id: I1b64d757a369183a711f01b0b5cd1ba7aa0787bc
+    Reviewed-on: https://code.wireshark.org/review/22120
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 40e43f7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 9 00:09:42 2016 -0700
-
-    Note the registry for the bgp_l2vpn_encaps values.
-    
-    Change-Id: Id8ccf81c08d84124e1d7361ce6e87080fa6b440d
-    Reviewed-on: https://code.wireshark.org/review/18128
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 78a56f7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 8 19:21:20 2016 -0700
-
-    Note the registry for fec_vc_types_vals values and update it.
-    
-    Change-Id: I0514417895ccc86f51bf239d56005245fd875809
-    Reviewed-on: https://code.wireshark.org/review/18127
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5fba7f3
-Author: Uli Heilmeier <openid@heilmeier.eu>
-Date:   Sat Oct 8 12:10:38 2016 +0000
-
-    Revert "CMakeLists: Add man files"
-    
-    This reverts commit 55148a2ea470d19290d236428f3c8e725775c96a.
-    
-    Change-Id: If93b97933cae4d8ffd1e4cc9a635def031ab0cc6
-    Reviewed-on: https://code.wireshark.org/review/18123
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 61956b8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 7 15:05:15 2016 +0200
-
-    column-utils: add space to improve readability.
-    
-    In tshark the UTF8 arrow overlaps the ports.
-    When pcap file has more than 999 packets the output is
-    no more aligned.
-    
-    Bug: 12502
-    Change-Id: I07f90bbc0d2f065458bc07b7fde8f6a651951b60
-    Reviewed-on: https://code.wireshark.org/review/18109
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit b682bbd
-Author: Francesco Fondelli <francesco.fondelli@gmail.com>
-Date:   Fri Sep 16 15:13:44 2016 +0200
-
-    add tvb_find_guint16() utility
-    
-    Change-Id: I75c0165948325c2e50918706d8a821411761727b
-    Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17734
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 268841f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Oct 7 16:25:01 2016 -0400
-
-    Combine Decode As and port preferences for tcp.port dissector table.
-    
-    This patch introduces new APIs to allow dissectors to have a preference for
-    a (TCP) port, but the underlying data is actually part of Decode As functionality.
-    For now the APIs are intentionally separate from the regular APIs that register a
-    dissector within a dissector table.  It may be possible to eventually combine the
-    two so that all dissectors that register with a dissector table have an opportunity
-    to "automatically" have a preference to adjust the "table value" through the
-    preferences dialog.
-    
-    The tcp.port dissector table was used as the guinea pig.  This will eventually be
-    expanded to other dissector tables as well (most notably UDP ports).  Some
-    dissectors that "shared" a TCP/UDP port preference were also converted. It also
-    removed the need for some preference callback functions (mostly when the callback
-    function was the proto_reg_handoff function) so there is cleanup around that.
-    
-    Dissectors that has a port preference whose default was 0 were switched to using
-    the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference
-    
-    Also added comments for TCP ports used that aren't IANA registered.
-    
-    Change-Id: I99604f95d426ad345f4b494598d94178b886eb67
-    Reviewed-on: https://code.wireshark.org/review/17724
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 11d3224
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Oct 5 17:01:57 2016 +0200
-
-    s7comm: use ws_stroi function.
-    
-    Change-Id: I0d27c2aa7d896c4c6048dff963910ad7f88b07ee
-    Reviewed-on: https://code.wireshark.org/review/18085
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit eaf6258
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 7 15:41:37 2016 +0200
-
-    dpnss: use ws_strtou function.
-    
-    Change-Id: If0313f96aaca8d17c55e76dc27a643cbbbdfdcd0
-    Reviewed-on: https://code.wireshark.org/review/18113
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6a306f2
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 7 15:38:52 2016 +0200
-
-    wlccp: fix typo.
-    
-    Change-Id: I893fdc3025119c69142c617bfcea65654c45ad8b
-    Reviewed-on: https://code.wireshark.org/review/18112
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 95e927e
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 7 15:44:45 2016 +0200
-
-    iso8583: use ws_strtoi function.
-    
-    Change-Id: Icbf98fe1754984cde137dffd98ae6e24ca34081d
-    Reviewed-on: https://code.wireshark.org/review/18114
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b15079b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 7 15:48:07 2016 +0200
-
-    idl2wrs: use ws_strtou function.
-    
-    Change-Id: I696688088ae926e32ff6c4518c020537d8fe7597
-    Reviewed-on: https://code.wireshark.org/review/18115
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dd589f5
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Tue Oct 4 19:55:12 2016 +0200
-
-    Qt: valign text in RTP Stream Analysis window.
-    
-    The text on the left hand side of the RTP Stream Analtsis window is
-    a (HTML) table of table headers followed by table data. For some reason
-    the table data is center aligned in the cells of the table. This does not
-    line up with the text in the table header cells.
-    
-    See http://imgur.com/a/QIQFd
-    
-    Also the HTML document is not compliant. Closing tags are missing, for
-    td and html itself.
-    
-    Change-Id: I1cd58e8702db12433c863757141a6b68c1e2550c
-    Reviewed-on: https://code.wireshark.org/review/18074
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 41fe95f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 7 16:46:56 2016 +0200
-
-    [MEGACO] Add long name for gm/rsb
-    
-    Change-Id: I72efa2210f03477d7e04b2177b751b29cf827eb0
-    Reviewed-on: https://code.wireshark.org/review/18116
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 22d8142
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Oct 6 10:38:39 2016 -0700
-
-    Disable ASAN when building lemon.
-    
-    If ASAN is enabled, use "-fno-sanitize=all" when building lemon. This
-    keeps us from having to set ASAN_OPTIONS=detect_leaks=0 in the
-    environment in order to build Wireshark.
-    
-    Change-Id: I36f6d1a4f913ecabaf188f4c2b59216c8430d81a
-    Reviewed-on: https://code.wireshark.org/review/18098
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 827ae0c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Oct 7 11:01:37 2016 +0200
-
-    TLS: Fix typo after g989dcef3
-    
-    Change-Id: I23cf7e7847aea4f48f035d567ba7d22060acb0e7
-    Reviewed-on: https://code.wireshark.org/review/18106
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 830e7ff
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Oct 7 11:03:39 2016 +0200
-
-    TLS: Display extension type with decimal (like IANA)
-    
-    Change-Id: I33820de49a43fceaacc2172068dde83eb0be5fdc
-    Reviewed-on: https://code.wireshark.org/review/18107
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit d58da8e
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Oct 6 17:04:45 2016 +0200
-
-    Interface View/Model: Correct column ordering
-    
-    This orders the columns correctly in the sequence the developer
-    has intended when adding them with setColumns. Also it allows for
-    disabling and inverting the filtering by type, as well as query
-    additional roles instead of only Qt::DisplayRole from the tree model.
-    
-    Change-Id: I90469e8e3f3caa50debb3c839590d42719a6fb10
-    Reviewed-on: https://code.wireshark.org/review/18096
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a239472
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Oct 6 12:25:00 2016 +0200
-
-    rtsp: use ws_strto[u|i] functions.
-    
-    Change-Id: Id3fa0b4d3a99004ab74be329e13e95c47e11ab72
-    Reviewed-on: https://code.wireshark.org/review/18091
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dd5a1f6
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Oct 6 17:10:00 2016 +0200
-
-    soupbintcp: use ws_strto[u|i] functions.
-    
-    Change-Id: I2bf33798843c8768f4d980a065bd2d13e9d32ed8
-    Reviewed-on: https://code.wireshark.org/review/18097
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bdcbc3e
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 7 12:17:24 2016 +0200
-
-    tpncp: use ws_strtou function.
-    
-    Change-Id: Ic8e5c5abffe456ed7a48abf1de87d63665667759
-    Reviewed-on: https://code.wireshark.org/review/18105
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 196c2b1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 6 12:44:43 2016 +0200
-
-    TLS(1.3): Add Hello Retry Request (6) extension
-    
-    Add also special case on hello key_share extension
-    
-    Ping-Bug: 12779
-    Change-Id: Ib8e2dd060f322c2404a8afa9b8cb70de7c2c65b7
-    Reviewed-on: https://code.wireshark.org/review/18093
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5b3dcb6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jul 29 12:22:49 2016 +0200
-
-    .mailmap: fix typo
-    
-    Change-Id: I8ee371ab99397c00293372102c73805108845738
-    Reviewed-on: https://code.wireshark.org/review/17979
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6643378
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Oct 6 10:04:52 2016 -0400
-
-    M2PA: use G_STRINGIFY to show the user the default preference value.
-    
-    The preferences subsystem knows/stores the default values for all preferences;
-    maybe we should use that to show the default values for all preferences.
-    
-    Change-Id: I562ce9f129c8dfd8378aeb425f70f21b4cf59230
-    Reviewed-on: https://code.wireshark.org/review/18094
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9e23ed3
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Thu Oct 6 13:57:55 2016 -0400
-
-    ENIP: Add Connection ID to tree
-    
-    1. Add Connection ID to tree
-    2. Remove unused defines
-    3. Fix Typo
-    
-    Change-Id: I25b76057d5c482c73f22e45cc38d5dceb68feca6
-    Reviewed-on: https://code.wireshark.org/review/18099
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6529b36
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Sep 29 10:17:07 2016 +0200
-
-    TLS(1.3): Add cookie (44) hello extension
-    
-    Ping-Bug: 12779
-    Change-Id: I94d492d126050fdff6f98608f9d68d55c19e0a50
-    Reviewed-on: https://code.wireshark.org/review/18092
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 26a6881014c85c935f2794f6eeb852849137c20a)
+    Reviewed-on: https://code.wireshark.org/review/22124
 
-commit 40d23eb
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Thu Oct 6 14:40:28 2016 -0400
-
-    CIP: More minor bug fixes
-    
-    1. CIP Safety: Exception Detail Alarm and Exception Detail Warning both were not parsing their 3 parts because the offset was not increased. Fixed the offsets and combined the functions because they have the same format.
-    2. CIP: Forward Open Safety Response had wrong offsets so it was parsing incorrectly. This incorrectly showed as Malformed.
-    3. CIP Safety: Pass in tvb to proto_tree_add_subtree() instead of NULL. This was causing a Dissector bug (seems only on trunk, not 2.2). This was already done for packet-cip.c under https://code.wireshark.org/review/#/c/16748/
-    4. Some minor typos
-    
-    Change-Id: I63e8d200cd3408c16ca0a1edbc483c3bb8298d3b
-    Reviewed-on: https://code.wireshark.org/review/18100
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8b6de4c
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Thu Oct 6 18:03:40 2016 -0500
-
-    Add a little more info about vagrant and our Vagrantfile.
-    
-    Change-Id: I2f24f869e6b7b819e50e3ea5ade5dbae5272ced2
-    Reviewed-on: https://code.wireshark.org/review/18102
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 18883a7
-Author: shuai xiao <iamhihi@gmail.com>
-Date:   Thu Oct 6 14:03:05 2016 -0700
-
-    packet-ieee80211.c - fix bug in vht_compressed_beamforming_report
-    
-    Change-Id: I667c00a8093896984dbf75fa20bec86304706886
-    Reviewed-on: https://code.wireshark.org/review/18101
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5c55c42
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Oct 1 19:12:14 2016 +0200
-
-    jsmn(.h): fix warning: '@param' command used in a comment that is not attached to a function declaration [-Wdocumentation]
-    
-    Change-Id: Ia03fc0d1d0d4af430055f2ae3c66416922b62fd1
-    Reviewed-on: https://code.wireshark.org/review/18009
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 5a12a5e
-Author: Andreas Urke <arurke@netwurke.com>
-Date:   Thu Oct 6 01:24:08 2016 +0200
-
-    packet-ieee802154: Correct DISSECT_IEEE802154_OPTION_ZBOSS from 0x03 to 0x04
-    
-    Bug: 12984
-    Change-Id: Ie7d74a99807cfc77b0c444d79e21b64e1612ac90
-    Reviewed-on: https://code.wireshark.org/review/18088
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 93b7eea
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Oct 5 21:29:57 2016 +0200
-
-    EIGRP: fix checksum computation
-    
-    Bug: 12982
-    Change-Id: Iaf816247d49b2f869dc19f64cb0a24247fb38169
-    Reviewed-on: https://code.wireshark.org/review/18087
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2b5020a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Oct 5 11:21:41 2016 -0700
-
-    randpkt-test: Fix our optstring
-    
-    "-a" doesn't have an argument.
-    
-    Change-Id: Ia178985925da6e8bf9e1f0e9626521fb93656632
-    Reviewed-on: https://code.wireshark.org/review/18086
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 90e30be
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 20 12:05:10 2016 +0200
-
-    bootp: use ws_strtoi function.
-    
-    Change-Id: Id6e4f65d9f011c259931824235bbfb04362c0c71
-    Reviewed-on: https://code.wireshark.org/review/17813
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6416ae6
-Author: Joakim Karlsson <oakimk@gmail.com>
-Date:   Tue Oct 4 23:43:54 2016 +0200
-
-    gtp: improve traffic flow template
-    
-    Both 29.060 and 29.274 reference to 24.008 for TFT filter.
-    Remove redundant part and switch to common TFT encoder.
-    
-    Second reason: decode_gtp_tft didn't encoder all correct,
-    missed direction and filter index.
-    
-    Change-Id: I9691dcb5a9d151f181a3531145ac339fcc7ba245
-    Reviewed-on: https://code.wireshark.org/review/18082
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 55148a2
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Mon Sep 12 14:30:44 2016 +0200
-
-    CMakeLists: Add man files
-    
-    Current Wireshark.app bundle on OS X doesn't include man pages.
-    
-    Change-Id: I4123105ae805c3f127dbfd74768b88d4da546c56
-    Ping-Bug: 12746
-    Reviewed-on: https://code.wireshark.org/review/17902
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bf424e6
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sun Sep 25 16:20:24 2016 +0200
-
-    macOS: extend MANPATH for Wireshark.app
-    
-    Modify postinstall.sh script to add file /etc/manpaths.d/Wireshark
-    during installation.
-    Content of the file is the current path of the Wireshark manpages.
-    
-    Bug: 12746
-    Change-Id: I1dc0dc9a2acf56c39c78c709294f1a6804c6ec5c
-    Reviewed-on: https://code.wireshark.org/review/17916
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bff2f93
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Sun Sep 18 20:01:26 2016 +0200
-
-    isakmp: Add dissection of Responder Lifetime notification
-    
-    Derive the dissection functions from
-    dissect_ike_attribute() and dissect_ipsec_attribute():
-    * Add dedicated header fields.
-    * Remove attribute types not applicable in Responder Lifetime context.
-    
-    Clean up the field name "isakmp.ipsec.attr.type".
-    
-    Bug: 12963
-    Change-Id: I486380836d915255812098be2190bcc77ec13c00
-    Reviewed-on: https://code.wireshark.org/review/17970
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cb95951
-Author: PHO <pho@cielonegro.org>
-Date:   Mon Oct 3 08:52:08 2016 +0900
+commit b0af8a5
+Author: Anthony Coddington <anthony.coddington@endace.com>
+Date:   Fri Jun 9 17:16:27 2017 +1200
 
-    tvbuff_zlib: Check if the given offset and compressed length are indeed valid before trying to allocate memory
+    Fix automatic name resolution not saved to NRB
     
-    g_malloc() may abort(3) the program when the comprlen is insanely large so use tvb_memdup() instead.
+    Clear DUMMY_ADDRESS_ENTRY when add_ipv4_name/add_ipv6_name. This flag is checked in ipv4_hash_table_resolved_to_list().
+    TODO: clean up these flags as they are confusing and DUMMY appears somewhat redundant.
     
-    Change-Id: I23fbdc2362900030c41da1c297ab0c787de7c5ca
-    Reviewed-on: https://code.wireshark.org/review/18043
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I81d40cc778cbe5c36314631d3fa0997cee409368
+    Bug: 13798
+    Reviewed-on: https://code.wireshark.org/review/22109
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit f3267f17a3fc3c8ab138940653f2e968c5d27378)
+    Reviewed-on: https://code.wireshark.org/review/22114
 
-commit 257abd9
+commit 5be6088
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 2 21:07:24 2016 +0200
+Date:   Sun Jun 11 19:30:49 2017 +0000
 
-    spnego: fix indent (use 2 spaces) and modelines
+    address(.h): fix typo adresses => addresses
     
-    Change-Id: I077c21eb213435e7ed0e9ac0b9a8f95aa9dd6f3d
-    Reviewed-on: https://code.wireshark.org/review/18075
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: Ibc787005bb7865da55d2d8257009bace1108f181
+    Reviewed-on: https://code.wireshark.org/review/22082
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d6635e8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 4 18:19:06 2016 +0200
-
-    msrp: use ws_strtou function.
-    
-    Change-Id: I54bef4b44bcf4ad851c6f0817b1e2c645d0e409a
-    Reviewed-on: https://code.wireshark.org/review/18068
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 23f11b7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 4 15:16:02 2016 +0200
-
-    Openflow (v4/v5): Add check if all length is decoded
-    
-    Change-Id: I7846dd04c45d0398ded8345b6a2794d6f851cb64
-    Ping-Bug: 12979
-    Reviewed-on: https://code.wireshark.org/review/18065
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dda1ee0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Sep 30 10:47:21 2016 +0200
-
-    LLDP: fix indent (use tab)
-    
-    Change-Id: Ic9923d93d74a40da2a4009f8b27d8a5ae9803833
-    Reviewed-on: https://code.wireshark.org/review/18064
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 76cf240
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Oct 4 07:30:29 2016 -0400
-
-    SMPP: Make smpp.message a FT_BYTES field.
-    
-    As an FT_NONE field, you can't filter/use the message it contains.
-    
-    Bug: 12960
-    Change-Id: Icaa9a260195711f1bd90f5ed14797c0d0c46de9c
-    Reviewed-on: https://code.wireshark.org/review/18063
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ca2ac99
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Sep 26 15:13:11 2016 +0200
-
-    h248_annex_c: use ws_strtoi function.
-    
-    Change-Id: I0f9a1866a58ec61a8cd424ca69c1170791b5fe72
-    Reviewed-on: https://code.wireshark.org/review/17939
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6499a02
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 4 09:05:31 2016 -0700
-
-    Color filters: Initialize a variable.
-    
-    Make sure temp_dfilter is initialized so that we don't end up freeing
-    invalid memory.
-    
-    Change-Id: Id31969573690574846422b67c950188fd6ee4ef3
-    Reviewed-on: https://code.wireshark.org/review/18066
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit c8143e2
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 4 10:52:50 2016 +0200
-
-    Qt: add condition to compile without extcap.
-    
-    Change-Id: Ieabccb5dfc7884bebf9f2b68caaa16a82609bd30
-    Reviewed-on: https://code.wireshark.org/review/18060
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit d8fdf54
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Oct 3 12:02:21 2016 +0200
-
-    sshdump: add remote capture command.
-    
-    This new option adds the chance to use a custom capture command.
-    It must produce a PCAP stream that will be read by Wireshark,
-    written to STDOUT.
-    
-    Change-Id: I34a72465eb369194f24ecf0594df143b8ad6555f
-    Reviewed-on: https://code.wireshark.org/review/18037
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 99367fc
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Oct 3 16:19:01 2016 +0200
-
-    sshdump: use tcpdump as default capture binary.
-    
-    This removes the option to specify a custom capture binary due to
-    incompatibilities between different binaries options. A following
-    change will add the chance to use a custom capture command that
-    will cover all the cases that the default doesn't.
-    
-    Bug: 12952
-    Change-Id: Idbde3e27f34c28f4ce622c3a860994e25ce5f92f
-    Reviewed-on: https://code.wireshark.org/review/18040
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit bdd2193
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Oct 4 07:51:39 2016 +0200
-
-    LTE RRC: upgrade dissector to v13.3.0
-    
-    Change-Id: Ic2c8e9c6d3df0bffdd6a195c29aa586df29cb20a
-    Reviewed-on: https://code.wireshark.org/review/18059
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 8d08b3e
-Author: PHO <pho@cielonegro.org>
-Date:   Mon Oct 3 08:49:40 2016 +0900
-
-    help/Makefile.am: Use the python command chosen by the configure script
-    
-    Change-Id: I7b6e2b0c7802e214b4483990d0e7e70c58b3f96b
-    Reviewed-on: https://code.wireshark.org/review/18042
+    (cherry picked from commit d4e51deadb280b822532a268304fed0e03b31cac)
+    Reviewed-on: https://code.wireshark.org/review/22099
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit fc23470
-Author: Roland Knall <rknall@gmail.com>
-Date:   Mon Oct 3 19:57:44 2016 +0200
-
-    Interface View/Model: Fix pcap-less build
-    
-    Change-Id: I88bc6c939b7ce6986299e4ebf99358437b758bd2
-    Reviewed-on: https://code.wireshark.org/review/18045
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a59e64c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Oct 4 03:05:47 2016 +0200
-
-    uat: fix PT_TXTMOD_HEXBYTES/PT_TXTMOD_ENUM comments
-    
-    The PT_TXTMOD_HEXBYTES comment was misleading, edit it to reflect the
-    actual implementation in GTK+/Qt.
-    
-    Change-Id: I1506ad9189296dcc09cc20eafb0d65eaf291d79f
-    Reviewed-on: https://code.wireshark.org/review/18058
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 1fdbdf7
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Sat Oct 1 20:43:54 2016 +0200
-
-    Qt: Have logo in the center of the about dialog
-    
-    Change-Id: I5dca338e7e3eda3f4b0fa827fe6f7177337f5393
-    Reviewed-on: https://code.wireshark.org/review/18011
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8ea52e2
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Oct 3 15:18:49 2016 -0700
-
-    Man pages: Update -D flag text.
-    
-    Refer to "Windows" instead of "Windows 2000". Add an "ip link show"
-    breadcrumb.
-    
-    Change-Id: Ie1faa1d30b0ac63de35b0385cbb1306f08828e61
-    Reviewed-on: https://code.wireshark.org/review/18056
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a68dd39
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Oct 3 23:30:02 2016 +0200
-
-    p1: Handle implicit Content
-    
-    The retured-content is defined as IMPLICIT Content (octet string),
-    so ensure we handle this correctly.
-    
-    Bug: 12976
-    Change-Id: I4bcce67cea97142bf3312e1a5c2aeb169c7a69d2
-    Reviewed-on: https://code.wireshark.org/review/18054
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 650c0f9
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Oct 3 21:09:28 2016 +0200
-
-    p1: Check for valid tvb before tvb_reported_length
-    
-    Move the modification of the content item (which adds the length)
-    inside the check for a valid tvb to avoid calling tvb_reported_length()
-    with a NULL parameter.
-    
-    Bug: 12976
-    Change-Id: I54368584b7c00f7a2937eaec772533ae73d98f80
-    Reviewed-on: https://code.wireshark.org/review/18050
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 1320ea4
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Sep 20 11:30:38 2016 -0700
-
-    Be more forgiving about invalid Coloring Rules.
-    
-    In ColoringRulesDialog:
-    
-    Only check a rule's display filter if that rule is enabled. This keeps
-    us from disabling the OK button when we shouldn't.
-    
-    Adjust the "Your coloring rules file contains unknown rules" dialog text
-    and buttons for accuracy.
-    
-    In color_filters.c:
-    
-    Don't try to compile disabled filters in color_filters_apply. Don't warn
-    about disabled and invalid filters in read_filters_file.
-    
-    Bug: 12814
-    Change-Id: I7143bf8e7a6162d296f1e93769344b69763195c8
-    Reviewed-on: https://code.wireshark.org/review/17823
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d2a59db
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Wed Sep 28 14:00:17 2016 +0300
-
-    PROFINET: Add preliminary version of the Reporting System (RS) dissection.
-    
-    The Reporting System (RS) ASE is composed of Observers and Event buffer queues.
-    
-    Bug: 12959
-    Change-Id: Ibce2d607bffe9c04b24e8ccd5ef502307fbba7c6
-    Reviewed-on: https://code.wireshark.org/review/17965
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit a50bed0
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Mon Oct 3 16:31:36 2016 +0200
-
-    Interface List: Allow column filtering in model
-    
-    This change allows for the definition of columns to be shown
-    to the enduser if instanting the proxy model. The tree model
-    will allways transport ALL data, and it is the job of the proxy
-    model to determine which data is actually shown.
-    
-    Additionally, this removes the final definitions of the global
-    interface array from interface_frame as well as sort_filter, so
-    that knowledge about the inner workings of the interface list
-    is contained to interface_tree_model
-    
-    Change-Id: Ib34b150066ee344ad0d18bec1d90826eb0fa28b2
-    Reviewed-on: https://code.wireshark.org/review/18039
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 542c3c6
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Sep 29 14:32:03 2016 +0200
-
-    ssl: use ws_strtou function.
-    
-    Change-Id: I947dc83e3b1b853873b5158f234e44ef933c3bcc
-    Reviewed-on: https://code.wireshark.org/review/17982
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b90134f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Oct 3 08:16:30 2016 -0400
-
-    ieee80211: (Re)Fix EOSP flag dissection for mesh case
-    
-    Ia8d4d74a7f0f5795790f930fc1e894a7ee202da7 didn't have proper bit comparison.
-    
-    Change-Id: I5b7e431745aff7ca895b6b83500bd7e8f1039fde
-    Reviewed-on: https://code.wireshark.org/review/18038
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit aadec0f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Oct 3 09:59:52 2016 +0200
-
-    [Diameter] Use ...array_sized_new() for hf:s and ett:s
-    
-    Change-Id: I5d3d3779ccf1fcd8a61e6cb6342305db2bc6e2be
-    Reviewed-on: https://code.wireshark.org/review/18036
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7849d29
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 27 09:39:07 2016 +0200
-
-    Qt: make parameter unused when SHOW_BUFFER_COLUMN is undefined.
-    
-    Change-Id: I87843f61d4c98fea90e49088f3d56df5aa801e58
-    Reviewed-on: https://code.wireshark.org/review/17946
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 1fbf831
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Sep 30 10:51:41 2016 +0200
-
-    Qt: properly handle UAT changes on dialog close
-    
-    Ensure that UAT changes are always applied, not just when pressing the
-    OK/Cancel buttons, but also when closing the dialog via the window close
-    button or by pressing Escape.
-    
-    Change-Id: I0f0b97588553c6b01a24dfde78218d0ce2667e2c
-    Reviewed-on: https://code.wireshark.org/review/17993
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5472190
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 2 19:58:10 2016 +0200
-
-    cisco-erspan: fix no newline at end of file [-Wnewline-eof]
-    
-    Change-Id: I155a2293d48a62bd198aa20f0fb68f76934cdb6a
-    Reviewed-on: https://code.wireshark.org/review/18031
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cb1c8c6
-Author: Michael Sweet <michael.r.sweet@gmail.com>
-Date:   Sat Aug 20 12:09:25 2016 -0400
-
-    IPP packet dissector improvements:
-    
-    - Support collection values
-    - Support out-of-band values
-    - Support unknown values
-    - Support detail for octetString/collection values
-    - Support symbolic enum keywords for member attributes
-    - Update detail format to be more compact, normalize format to match IPP
-      syntax descriptions
-    
-    Change-Id: I76295221901fa88250a2e9ef099eca2c53b20132
-    Reviewed-on: https://code.wireshark.org/review/17693
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Smith Kennedy <smith.kennedy@hp.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 310d87b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Oct 2 22:33:03 2016 +0200
-
-    LPP: upgrade dissector to v13.2.0
-    
-    Change-Id: I6ebf5efcb656534f663369b7987aa32ebd55d2dc
-    Reviewed-on: https://code.wireshark.org/review/18033
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 57268e3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Oct 2 19:21:05 2016 -0400
-
-    tshark: follow streams should start with chunk 1.
-    
-    Chunk 0 is not allowed, so it's discarded when outputting a stream.
-    
-    Ping-Bug: 12855
-    Change-Id: Ia7bbb0e222b6b4e714f8bfa245e910c151d82905
-    Reviewed-on: https://code.wireshark.org/review/18034
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 470086f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Oct 2 20:52:14 2016 +0200
-
-    X2AP: upgrade dissector to v13.5.0
-    
-    Also get rid of two global variables
-    
-    Change-Id: I8c20decb76f5c1773f58efd24d2e1e7d1177d358
-    Reviewed-on: https://code.wireshark.org/review/18029
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7a6610f
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Oct 2 12:03:34 2016 -0700
-
-    make-manuf: Add more sanity checks.
-    
-    Increase the number of minimum entries required in each IAB / OUI file
-    to 1000. Add a minimum total entry count. Add total counts to the
-    output. Trim whitespace so that we pass the pre-commit hook.
-    
-    Re-run make-manuf to fix the mass removal in g3ab0137.
-    
-    Change-Id: I6f924969c1b494f2e0b62570a459e99ba5c1b02f
-    Reviewed-on: https://code.wireshark.org/review/18030
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 37f37bb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 2 11:27:18 2016 -0700
-
-    Some strings that appear in at least some .aps files.
-    
-    Change-Id: I335a2db8ce6ebb424081a9a6156c6eb523720029
-    Reviewed-on: https://code.wireshark.org/review/18028
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 53523a7
-Author: Roland Knall <rknall@gmail.com>
-Date:   Sun Oct 2 16:47:04 2016 +0200
-
-    Interface List: Fix build for no PCAP builds
-    
-    This is a fix for building without libpcap. Also, changing _U_
-    to Q_UNUSED for the tree_model
-    
-    Change-Id: I38a992731a3d3c4062ffab3cca0049cf08050794
-    Reviewed-on: https://code.wireshark.org/review/18019
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fea4d58
-Author: Roland Knall <rknall@gmail.com>
-Date:   Sun Oct 2 16:22:27 2016 +0200
-
-    Interface List: Hide button for only one interface
-    
-    If only one interface type exists, the button row is being hidden.
-    
-    Change-Id: Ieed9c363ab1ebc4bc15d0e09bceeb79a04d6e76e
-    Reviewed-on: https://code.wireshark.org/review/18017
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit e38d103
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Oct 2 16:41:08 2016 +0200
-
-    Qt: Only color sequence analysis items having color filter
-    
-    Packets without a color filter will end up with fg_color and
-    bg_color = 0, so avoid drawing all in black.
-    
-    Bug: 12065
-    Change-Id: I76bcabcfa3281fcece08f1b2af66274c808b80bb
-    Reviewed-on: https://code.wireshark.org/review/18018
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 9f55eb4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Oct 2 12:20:45 2016 +0200
-
-    wslua: fix wslua file test failure
-    
-    Lua 5.2.4 built with -DLUA_USE_APICHECK detected a stack issue:
-    
-        tshark: lapi.c:175: lua_settop: Assertion `(-(idx+1) <= (L->top - (func + 1))) && "invalid new top"' failed.
-    
-    Function File_read always assumes that File_read_line pushes a value on
-    the stack (which clearly did not happen). On read failure, it would then
-    pop the stack (tripping the assertion) to push nil.
-    
-    The other user (File_lines) is also affected by this change, but the Lua
-    5.2.4 documentation says that it should also return nil on EOF, fitting
-    this implementation.
-    
-    Change-Id: I9cc8a5319523b2b56f4ae4735bbdbc1196387386
-    Reviewed-on: https://code.wireshark.org/review/18016
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 3ab0137
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Oct 2 08:10:23 2016 -0700
-
-    [Automatic update for 2016-10-02]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Ice97c38ca24c22c72e6bc63a4329c8131d0146f2
-    Reviewed-on: https://code.wireshark.org/review/18020
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 98accd2
+commit 8f05fac
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 2 09:49:05 2016 +0200
+Date:   Thu Jun 8 10:03:27 2017 +0000
 
-    Makefile.am (epan/dissectors): fix indent align (and use always tabs)
+    netflow: fix typo adresses => addresses
     
-    Change-Id: I874314ac736ad94bfaf15665ee7b030382e9bdf3
-    Reviewed-on: https://code.wireshark.org/review/18015
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I8578f86f75b1a7278ad71d8671ce4e2dbc4f0c82
+    Reviewed-on: https://code.wireshark.org/review/22081
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1b8ccdc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 2 09:55:52 2016 +0200
-
-    gsm_osmux: fix implicit conversion shortens 64-bit value into a 32-bit value (with macOS buildbot)
-    
-    Change-Id: Idd919b20f9909fe3f85b6e1694738a8561f4d97f
-    Reviewed-on: https://code.wireshark.org/review/18014
+    (cherry picked from commit 0813fccb089ae6c9a910604f137fa8f99e66e142)
+    Reviewed-on: https://code.wireshark.org/review/22100
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0264015
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 2 09:46:39 2016 +0200
-
-    gsm_osmux(.h): fix packet-gsm_osmux.h: No such file or directory
-    
-    Change-Id: I51d6aa1ff4fe7abf908872c8297a926ebebf1258
-    Reviewed-on: https://code.wireshark.org/review/18013
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 483c4a6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Oct 1 23:46:13 2016 +0200
-
-    S1AP: upgrade dissector to v13.4.0
-    
-    Change-Id: I140c40a93dce2ffdf7c144701bc3886d5366f951
-    Reviewed-on: https://code.wireshark.org/review/18012
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0a9e74e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Oct 1 19:08:51 2016 +0200
-
-    wsjsmn(.h): fix no newline at end of file [-Wnewline-eof]
-    
-    Change-Id: If99fa78b20cdc9d2180652f7e4331fe2f8aacbff
-    Reviewed-on: https://code.wireshark.org/review/18008
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 913564a
+commit 2b2ecff
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Oct 1 20:24:45 2016 +0200
-
-    NAS EPS: upgrade dissector to v13.7.0
-    
-    Change-Id: Ic856255d4adbde0af795cd36798ba4a9d42b4080
-    Reviewed-on: https://code.wireshark.org/review/18010
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit dd0d9ea
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Oct 1 17:54:13 2016 +0200
-
-    interface_tree_model(.h): fix not a Doxygen trailing comment [-Wdocumentation]
-    
-    Change-Id: Ibdf59547ec116d99ff8e60fd8c69dbd2b929e887
-    Reviewed-on: https://code.wireshark.org/review/18007
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit c33169b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Oct 1 14:22:46 2016 +0200
-
-    3GPP NAS: upgrade dissector to v13.7.0
-    
-    Change-Id: I353608057c50e2631f6bae6a026f361640ec9560
-    Reviewed-on: https://code.wireshark.org/review/18006
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 99097dd
-Author: Roland Knall <rknall@gmail.com>
-Date:   Sat Oct 1 08:54:57 2016 +0200
-
-    Interface List: Change display to view/model
-    
-    This changes the underlying model of the main interface tree.
-    Because of that, we can resort to a view/model approach, enlisting
-    the global interfaces list as only data source.
-    
-    The interface list works identical to the old list, but allows
-    for filtering of the displayed interfaces by type. Only types, which
-    are present and whose interfaces are not hidden, are being displayed
-    for selection.
-    
-    Change-Id: If8475b227daa026dc0ad3d25bc7fe050d5bf2ac3
-    Reviewed-on: https://code.wireshark.org/review/17940
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit b6ad915
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Sep 21 16:53:11 2016 +0200
-
-    rlogin: use ws_strtou function.
-    
-    Add expert info when conversion fails.
-    
-    Change-Id: Ic13cb90abddd08218a957cd771bd5a4fab5a413e
-    Reviewed-on: https://code.wireshark.org/review/17839
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7ea3632
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Sep 30 10:46:28 2016 +0200
-
-    uat: allow insertion of new record at arbitrary index
-    
-    This should make drag-and-drop support (reordering) in Qt easier. It
-    also ensures that memcpy is used as fallback if copy_cb does not exist.
-    
-    Change-Id: Iefe358890c49dcda4727054f7a2cee05614a36f6
-    Reviewed-on: https://code.wireshark.org/review/17992
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2dfc0da
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Sep 30 08:15:11 2016 +0200
-
-    Kerberos: remove some unused #define
-    
-    for avoid conflit with heimdal lib
-    
-    Bug:12831
-    Change-Id: Ic244b6b8dc4f68a0f782b88984ad7857ceb02e25
-    Reviewed-on: https://code.wireshark.org/review/17989
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit da8969c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Sep 30 08:10:01 2016 +0200
-
-    spnego: use same name define name from krb5
-    
-    and for heimdal lib add the value
-    
-    Bug:12831
-    Change-Id: Ibf04560867acfe2a430034248ce2a386ea89b668
-    Reviewed-on: https://code.wireshark.org/review/17988
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0f18087
-Author: D. Ulis <daulis0@gmail.com>
-Date:   Fri Sep 30 15:19:51 2016 -0400
-
-    CIP: Minor bug fixes
-    
-    1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet
-    2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted
-    3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet.
-    4. CIP: Some minor formatting/whitespace changes.
-    
-    Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738
-    Reviewed-on: https://code.wireshark.org/review/18000
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cda2319
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Sep 30 11:21:05 2016 -0700
-
-    NetFlow: Fix a preference description.
-    
-    Stringify the correct macro so that we print
-    
-        (default: 60)
-    
-    instead of
-    
-        (default: V9TEMPLATE_MAX_FIELDS_DEF)
-    
-    Change-Id: Ie2068eaf577f6024d4a9b64ef5ce761944f269a2
-    Reviewed-on: https://code.wireshark.org/review/17998
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 11c1024
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Sep 28 12:01:33 2016 +0200
-
-    wsutil: split libjsmn.
-    
-    The libjsmn was imported into the tree and enhanced with a new
-    function. This change splits it into the "original" libjsmn and
-    an addictional module wsjsmn that contains the new function.
-    This will make easier to port within the tree future versions
-    of the library.
-    
-    Change-Id: I3f1caa91bee462e0767e5e18d0b6a10f0b1cad32
-    Reviewed-on: https://code.wireshark.org/review/17963
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 534787e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Sep 30 16:06:15 2016 +0200
-
-    cmake: make WERROR_COMMON_FLAGS a normal string
-    
-    Instead of checking for the boolean "FALSE", just set an empty string.
-    This avoids the need to check for WERROR_COMMON_FLAGS before using it.
-    
-    The transformation is the same for all files, remove
-    "if (WERROR_COMMON_FLAGS)" and "endif()", reindent and add quotes (since
-    we have a string here and not a list).
-    
-    Modelines have been added where missing.
-    
-    Change-Id: I0ab05ae507c51fa77336d49a99a226399cc81b92
-    Reviewed-on: https://code.wireshark.org/review/17997
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Dario Lombardo <lomato@gmail.com>
-
-commit 53c9197
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 30 09:35:30 2016 +0200
-
-    kismet: use cast in ws_strtou.
-    
-    Fix the warning:
-    
-    packet-kismet.c: In function 'dissect_kismet':
-    packet-kismet.c:242:58: error: passing argument 3 of 'ws_strtou64' from incompatible pointer type [-Werror]
-           if (ws_strtou64(format_text(line, tokenlen), NULL, &t.secs)) {
-                                                              ^
-    In file included from packet-kismet.c:34:0:
-    ../../wsutil/strtoi.h:49:24: note: expected 'guint64 *' but argument is of type 'time_t *'
-     WS_DLL_PUBLIC gboolean ws_strtou64(const gchar* str, const gchar** endptr, guint64* cint);
-    
-    Change-Id: Ifd31de22db22f39f78359cc9432eb7da187f73a6
-    Reviewed-on: https://code.wireshark.org/review/17990
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit c5655dc
-Author: Anders Broman <a.broman58@gmail.com>
-Date:   Fri Sep 30 11:52:26 2016 +0000
-
-    Revert "LLDP: fix indent (use tab)"
-    
-    This reverts commit f97372bfccf34c012b4a4a6f720ca54dae8ea5d8.
-    
-    Change-Id: I750b232fa710e64815875671e713533bb0f42e24
-    Reviewed-on: https://code.wireshark.org/review/17995
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f97372b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Sep 30 10:47:21 2016 +0200
-
-    LLDP: fix indent (use tab)
-    
-    Change-Id: I7f9aa2733401fc99a10d5d5a83a175e923562f50
-    Reviewed-on: https://code.wireshark.org/review/17991
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fdbf443
-Author: Daniel Willmann <dwillmann@sysmocom.de>
-Date:   Tue Jul 12 14:25:35 2016 -0400
+Date:   Sat Jun 10 16:31:52 2017 +0200
 
-    Add dissector for the osmux protocol
+    Windows: increase minimum CMake version to 3.7
     
-    The Osmux protocol bundles multiple AMR frames inside one UDP packet to avoid
-    the overhead of having one IP/UDP/RTP packet per AMR frame. It is used by the
-    osmocom project.
+    g9f0d22b introduced the use of GREATER_EQUAL operator. Let's update the
+    minimum CMake version accordingly.
     
-    Sponsored-by: On-Waves ehf
-    Change-Id: I8fb21e54adec8d8bd7ac5ebd2154100a73ab71c9
-    Reviewed-on: https://code.wireshark.org/review/16996
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 11da041
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Tue Aug 16 13:09:28 2016 +0300
-
-    LLDP: Update column info according to PROFINET requirements
-    
-    Column information of LLDP frames should be updated according to PROFINET
-    requirements without changing the default behavior of column information.
-    
-    Therefore, a new protocol setting is added.
-    This setting is used to display PROFINET specialized column information:
-    Edit-> Preferences -> Protocols -> Select LLDP
-    
-    Bug: 12937
-    Change-Id: I48b78d0a3f6b3425f6f9c1d4be20dc24b143346d
-    Reviewed-on: https://code.wireshark.org/review/17081
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d8a2d39
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 29 21:47:29 2016 +0200
-
-    Update c-ares to 1.12.0
-    
-    Change-Id: Icd70f5e4e5e1a41a6a188500874a893433ecb8ed
-    Reviewed-on: https://code.wireshark.org/review/17985
+    Change-Id: Ibf619a24f5ee296b547fbc6ba46e13b8a1f3302c
+    Reviewed-on: https://code.wireshark.org/review/22066
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 1f633cf
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Sep 29 11:25:52 2016 -0700
-
-    Qt: Add html_escape to qt_ui_utils.
-    
-    Add an html_escape convenience function, which escapes HTML
-    metacharacters using Qt::escape on Qt4 and QString::toHtmlEscaped on
-    Qt5. Use it where we were previously using #if QT_VERSION and calling
-    the API-specific functions.
-    
-    Change-Id: Ifda3e9634a37fc00bdb46e08d5711f934692fef5
-    Reviewed-on: https://code.wireshark.org/review/17984
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 5f69295
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Sep 29 08:33:24 2016 -0700
-
-    macosx-setup: Upgrade c-ares to 1.12.0.
-    
-    Change the download protocol to https as well.
-    
-    Change-Id: Id2043141d3b89449f2a0c739c05142af0a7b46ba
-    Reviewed-on: https://code.wireshark.org/review/17983
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d86214e
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Sep 12 14:18:30 2016 +0200
-
-    kismet: use ws_strtou64.
-    
-    Add also an expert info when the time is invalid.
-    
-    Change-Id: I8b3639aade41574cf1bda38f3ae1d02b09d0711c
-    Reviewed-on: https://code.wireshark.org/review/17678
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 85df921
-Author: Benjamin Parzella <bparzella@gmail.com>
-Date:   Fri Sep 23 15:58:34 2016 +0200
-
-    Added HSMS dissector
-    
-    Bug: 12942
-    Change-Id: I69ab22caa9938167db421ca2f0346ca086280823
-    Reviewed-on: https://code.wireshark.org/review/17890
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit c205bce
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Sep 29 13:03:41 2016 +0200
-
-    proto.c use g_list_prepend when adding heuristic dissectors and plugins.
-    
-    Change-Id: If55938f0bad556a002fc85466c0b4f0e904991dc
-    Reviewed-on: https://code.wireshark.org/review/17981
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b3166fd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Sep 28 13:48:23 2016 +0200
-
-    TLS: Fix indent of SNI hello extension
-    
-    use 4 spaces
-    
-    Change-Id: I0cbde19997f51046e6d5f22213b994a94a2998d6
-    Reviewed-on: https://code.wireshark.org/review/17978
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e91af83
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Sep 28 21:35:12 2016 -0700
-
-    Replace some seeks forward with wtap_read_bytes() with a null buffer pointer.
-    
-    If the seek forward is just skipping record content that's not
-    (currently) interesting, use wtap_read_bytes() with a null buffer
-    pointer; it catches short "reads" and requires less seeking, so it may
-    work better when reading from a pipe.
-    
-    Change-Id: Ifb07d20e0391a8ed97da85149d971b4e9ef093a8
-    Reviewed-on: https://code.wireshark.org/review/17976
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 48b6415
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Wed Sep 28 08:56:22 2016 +0300
-
-    PROFINET: Fix variable may not have been initialized warning
-    
-    The variable may not have been initialized.
-    To make code more readable and to avoid possible future mistakes
-    initialize the variables.
-    
-    Change-Id: I0c5e78b6d625c87252a4c47e263a3d5c701f2674
-    Reviewed-on: https://code.wireshark.org/review/17962
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 12d55fb
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Thu Sep 8 16:00:29 2016 +0200
-
-    TCP: Fix next sequence number for SYN/FIN packets with payload
-    
-    The next sequence number is off by one when there is TCP payload
-    in a SYN or FIN packet (e.g. when using TCP FastOpen).
-    
-    Bug: 12579
-    Bug: 12838
-    Change-Id: Idb68cea4b4dcba39461019c08db09367cbfc6d68
-    Reviewed-on: https://code.wireshark.org/review/16239
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ef2aae1
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Thu Sep 29 00:19:45 2016 +0300
-
-    packet-couchbase.c: dissect body of DCP_FAILOVER_LOG response
-    
-    Change-Id: Icbadcc83b5fedea4373d4c65a11700d73b3dc32e
-    Reviewed-on: https://code.wireshark.org/review/17972
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 14be63a
-Author: Dirk Jagdmann <doj@cubic.org>
-Date:   Fri Sep 23 01:46:16 2016 -0700
-
-    set PDML and PSML encoding to UTF-8. replace fputs() with fprintf() in writing PSML and PDML preambles for more consistent code formatting.
-    
-    Change-Id: I57dbb27cbf935dd31342639b315d1fc98bd27d77
-    Reviewed-on: https://code.wireshark.org/review/17895
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7aa243c
-Author: Parav Pandit <paravpandit@yahoo.com>
-Date:   Wed Sep 28 20:54:01 2016 +0000
-
-    packet-infiniband: Fix setting rocev2 udp port number
-    
-    This patch sets RoCE-v2 (RRoCE) UDP port number to right value of
-    4791 as assigned by IANA described in below link.
-    
-    http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=RoCE#InfiniBand_Trade_Association
-    
-    Change-Id: I97b82fb53fd63d9107ee5d4c64b94840e743fc72
-    Tested-by: pandit.parav@gmail.com
-    Reviewed-on: https://code.wireshark.org/review/17971
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a88b7bc
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Wed Sep 28 07:56:14 2016 +0300
-
-    PROFINET: Fix switch statement has no default
-    
-    A switch statement has no section labeled default.
-    To make the code more readable add the default statement with a good comment.
-    
-    Change-Id: Iacd9b1520628e229baedc89277d07ffac2caf1b6
-    Reviewed-on: https://code.wireshark.org/review/17960
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 814477c
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Wed Sep 28 08:26:34 2016 +0300
-
-    PROFINET: Fix pointer variable 'fp' previously deallocated warning
-    
-    'fp' pointer variable was freed or deleted in an earlier statement.
-    
-    To make code more readable and to avoid possible future mistakes
-    make sure that developer sees this situation.
-    
-    Change-Id: Ib5b9c4c32000adf05a30e094ebc98fe4bc4cfa52
-    Reviewed-on: https://code.wireshark.org/review/17961
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 48a6683
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Sep 28 16:45:23 2016 -0700
-
-    Use wtap_read_bytes() to skip over bytes when reading a record.
-    
-    Allow file_read() to take a null pointer as a buffer argument; a null
-    argument means "do everything except copy the bytes from the file to the
-    user buffer".  That means that wtap_read_bytes() and
-    wtap_read_bytes_or_eof() also support a null pointer as a buffer
-    argument.
-    
-    Use wtap_read_bytes() with a null buffer argument rather than
-    file_skip() to skip forward over data.
-    
-    This fixes some places where files were mis-identified as ERF files, as
-    the ERF open heuristics now get a short "read" error if they try to skip
-    over more bytes than exist in the file.
-    
-    Change-Id: I4f73499d877c1f582e2bcf9b045034880cb09622
-    Reviewed-on: https://code.wireshark.org/review/17974
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a3ce233
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Tue Sep 27 17:20:41 2016 +0300
-
-    PROFINET: Fix possibly passing a null pointer to function
-    
-    A NULL pointer is possibly being passed to a function identified.
-    
-    Change-Id: I87afb4fcd669451d94fecbcb827e7ff82d3e6740
-    Reviewed-on: https://code.wireshark.org/review/17950
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit f72f937
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Tue Sep 27 17:28:53 2016 -0400
-
-    pcep: Added rfc 7334 support.
-    Updated PCEP-ERROR Object Error Types and Values base on Path Computation Element Protocol (PCEP) Numbers 2016-08-09 version
-    
-    Change-Id: Ife0b49119a2b634279e33ab8f699a5dc57ecb34b
-    Reviewed-on: https://code.wireshark.org/review/17957
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1e532f2
-Author: Marius Paliga <mareko.paliga@gmail.com>
-Date:   Wed Sep 28 16:15:01 2016 +0200
-
-    Diameter: Add support for DRMP AVP
-    
-    Bug: 12961
-    Change-Id: I4d9abbae3893916fdd317263a74398d2242f53de
-    Reviewed-on: https://code.wireshark.org/review/17969
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4aca4dc
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Sep 28 14:38:41 2016 +0200
-
-    file_access: Use g_slist_prepend.
-    
-    Change-Id: I6ed0f384e130ec9181e43b6262bb21d91f944dfa
-    Reviewed-on: https://code.wireshark.org/review/17968
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c3b25e8
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Sep 28 13:31:14 2016 +0200
-
-    Use g_slist_prepend, it should be faster if there's a lot of IP addresses
-    
-    Change-Id: I3861c0af24523315db6889b22ec93159174ba86f
-    Reviewed-on: https://code.wireshark.org/review/17966
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4f636d1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Sep 28 13:59:52 2016 +0200
-
-    eap: check scanf return value (CID 1373396).
-    
-    Change-Id: I4b602110fc3959dd7214fe15e9c37e3870794c1d
-    Reviewed-on: https://code.wireshark.org/review/17967
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 148e4f7
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Sep 28 12:09:58 2016 +0200
-
-    When regestering taps, only loop trough the list of taps once when adding
-    new taps.
-    
-    Change-Id: Ida5ad2375c95664ee1b911d265cb69672db2be2d
-    Reviewed-on: https://code.wireshark.org/review/17964
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 152e245
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Sep 27 23:57:29 2016 +0200
-
-    proto_tree_add_item_ret_(u)int/proto_tree_add_bitmask_with_flags_ret_uint64: return real value
-    
-    Apply mask and bit shift on the returned value.
-    
-    Change-Id: I00aebc854756f01a25199a259d6d5252abea4349
-    Reviewed-on: https://code.wireshark.org/review/17958
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f8b32e5
-Author: Roland Knall <rknall@gmail.com>
-Date:   Tue Sep 27 18:55:08 2016 +0200
-
-    checkAPIs.pl: Avoid false positive in header
-    
-    This avoids the text index being identified as shadow variable
-    
-    Bug:12956
-    Change-Id: I5565c5807e2c7d317d6849deeba9edd63c069397
-    Reviewed-on: https://code.wireshark.org/review/17953
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit e302f5e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Sep 27 22:51:01 2016 +0200
-
-    tshark.c: fix indentation
-    
-    Change-Id: Ie44f76a063f375df4ae85642cd0d011a0e233d60
-    Reviewed-on: https://code.wireshark.org/review/17956
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e9b94ae
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Sep 27 21:39:46 2016 +0200
-
-    tshark: register extcap preferences
-    
-    Bug: 12949
-    Change-Id: I95ef8a15a2d629bbb351d34dbfc730fa5ea62cd5
-    Reviewed-on: https://code.wireshark.org/review/17954
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit 4edc611526fc2aa17a7f5e82ce0147d799d2c508)
+    Reviewed-on: https://code.wireshark.org/review/22092
 
-commit 5972c3d
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Sep 27 11:01:14 2016 +0200
-
-    [proto.c] proto_all_finfos(), pre-allocate array to hold all fields.
-    
-    Change-Id: I0d41e417e57e656ccee1c2ce6bd406af4ed23d10
-    Reviewed-on: https://code.wireshark.org/review/17948
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 73a0ee0
+commit a1bda46
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Sep 22 09:24:38 2016 -0700
+Date:   Thu Jun 8 10:39:05 2017 -0700
 
-    Qt+macOS: Look for San Francisco Mono
+    NSIS: Add support for Visual Studio 2017.
     
-    Make San Francisco Mono the default monospace font on macOS. Note that
-    we should look for Ubuntu Mono on that platform.
+    Also fixes a bug where vcredist was found in
+    C:\Program Files\Wireshark
     
-    Change-Id: I6f563099ae3797a7f73ea595158a2844581fbeec
-    Reviewed-on: https://code.wireshark.org/review/17867
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d39d272
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Sep 22 13:46:42 2016 +0200
-
-    TLS(1.3): Add Early Data (42) Hello extension
-    
-    Bug:12779
-    Change-Id: I97470c6e6be6e3df707cf2f3634f2c1e9da26bc2
-    Reviewed-on: https://code.wireshark.org/review/17885
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b5eb01c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 24 13:09:36 2016 +0200
-
-    ssl: fix crash when setting RSA key file without valid protocol
-    
-    If ssl_association_add is passed a NULL app_handle argument, it will
-    trigger DISSECTOR_ASSERT which fails due to the bad wmem scope
-    (wmem_packet_scope). Arguably DISSECTOR_ASSERT should not be used there,
-    but its alternative is g_warning/g_assert are not much different...
-    
-    Fix the crash (assertion failure) by checking that the UAT-supplied
-    protocol is really valid. Normally the post_update_cb should not be
-    invoked if any of the fields are invalid, but that requires larger
-    changes in the Qt UAT dialog code.
-    
-    Change-Id: Ie245213b650b1de9640db8dadd08f3ed2bff335f
-    Reviewed-on: https://code.wireshark.org/review/17906
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7bca5e1
-Author: Simon Zhong <szhong.jnpr@gmail.com>
-Date:   Sat Sep 24 23:18:18 2016 -0400
-
-    pcep: Added missed pieces of RFC 6006 support.
-    
-    Added display Object-Type number in string.
-    
-    Change-Id: Icbb44aae2379f308f49bef7355e8c8c901889c15
-    Reviewed-on: https://code.wireshark.org/review/17910
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e239f72
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Fri Sep 23 23:52:15 2016 +0200
-
-    ISAKMP: Rename identifiers and change item labels
-    
-    Rename identifiers and change item labels to reflect their purpose:
-    * ISAKMP Phase 1 = IKE
-    * ISAKMP Phase 2 = IPsec
-    * IKEv2 Attribute = Transform Attribute
-    Remove "transform" and "type" where they do not apply.
-    
-    External users of isakmp.tf.* field names, such as display filters,
-    have to be updated after this commit to use isakmp.ipsec.* instead.
-    
-    old                                     new
-    --------------------------------------------------------------------
-    dissect_transform_attribute()           dissect_ipsec_attribute()
-    dissect_transform_ike_attribute()       dissect_ike_attribute()
-    
-    ISAKMP_                                 IPSEC_
-    
-    hf_isakmp_tf_attr                       hf_isakmp_ipsec_attr
-    isakmp.tf.                              isakmp.ipsec.
-    
-    transform_ike_attr_type                 ike_attr_type
-    transform_isakmp_attr_type              ipsec_attr_type
-    transform_attr_sa_life_type             attr_life_type
-    transform_dh_group_type                 dh_group
-    transform_attr_encap_type               ipsec_attr_encap_mode
-    transform_attr_auth_type                ipsec_attr_auth_algo
-    transform_attr_ecn_type                 ipsec_attr_ecn_tunnel
-    transform_attr_ext_seq_nbr_type         ipsec_attr_ext_seq_nbr
-    transform_attr_addr_preservation_type   ipsec_attr_addr_preservation
-    transform_attr_sa_direction_type        ipsec_attr_sa_direction
-    transform_attr_enc_type                 ike_attr_enc_algo
-    transform_attr_hash_type                ike_attr_hash_algo
-    transform_attr_authmeth_type            ike_attr_authmeth
-    transform_attr_grp_type                 ike_attr_grp_type
-    
-    Type Payload                            Payload
-    Transform IKE Attribute Type            IKE Attribute
-    Transform Attribute Type                IPsec Attribute
-    Transform IKE2 Attribute Type           Transform Attribute
-    Config Attribute Type                   Config Attribute
-    ISAKMP (v1)                             IKEv1
-    ISAKMP (v2)                             IKEv2
-    --------------------------------------------------------------------
-    
-    Change-Id: Ib02a0bad100f932a290cae35ea4bd75b191f797b
-    Reviewed-on: https://code.wireshark.org/review/17914
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1a384ef
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Sep 26 15:04:34 2016 +0200
-
-    [proto.c] Add proto_find_first_finfo() to find first occurance of a field.
-    
-    Change-Id: I11f50d7b00851880f77067260e2496175d227e76
-    Reviewed-on: https://code.wireshark.org/review/17937
+    Change-Id: I0bc5c7410a95677d21c2e28ba66d6a9d186fe2a9
+    Reviewed-on: https://code.wireshark.org/review/22044
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0a45d13
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Sep 26 16:19:42 2016 -0700
-
-    WiX: Try to fix development upgrades.
-    
-    Try enabling the MajorUpgrade:AllowSameVersionUpgrades attribute. This
-    should keep the .msi packages from installing side by side when only
-    the micro version differs.
-    
-    Change-Id: I37e8971d965ec1909c6baacb55d6a8062b13ff70
-    Reviewed-on: https://code.wireshark.org/review/17945
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit b725d6c
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Sep 26 10:34:04 2016 -0700
-
-    Add an initial "shellcheck" target.
-    
-    Look for shellcheck in Autotools and CMake, and if found add a target
-    that checks some of our shell scripts.
-    
-    Add a "source=" directive to targets that include test-common.sh so
-    that shellcheck will correctly process the scripts. Note that this
-    requires shellcheck 0.4.0 or later.
-    
-    To do: Fix the issues that shellcheck found and check more scripts.
-    
-    Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c
-    Reviewed-on: https://code.wireshark.org/review/17943
     Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 06352a2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 26 14:39:45 2016 -0700
-
-    Reorganize the source lists.
-    
-    For the different classes of generated dissectors, have
-    CLEAN_xxx_DISSECTOR_SRC with the ones that compile without warnings,
-    DIRTY_xxx_DISSECTOR_SRC for the ones that get warnings, and
-    xxx_DISSECTOR_SRC which is the combination of the two.
-    
-    Add a new NCP2222_DISSECTOR_SRC for the packet-ncp2222.c dissector
-    generated by tools/ncp2222.py.  Add a new source group for it.
-    
-    Move register.c to DISSECTOR_SUPPORT_SRC.  Get rid of
-    DISSECTOR_GENERATED_FILES; it's kind of a "none of the above" category,
-    and we now have an "above" for all files.
-    
-    Include NCP2222_DISSECTOR_SRC in DISSECTOR_FILES.
-    
-    Add an ALL_DISSECTOR_SRC that includes DISSECTOR_FILES and
-    CORBA_IDL_DISSECTOR_SRC (why are those kept separate?).  Use it for the
-    list of files we use to generate register.c.
-    
-    Add NCP2222_DISSECTOR_SRC to CLEAN_FILES.
-    
-    (Hopefully this makes it less likely that we'll forget to use -Werror
-    for clean dissector files or forget to use them to generate register.c.)
-    
-    Change-Id: Ib9a7d10e1b9045516ef1f014046c6ff777c42be2
-    Reviewed-on: https://code.wireshark.org/review/17944
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7b279d2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Sep 26 15:54:06 2016 +0200
-
-    Register ncp2222 dissector
-    
-    Otherwise a lot of ncp fields are missing.
-    
-    Bug: 12945
-    Fixes: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.")
-    Change-Id: Ic46dc12c9a98b38d78ef988c0ce71f38e3163549
-    Reviewed-on: https://code.wireshark.org/review/17941
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Reviewed-by: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6fcce37
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Sep 15 09:51:42 2016 +0200
-
-    sshdump: restyle the output write routine.
-    
-    Bug: 12884
-    Change-Id: I90733bbcbbd8fafc0421b3fb9c6f9b48f178583c
-    Reviewed-on: https://code.wireshark.org/review/17710
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 0850c1f
-Author: Peter Palúch <Peter.Paluch@fri.uniza.sk>
-Date:   Tue Sep 13 15:07:57 2016 +0200
-
-    BGP: Support for Cost, EIGRP and OSPF extended communities
-    
-    Bug: 12891
-    Change-Id: I70ed7f8a08122c559128b8df4d65e03be8201e1a
-    Reviewed-on: https://code.wireshark.org/review/17683
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Palúch <Peter.Paluch@fri.uniza.sk>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 91ab8cf
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Sep 25 10:29:37 2016 +0200
-
-    btle: Fix Feature support bit positions
-    
-    From BT spec 4.2 volume 6 part B section 4.6, Feature support.
-    
-    Bug: 12946
-    Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf
-    Reviewed-on: https://code.wireshark.org/review/17911
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 37a92dd
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Sep 25 22:18:06 2016 +0200
-
-    btle: Show full LL_VERSION_IND SubVersNr
-    
-    The BT spec does not specify a bitmask for Subversion Number.
-    
-    Change-Id: If6f384badc4228ea1e1c30ec8156f382ca5959e0
-    Reviewed-on: https://code.wireshark.org/review/17936
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 1565846
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Sep 25 20:17:29 2016 +0200
-
-    btle: Add LL_LENGTH_REQ/RSP control data
-    
-    Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e
-    Reviewed-on: https://code.wireshark.org/review/17932
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit aeb112f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Sep 25 11:21:57 2016 -0700
-
-    Do GArray bounds checking.
-    
-    Make sure we aren't going past the end of the array of per-interface
-    packet counts.
-    
-    Change-Id: I6e19a5d375ebcc2193c37dc42c8f49836a5fd2c7
-    Reviewed-on: https://code.wireshark.org/review/17924
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 79ae8c1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Sep 25 11:02:27 2016 -0700
-
-    Report failure to compile a filter as an error.
-    
-    The NCP dissector relies on those filters being compiled, and we end up
-    doing a g_assert() anyway; use g_error() to make sure the error gets
-    printed.
-    
-    Change-Id: Ibc20407c1c08f0baaa626f269e9552ae11b36083
-    Ping-Bug: 12945
-    Reviewed-on: https://code.wireshark.org/review/17921
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f3fede0
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Sun Sep 25 19:08:25 2016 +0200
-
-    [iscsi] Add a cast "packet-iscsi.c(625): warning C4267: 'function' :
-    conversion from 'size_t' to 'guint', possible loss of data"
-    
-    Change-Id: I63ddf1384acdebc176a052489891d55d7a1b21ce
-    Reviewed-on: https://code.wireshark.org/review/17920
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fce2531
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Sep 25 08:12:59 2016 -0700
-
-    [Automatic update for 2016-09-25]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Ie3096d67f82b93b751640e063ebe231fc235f83f
-    Reviewed-on: https://code.wireshark.org/review/17917
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit e6ea68c
-Author: Masashi Honma <masashi.honma@gmail.com>
-Date:   Thu Sep 8 18:44:00 2016 +0900
-
-    ieee80211: Fix EOSP flag dissection for mesh case
-    
-    Change-Id: Ia8d4d74a7f0f5795790f930fc1e894a7ee202da7
-    Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17550
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0ee1445
-Author: rosemountSkp <rosemountSkp@code.wireshark.org>
-Date:   Thu Aug 25 14:19:41 2016 +0000
-
-    Improve HART dissector
-    
-    Fixed short command 0 short address,
-    command 0 that has less bytes,
-    command 9 byte count,
-    command 48 parse first 6 bytes instead of 5 and
-    the command may has less bytes, pass correct byte count into the
-    dissect_parse_hart_cmds() function.
-    
-    Added support HART published and NAK message types and more HART commands.
-    
-    Bug: 12817
-    Change-Id: I4a9e7f9b342346ff4ecdcd06a73238c1a08d00fc
-    Reviewed-on: https://code.wireshark.org/review/17325
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 870822b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 23 14:31:34 2016 +0200
-
-    eap: add imsi to wlan identity dissection.
-    
-    Change-Id: Ic8ff4e1846e8c0a11ee19ffbc4897635388dfa62
-    Reviewed-on: https://code.wireshark.org/review/17888
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 31cd04e
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 20 17:49:50 2016 +0200
-
-    ssh: use ws_strtoi function.
-    
-    Change-Id: Iafcb721eb6081902dd6b5c3a2258ae5c2ccd95e9
-    Reviewed-on: https://code.wireshark.org/review/17822
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8ca8464
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Sep 21 15:03:28 2016 +0200
-
-    idl2wrs: use ws_strtou function
-    
-    Change-Id: I90173b0defc04ac80054170153afe9389def620b
-    Reviewed-on: https://code.wireshark.org/review/17837
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3c9fb07
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Sep 22 14:45:52 2016 +0200
-
-    iscsi: use ws_strtou functions.
-    
-    Add expert info for failed conversion.
-    
-    Change-Id: I03d5e2db791f81d43384bb047c268d07709a6099
-    Reviewed-on: https://code.wireshark.org/review/17863
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 06b09ee
-Author: Andreas Leibold <andreas.leibold@harman.com>
-Date:   Mon Sep 12 14:51:51 2016 +0200
-
-    Changes to 1722.1 / MAAP to work with 1722 draft15
-    
-    The C/D control flag was integrated in the subtype field of 1722 after
-    draft 6. These changes are now added to the 1722-1 and MAAP protocol.
-    
-    Change-Id: I19b2e8237fb87d42ec7bcb6f9f53e8cc8605731d
-    Reviewed-on: https://code.wireshark.org/review/17664
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 75ae538
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 24 15:11:32 2016 +0200
-
-    ssl: fix exact matching of ALPN protocol names
-    
-    The "name_length >= alpn_proto->proto_name_len" condition always failed
-    to match for short names (like "h2" where the reported length is 2, but
-    the proto_name_len would be 3).
-    
-    This fixes recognition of HTTP/2 traffic, without this patch it would be
-    interpreted as http-over-tls as reported on
-    https://ask.wireshark.org/questions/55720/how-to-install-http2-dissector-plugin
-    
-    Change-Id: Idc3eae0b6d593c8f3c435230ef76da90a4b1e7fc
-    Reviewed-on: https://code.wireshark.org/review/17907
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 46aba5a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 24 12:16:08 2016 +0200
-
-    doc: add the -d (decode as) option to wireshark(1)
-    
-    Text is partially copied from the tshark manual page.
-    
-    Change-Id: I120e327f15394fc48fce6e4a122e7eab83e91c82
-    Reviewed-on: https://code.wireshark.org/review/17904
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cacb4a4
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sat Sep 24 11:17:17 2016 +0200
-
-    Editcap: Fix comparsion between signed and unsigned int
-    
-    secs_per_block is a unsigned integer. Therefore we can't
-    compare a signed integer with it.
-    
-    Change-Id: Ic965a88e0e704e296c4af9193ca4a3504173ae36
-    Reviewed-on: https://code.wireshark.org/review/17901
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 17546ad
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Sep 21 15:38:16 2016 -0700
-
-    Check for ASAN when fuzzing.
-    
-    Try to determine if we passed -fsanitize=address to gcc or clang and
-    adjust the ASAN variable fuzz-test.sh, randpkt-test.sh and
-    test-captures.sh accordingly.
-    
-    Change-Id: I88a34828fb5875e1a74a3b180ffb3da37daac0bd
-    Reviewed-on: https://code.wireshark.org/review/17848
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 8b04755
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 24 11:51:24 2016 +0200
-
-    ssl-utils: fix decryption of NULL ciphers
-    
-    A dissector bug was reported:
-    
-        epan/dissectors/packet-ssl-utils.c:1615: failed assertion "data"
-    
-    and fair enough, the MAC Key is indeed NULL because of our special
-    handling for NULL ciphers. Just ignore the MAC key then.
-    
-    Change-Id: I12d2be5e84520badb44a99fc965c48c3afa89346
-    Fixes: v2.3.0rc0-697-gb1d36fe ("ssl-utils: remove block and key sizes from cipher suites table")
-    Reviewed-on: https://code.wireshark.org/review/17903
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ca232b1
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sat Sep 24 11:03:53 2016 +0200
-
-    Udpdump: Fix g_debug() for ssize_t buflen
-    
-    Using %lu for ssize_t throws an error. This commit change it to %zd.
-    
-    Change-Id: I19ae72fe0836424bcb93e912e9b1757df4ae5fb1
-    Reviewed-on: https://code.wireshark.org/review/17900
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 989dcef
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Sep 23 08:07:42 2016 +0200
-
-    TLS: Update Hello ExtensionType list
-    
-    use same name and display in dec from http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
-    
-    Change-Id: Ia4a959571204b611dbf275311c9ce58c594b6716
-    Reviewed-on: https://code.wireshark.org/review/17886
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 1a3f1d0
-Author: Dirk Jagdmann <doj@cubic.org>
-Date:   Thu Sep 22 23:32:53 2016 -0700
-
-    update description of PDML file format by updating URLs to external documentation. Also mention the pdml2html.xsl file.
-    
-    Change-Id: I44894f52771939bf9f861abf19bcb8bc589e37eb
-    Reviewed-on: https://code.wireshark.org/review/17894
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 9f0d22bdd1e75178332756f9abb1ae4b45b0de0b)
+    Reviewed-on: https://code.wireshark.org/review/22090
 
-commit 575e363
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Sep 23 17:45:39 2016 -0700
-
-    WiX: Disable desktop icon and shortcut checkboxes.
-    
-    Enable and disable the Wireshark and Wireshark-gtk desktop icon and
-    shortcut checkboxes depending on our feature selections to match the
-    NSIS installer behavior (and make sense).
-    
-    Set the level of "Fe.WiresharkGTK" to 2 so that it's disabled by default.
-    This roughly matches the behavior of the NSIS installer.
-    
-    Note that we can't enable or disable radio buttons.
-    
-    Change-Id: I1c73f901344e21bd62e67890ce544f644c0cdda6
-    Reviewed-on: https://code.wireshark.org/review/17898
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a1b04ad
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Sep 23 15:51:44 2016 -0700
-
-    More WSDG layout & markup fixups.
-    
-    Change-Id: I7b404be25d20c28c7dca23d57f9670236a5855c2
-    Reviewed-on: https://code.wireshark.org/review/17897
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 2b9cb53
+commit 79d7ef3
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Sep 23 15:17:28 2016 -0700
-
-    WSDG: Fixup PDF layout.
-    
-    Change-Id: I62653e6a5934e5bd77bf6663610124cb82e95c44
-    Reviewed-on: https://code.wireshark.org/review/17896
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d1b9980
-Author: szhong <szhong.jnpr@gmail.com>
-Date:   Sat Sep 17 23:24:30 2016 -0400
-
-    pcep: add Conveying Vendor-Specific Constraints (RFC7470) support
-    
-    Added capability to expand Private Enterprise Number to string.
-    
-    Change-Id: Id3df604a47c3067febb878caf89087aa00ecf038
-    Reviewed-on: https://code.wireshark.org/review/17770
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d390db9
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Sep 23 09:28:41 2016 -0700
-
-    WSUG: More layout and PDF fixes.
-    
-    Set variablelist.as.blocks in custom_layer_pdf.xsl so that we don't end
-    up with list text squeezed into tiny columns on the right. Set column
-    widths for most of our tables.
-    
-    Change-Id: I3fe47d945a7945618012c9de1fc0e97b788dea9e
-    Reviewed-on: https://code.wireshark.org/review/17893
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 2e0cbb7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Sep 23 08:12:13 2016 +0200
-
-    TLS: use define value for ssl_versions value string
-    
-    and also move on the top and not too far from ssl_version_short value_string
-    
-    Change-Id: I9012d0d0839fd29da500a7f37a83ecc982f0fb5b
-    Reviewed-on: https://code.wireshark.org/review/17887
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit cc50515
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Sep 23 08:13:28 2016 +0200
-
-    Show memory info on macOS and Linux
-    
-    Added support for showing memory information (amount of physical memory)
-    in version information on macOS and Linux.
-    
-    Moved CPU info and memory info right after OS version info.
-    
-    Change-Id: I305d1b7d015d50ed137f2c80b31d698e9315d735
-    Reviewed-on: https://code.wireshark.org/review/17884
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2fa327a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 23 10:18:14 2016 +0200
-
-    eap: fix cast warning.
-    
-    Change-Id: I94a4a927c91552f58ecec3d0d78efcf699bf77de
-    Reviewed-on: https://code.wireshark.org/review/17881
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0703c7b
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Sep 22 13:23:37 2016 +0200
-
-    dumpcap: Include CPU info as hardware description in SHB
-    
-    Add CPU info as hardware description in session header block when
-    using pcapng.
-    
-    Use capture_comment from the capture_options structure when using
-    ring buffer.
-    
-    Change-Id: I5e688fc2d6ab61de1f64ad9a8a96e6e39e8cf708
-    Reviewed-on: https://code.wireshark.org/review/17862
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 00c862e
-Author: Mikael Kanstrup <mikael.kanstrup@gmail.com>
-Date:   Wed Sep 14 14:13:20 2016 +0200
+Date:   Thu Jun 8 15:30:35 2017 -0700
 
-    capchild: Support optional 802.11 channel parameters
+    CMake: Look for Python in more places.
     
-    Document the the 802.11 set channel function and its parameters.
-    Add support for optional parameters.
+    According to PEP 514, Python.org's Windows installer stores its
+    installation path in
     
-    Bug: 12896
-    Change-Id: I95966f99149aa9c1502d97b5707dcc8c2f5b26e8
-    Reviewed-on: https://code.wireshark.org/review/17699
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b6a2915
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 18 16:19:58 2016 +0200
-
-    mate: fix Match edge cases, improve documentation
-    
-    Use strcmp to sort AVPs in an AVPL and for matching instead of comparing
-    pointer addresses. Pointers can only be used for (in)equality, there is
-    no ordering in them. Matching of attributes however requires a better
-    ordering to know whether the operator (condition) or whether the operand
-    (data) can be skipped. Otherwise it is possible that condition (b)
-    randomly fails to match data (a,b).
-    
-    User-visible changes (mainly edge cases):
-    
-     - Loose (a=1, a?) on data (a=0, a=1) would previously fail to return
-       (a=0,a=1) because the a? condition is not tried for data a=0. Now it
-       tries all compatible conditions for a data AVP.
-     - Any Match condition like (a=1, a^1) would previously be treated the
-       same as (a=1) while (a^1, a=1) would still be seen as (a^1, a=1). The
-       first case is now fixed to match (a=1, a^1). (Via a fix in insert_avp
-       to ensure that (a=1) is not considered the same as (a^1).)
-     - Every (a=1, a=2) on data (a=1, b=1) previously failed, but the
-       comment "it will not create a list if there is not a match for every
-       attribute in op" suggests that it should return (a=1).
-     - Every (a=1) on data (a=2) previously succeeded (bug) while it would
-       fail on (a=2, b=1). This is fixed now by checking whether any of the
-       conditions really have matching data for the attribute.
-    
-    Other changes: optimize merge_avpl and new_avpl_*_match to insert in
-    linear time instead of quadratic, rewrite and add comments in an attempt
-    to make it easier to understand. Merge the new_avpl_every_match and
-    new_avpl_exact_match functions and rename it to new_avpl_pairs_match to
-    reflects its actual implemented functionality.
-    
-    Not addressed in this patch is the quasi-randomness of the returned
-    data AVPL. AVPLs are unordered, so the condition Strict (a?) on data
-    (a=1, a=2) could in theory return either (a=1) or (a=2). In practice
-    this returns (a=1) because of alphabetical ordering, but this cannot
-    really be relied on. It gets worse for conditions like Strict (a?, a>1),
-    these are considered undefined behavior (without warnings for now).
-    
-    Ping-Bug: 12184
-    Change-Id: I0008448ffcb96183f106cb937c4f488e26a82f92
-    Reviewed-on: https://code.wireshark.org/review/17777
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 064f4d1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Sep 19 14:40:11 2016 +0200
-
-    eap: dissect eap wlan identity.
-    
-    EAP identities can be of different kind. This change adds a sort
-    of heuristic that dissects the wlan identity in the form of
-    <imsi>@wlan.mnc<mnc>.mcc<mcc>.3gppnetwork.org. A general purpose
-    dissection function, acting as a proxy, has been created to make
-    room for other specific dissections.
-    
-    Bug: 12921
-    Change-Id: Ic48aee004fa7df5ee4dbeca091ed31616d155890
-    Reviewed-on: https://code.wireshark.org/review/17796
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1ec28b4
-Author: Stefan Metzmacher <metze@samba.org>
-Date:   Mon Sep 19 04:35:49 2016 +0200
-
-    packet-dcerpc: let dissect_dcerpc_cn_auth() always dissect the whole auth_info
+    HKEY_LOCAL_MACHINE\Software\Python\<Company>\<Tag>\InstallPath
     
-    As all this information belongs together I'm moving it into a subtree.
+    where <Tag> is the value of sys.winver. Newer versions of python add "-32"
+    and "-64" to the version in order to allow side by side installations.
+    Adjust LocatePythonExecutable accordingly.
     
-    Change-Id: I839a5a6294360976a78b4b43f219e30381b4f516
-    Signed-off-by: Stefan Metzmacher <metze@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/17878
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 68dbc64
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Aug 21 16:50:15 2016 +0200
-
-    ISAKMP: fix Argument with 'nonnull' attribute passed null found by Clang Analyzer
-    
-    Change-Id: I8d7ebc6dd46e0d6494d412653ec423b8c0fde9c8
-    Reviewed-on: https://code.wireshark.org/review/17203
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a2329b1
-Author: Gerald Combs <gerald@zing.org>
-Date:   Thu Sep 22 18:37:01 2016 -0700
-
-    WSDG: Layout and content updates.
-    
-    Adjust the column widths of some tables to that they render more cleanly
-    and without FOP warnings. Move some table content to plain text instead
-    of trying to shove it into table cells. Fix some other layout and
-    formatting.
-    
-    Change-Id: I40e40fd7ca5c3cc594ea30c8b1ad233afd4cdca4
-    Reviewed-on: https://code.wireshark.org/review/17880
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit e0bc5b1
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Sep 22 15:43:37 2016 -0700
-
-    WSDG: Adjust markup and fix FOP warnings
-    
-    Wrap monospace text in our PDF output. Fix the formatting of a list. Fix
-    an anchor reference.
-    
-    Change-Id: Id9433f3e3462569299e6702b4a4e137481ad80c4
-    Reviewed-on: https://code.wireshark.org/review/17877
+    Change-Id: I8c7f8b4c31b37e7f687ce9909f97d62a779cfa91
+    Reviewed-on: https://code.wireshark.org/review/22048
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit eeb4361
-Author: Priyanka Mondal <priyanka02010@gmail.com>
-Date:   Thu Sep 22 14:43:12 2016 +0530
-
-    Dropped packet: Add dropped packets info in netscaler trace
-    
-    Change-Id: I2a9806026413c5971e5ecad17cd80787130cb9ed
-    Reviewed-on: https://code.wireshark.org/review/17803
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a156a00
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Sep 22 09:18:21 2016 +0200
-
-    CDP: Add CDP over GRE
-    
-    http://www.cisco.com/c/en/us/td/docs/wireless/access_point/15-3-3-JB/configuration/guide/cg_book/cg-appA-protfilters.html
-    
-    Bug:12934
-    Change-Id: If6498446c86f509a44dc28d3c2e4d86cc61cd167
-    Reviewed-on: https://code.wireshark.org/review/17853
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0b1fd7e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 22 22:09:13 2016 +0200
-
-    6LowPAN: initialize interface identifier even when no data-link source is found
-    
-    Bug: 12939
-    Change-Id: Ib4e8adbff3e335e602da5e6857bfc801601fd25e
-    Reviewed-on: https://code.wireshark.org/review/17871
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 76d97c3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Sep 22 13:54:13 2016 -0700
-
-    Fix the "do we have Xcode?" test for older versions of Xcode.
-    
-    Change-Id: I35853b6cb2985bf9bc36175ec8085929e66db349
-    Reviewed-on: https://code.wireshark.org/review/17872
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 14fcb72
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 22 21:01:52 2016 +0200
-
-    BTHCI ACL: ensure to initialize the full bthci_acl_data_t structure
-    
-    Change-Id: Ie1a020bf5dddde3f9476a6fdf307da9effb4bf8c
-    Ping-Bug: 12939
-    Reviewed-on: https://code.wireshark.org/review/17870
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 8438c1d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 22 20:39:46 2016 +0200
-
-    LDSS: fix a memory leak caught by ASan
-    
-    Change-Id: I988b0ac0fbadb782c1ba499a086c29522a564618
-    Reviewed-on: https://code.wireshark.org/review/17869
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit cf12e44
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 22 20:14:25 2016 +0200
-
-    proto.c: avoid dereferencing a NULL pointer
-    
-    Some sub protocols do not register fields
-    
-    Follow-up of gf4a521e
-    
-    Change-Id: Iec3165d6204cc6acc0ec31a7266f860012463cd0
-    Reviewed-on: https://code.wireshark.org/review/17868
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7477e1c
-Author: Birol Capa <birol.capa@siemens.com>
-Date:   Thu Sep 22 16:42:39 2016 +0300
-
-    Fix Profinet RPCInterfaceUUID decoding
-    
-    The translation of all RPCInterfaceUUID for PNIO evaluates to "PNIO".
-    However, UUID allows distinction of
-     - UUID_IO_DeviceInterface (IOD-IF)
-     - UUID_IO_ControllerInterface (IOC-IF)
-     - UUID_IO_SupervisorInterface (IOS-IF)
-     - UUID_IO_ParameterServerInterface (PServ-IF)
-    
-    Bug: 12938
-    Change-Id: I97c27808f61abd96728421488bb0ee5fdbace566
-    Reviewed-on: https://code.wireshark.org/review/17865
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f4a521e
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Sep 22 16:18:03 2016 +0200
-
-    [proto.c] As we know the size of the hf array use g_ptr_array_sized_new()
-    to allocate the arry to hold them. This should be more efficient.
-    
-    Change-Id: I84b1095b6eb110fdcc1b2630949c76b51f3a47b6
-    Reviewed-on: https://code.wireshark.org/review/17866
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0b3d679
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Sep 22 15:25:07 2016 +0200
-
-    Don't call proto_register_field_array() or expert_register_protocol() with
-    proto = -1
-    
-    Change-Id: I60f899ad748b5d3e17f237552af7d2dbc8f27bd2
-    Reviewed-on: https://code.wireshark.org/review/17864
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d29b369
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Sep 21 23:16:58 2016 -0400
-
-    Add range_add_value and range_remove_value.
-    
-    These APIs can insert or remove a single value into a range structure.
-    Adding a value may extend an existing range or create a new one.
-    Removing a value may remove a range item.
-    
-    Change-Id: Ia6995ecf7760aca1fb7fd9b4c53972298a57675f
-    Reviewed-on: https://code.wireshark.org/review/17836
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 69dfe97
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Sep 22 11:14:53 2016 +0200
-
-    iwarp: Add RDMA Atomic operations (RFC 7306)
-    
-    Bug:12928
-    Change-Id: Id3f9e41a62a90e36f19e1d55226826e7f9ffa3f4
-    Reviewed-on: https://code.wireshark.org/review/17855
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 46595f4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Sep 22 03:11:17 2016 -0700
-
-    Point people to the Mac App Store for Xcode.
-    
-    Don't give a URL that doesn't work any more.
-    
-    Change-Id: I3d2dbef2dda4a96aff9382e687eb8eb64218d14d
-    Reviewed-on: https://code.wireshark.org/review/17859
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4e53f5d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Sep 22 02:59:53 2016 -0700
-
-    Make it detect command-line-toos-only installations.
-    
-    /usr/bin/xcodebuild is present, but appears not to work, if you have
-    only the command-line tools for Xcode 8 installed, not Xcode 8 itself.
-    
-    Change-Id: I4a55e30f8afcc7e575e661d2b4ea944c967790ec
-    Reviewed-on: https://code.wireshark.org/review/17856
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit dedf926
-Author: Juanjo Martin <juanjo@rti.com>
-Date:   Tue Sep 20 13:32:46 2016 +0200
-
-    RTPS: Added DTLS locator dissection
-    
-    Change-Id: I168d728a56479bd3eeac4baa2d7708dbc3d09bed
-    Reviewed-on: https://code.wireshark.org/review/17814
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 48a075b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Sep 22 10:05:53 2016 +0200
-
-    MACsec: Fix typo
-    
-    macsec/MACSEC => MACsec
-    
-    Change-Id: I1016396edaf3f8bf025dd9b840d0d2f588546d49
-    Reviewed-on: https://code.wireshark.org/review/17854
+    (cherry picked from commit 6a16f158c849c054bd1a4b71e0c497df48933797)
+    Reviewed-on: https://code.wireshark.org/review/22089
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5b4ca98
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Sep 18 20:10:14 2016 +0200
-
-    Qt: Optimized setColumnVisibility() usage
-    
-    Setting column visibility (show/hide columns) is only needed when
-    columns has changed and when show/hide from column popup menu.
-    
-    Change-Id: Ia33d6fccab44443c453921fc2629bbf1d22efd01
-    Reviewed-on: https://code.wireshark.org/review/17781
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit b9d493f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Sep 21 18:26:16 2016 +0200
-
-    [print.c]  Use pinfo and frame_info to print geninfo.
-    
-    Change-Id: Ie77292bfb2d962b326cb4dd9273d7258586f18b5
-    Reviewed-on: https://code.wireshark.org/review/17841
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fe1d006
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Sep 21 17:36:23 2016 +0200
-
-    [print.c] Get timestamp directly from pinfo rather than going via field
-    info.
-    
-    Change-Id: I266775b0880931bbce5ec0ed9bc9d8b0dbce7246
-    Reviewed-on: https://code.wireshark.org/review/17840
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bf95ccc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Sep 21 20:48:37 2016 -0700
-
-    Don't mention a particular version of XQuartz.
-    
-    The version we were using is out of date and, because we don't download
-    it in the script, we don't *need* the version, we can just point people
-    to http://www.xquartz.org.
-    
-    Change-Id: I049e55c11a6877a1ad888288a157cc8527740b16
-    Reviewed-on: https://code.wireshark.org/review/17850
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4793230
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 20 17:28:01 2016 +0200
-
-    gsm_map: use ws_strtoi in template.
-    
-    Change-Id: I682955b3c58695d831d6d8013eaa77d347a0ec2e
-    Reviewed-on: https://code.wireshark.org/review/17820
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f87d1ab
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Sep 21 17:25:32 2016 -0700
+commit c319989
+Author: Anders <anders.broman@ericsson.com>
+Date:   Fri Jun 9 16:02:21 2017 +0200
 
-    WiX: Fix condition logic.
-    
-    The condition expressions in g630b646 were incorrect. Fix them. This
-    also lets us make the error messages more verbose, so do so. Add a hint
-    about debugging.
+    Simplify the search for HTMLHelp.
     
-    Change-Id: I74d4b9cfb1bc9afb23be4d61ac190f90e7048745
-    Reviewed-on: https://code.wireshark.org/review/17849
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f513dd3
-Author: Davide Caratti <davide.caratti@gmail.com>
-Date:   Wed Sep 21 01:26:52 2016 +0200
-
-    ethertype: add missing value_string row for MACSEC
+    Change updated as per https://gitlab.kitware.com/cmake/cmake/issues/16950#note_277462
     
-    Change-Id: Ie062054249d847e4cc430818ce2deca96b2c7d90
-    Reviewed-on: https://code.wireshark.org/review/17845
-    Reviewed-by: d. caratti <davide.caratti@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I794e6cf7af3d1affa7ee5182374b6f22d9acdf33
+    Reviewed-on: https://code.wireshark.org/review/22051
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 876bca1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Sep 21 14:43:20 2016 -0700
-
-    Add a -a flag to use if TShark was built with ASan.
-    
-    We mustn't set the virtual address space limit if that's the case, as
-    ASan consumes a ton of address space.
-    
-    Clean up a comment while we're at it.
-    
-    Change-Id: I7e88135f16b21cb091a73a35de70bee757fb3876
-    Reviewed-on: https://code.wireshark.org/review/17847
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ec0aeb9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Sep 21 14:41:04 2016 -0700
-
-    Set the VA limit with ulimit -S, and clean up comments.
-    
-    Other limits are set with -S, do that with the virtual address space
-    limit as well.
-    
-    Change-Id: Ie427341a4c7be56d3e8d96be6c1713c56e9bad87
-    Reviewed-on: https://code.wireshark.org/review/17846
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c2b7a74
-Author: Olga Kornievskaia <olga.kornievskaia@gmail.com>
-Date:   Wed Sep 21 13:17:42 2016 -0400
-
-    nfs: Fixing OFFLOAD_STATUS reply decoding
-    
-    commit b5aa0ff1a4e84c15f6c159e4900e84bd563570b4
-    
-        nfs: Add NFSv4.2 ops OFFLOAD_CANCEL and OFFLOAD_STATUS
-    
-    As coded, the reply of the OFFLOAD_STATUS decodes a stateid.
-    However, in the spec, the reply is count and an array of
-    statuses. I propose the following fix to match the spec
-    for the OFFLOAD_STATUS.
-    
-    Change-Id: Ibaddba96446b8d9b520ca977f0b1ed66749d3388
-    Reviewed-on: https://code.wireshark.org/review/17805
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit eafa0a0
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Sep 21 21:22:57 2016 +0200
-
-    dmp: Restore checksum incorrect info
-    
-    The "Checksum incorrect" note in COL_INFO was inadvertently
-    broken in gad6fc87d6.
-    
-    Change-Id: I064c3c79aa3e1ae72d3a8167538e709d0b5fe94a
-    Reviewed-on: https://code.wireshark.org/review/17842
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 2e40242
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 6 09:58:48 2016 +0200
-
-    capture_sync: use ws_strtou function.
-    
-    Change-Id: Ic128a7f1afd85f6b737392ff76b40d54cbdd8971
-    Reviewed-on: https://code.wireshark.org/review/17523
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 4528da9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Sep 21 14:19:07 2016 +0200
-
-    Diameter: fix a typo in AVP TGPP 1656
-    
-    Bug: 12927
-    Change-Id: I6a6507d7b3b0321d2d12d3d306003e480070e79e
-    Reviewed-on: https://code.wireshark.org/review/17833
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit b9d4a18
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Sep 20 14:14:38 2016 +0200
-
-    TLS: no extension length on padding extension
-    
-    also remove padding function (don't needed)
-    
-    Bug: 12922
-    Change-Id: Ie049ee21193ec82b8dc873a7dff78e9d058c7935
-    Reviewed-on: https://code.wireshark.org/review/17825
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7be7320
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Sep 21 11:09:43 2016 +0200
-
-    BTL2AP: compare strings with strcmp, not memcp
-    
-    Otherwise a string shorter than 7 characters will trigger an out of bounds access
-    
-    Bug: 12825
-    Change-Id: I54a7909d74838dcb56583374e5753f877ff74fe2
-    Reviewed-on: https://code.wireshark.org/review/17826
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit c2c8dc3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Sep 21 13:15:32 2016 +0200
-
-    [Diameter AVPs] Correct 3GPP AVPs 1655. 1656 531 and 532
-    
-    Bug: 12927
-    Change-Id: I545d5c54396431ab67f78fbc31111460d758f8b1
-    Reviewed-on: https://code.wireshark.org/review/17827
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7389923
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 20 17:37:41 2016 +0200
-
-    camel: use ws_strtoi in template.
-    
-    Change-Id: Ida61cc61d6a6a1c34eb42ceaba31621276f93966
-    Reviewed-on: https://code.wireshark.org/review/17821
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 920df26
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Sep 20 15:39:06 2016 +0200
-
-    [GTPv2] Export dissect_gtpv2_tai()
-    
-    Change-Id: I3ec15b0411d8e9639cc31b36aa25ce74054395da
-    Reviewed-on: https://code.wireshark.org/review/17819
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 962c3b2
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Sep 20 14:35:38 2016 +0200
-
-    [GTPv2] Export dissect_gtpv2_tai()
-    
-    Change-Id: If4daaf8d53734c00ba922ca61d21db3c09e859d1
-    Reviewed-on: https://code.wireshark.org/review/17818
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7933d80
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Sep 20 14:31:05 2016 +0200
-
-    [Diameter 3GPP] hf_diameter_3gpp_feature_list1_sh_flags_spare_bits missing
-    bitmask.
-    
-    Change-Id: I999fb71a26e90a46e11bd2907c3fcb8566e92562
-    Reviewed-on: https://code.wireshark.org/review/17817
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ece9c28
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Sep 15 08:04:14 2016 +0200
-
-    selfm: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I758ff81bdfcb9c18810baad12554d7f7f0e7705f
-    Reviewed-on: https://code.wireshark.org/review/17707
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 980a0a3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Sep 20 13:43:37 2016 +0200
-
-    Add define for vendor dacom
-    
-    Change-Id: Ie7411d4d41e3f0a0ea98ed4a14d40c5715535c8a
-    Reviewed-on: https://code.wireshark.org/review/17815
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b83c730
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Aug 26 10:33:43 2016 +0200
-
-    TLS(1.3): Add Pre-Shared Key (41) Hello extension
-    
-    Bug: 12779
-    Change-Id: I64ef80db0a8b51ee569fed3b87099144e57eedc2
-    Reviewed-on: https://code.wireshark.org/review/17320
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 811bb33
-Author: Hauke Mehrtens <hauke.mehrtens@intel.com>
-Date:   Wed Aug 31 20:06:49 2016 +0200
-
-    netlink: make dissect_netlink_attributes() endianness aware
-    
-    Always give the netlink data struct to dissect_netlink_attributes() so
-    we can extract which endianness we should use. This fixes the netlink
-    dissector on big endian.
-    
-    Change-Id: Ia485a29035c947908c29a9e30d0aba8d4fc94093
-    Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
-    Reviewed-on: https://code.wireshark.org/review/17636
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit b1bbfaa
-Author: Hauke Mehrtens <hauke.mehrtens@intel.com>
-Date:   Wed Aug 31 19:44:25 2016 +0200
-
-    netlink: try to detect endianness
-    
-    There is no field which indicates which endianness is used for netlink
-    data, try to guess it by checking if the length in little or big endian
-    fits better.
-    
-    Change-Id: I02884763931f3f3589b7ac5bff2781797c1d0f87
-    Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
-    Reviewed-on: https://code.wireshark.org/review/17635
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 927a050
-Author: Chris Bontje <cbontje@gmail.com>
-Date:   Wed Sep 14 11:58:47 2016 -0600
-
-    [SELFM] - Further additions to re-assembly efforts (Multiple PDUs spanning additional TCP packets)
-    
-    Change-Id: I35db77ee05c3c873577b4f40c41f283e5666a4e2
-    Reviewed-on: https://code.wireshark.org/review/17701
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e4a230a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Sep 19 15:05:18 2016 -0700
-
-    Move the rest of README.qt to the WSDG.
-    
-    Change-Id: I8ba0dc0170141db0b96cac996e5ad5f0bd3253ea
-    Reviewed-on: https://code.wireshark.org/review/17806
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit eb4c706
-Author: Stefan Metzmacher <metze@samba.org>
-Date:   Tue Sep 20 02:41:46 2016 +0200
-
-    packet-dcerpc: dissect the auth verifier of PDU_CO_CANCEL, PDU_ORPHANED and PDU_FAULT
-    
-    Change-Id: I28325d655ccd5d363aac89e49e5333b3d75f68a2
-    Signed-off-by: Stefan Metzmacher <metze@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/17810
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 01d80d6
-Author: Stefan Metzmacher <metze@samba.org>
-Date:   Sun Sep 18 20:25:52 2016 +0200
-
-    packet-dcerpc: The opnum field is generated for PDU_RESP and PDU_FAULT
-    
-    Change-Id: Ieeb9de0f54a22afc3adcd52d8af2c45e8b82b0ab
-    Signed-off-by: Stefan Metzmacher <metze@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/17808
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9058363
-Author: Stefan Metzmacher <metze@samba.org>
-Date:   Tue Sep 20 02:29:16 2016 +0200
-
-    packet-dcerpc: nca_s_fault_sec_pkg_error
-    
-    Change-Id: I951a317da795c94ac6518be73cb2c836e7afb836
-    Signed-off-by: Stefan Metzmacher <metze@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/17807
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4ed3518
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Sep 19 21:12:34 2016 +0200
-
-    Qt: Added option to Remove from recent files list
-    
-    Change-Id: If87e1bf4796d45582bc2490720683e4072971f56
-    Reviewed-on: https://code.wireshark.org/review/17804
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit cdfc47d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Sep 19 01:15:21 2016 +0200
-
-    http: add spdy Upgrade support
-    
-    Not found in any specification, but it appears to be implemented by
-    kubernetes (using "SPDY/3.1" value).
-    
-    Ping-Bug: 12874
-    Change-Id: I9fc7ad2f657a739b415f6801fe0f43f6ef75ca70
-    Reviewed-on: https://code.wireshark.org/review/17786
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ee47d8c
-Author: Binh Trinh <beango@gmail.com>
-Date:   Sun Sep 18 15:33:44 2016 -0400
-
-    Qt: Fix bug in capture file dialog introduced by HideNameFilterDetails
-    
-    Restore File->Save As and File->Export Specified Packets functionalities broken by commit c711bc64573e20e343f343a53ad4d1d50add433d.
-    
-    Change-Id: I5d246d296979b5e509a90569094d672083b06b9b
-    Reviewed-on: https://code.wireshark.org/review/17783
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a8e727b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Sep 19 09:37:27 2016 +0200
-
-    Qt: reenable export packet bytes menu while capturing
-    
-    Change-Id: I2a3e35ec7c3233e6b32c53a2124b00bbfff8a2e1
-    Reviewed-on: https://code.wireshark.org/review/17793
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7a7f020
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Sep 18 21:54:50 2016 +0200
-
-    Qt: fix file set menus when stopping a capture or opening a capture after startup
-    
-    Create file_set_dialog_ window at program start so that file set menu entries
-    are properly populated
-    
-    Bug: 12904
-    Change-Id: I597067da51808000683b15a19df646857082a867
-    Reviewed-on: https://code.wireshark.org/review/17785
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d7a07de
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Sep 18 23:00:07 2016 +0200
-
-    Qt: fix some menus activation when stopping a capture
-    
-    Call MainWindow::setMenusForCaptureFile() once the capture is finished
-    While we are at it, let's deactivate Export PDU and Export Packet Bytes menus while capturing
-    
-    Bug: 12071
-    Bug: 12898
-    Change-Id: I8ab9d531135790b51cd630d3f548d0c47a4a60a5
-    Reviewed-on: https://code.wireshark.org/review/17784
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 2de2ddd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Sep 18 21:15:59 2016 -0700
-
-    Support bitfields for FT_CHAR.
-    
-    Change-Id: I3ad1ad27107c9e2c0d9da6d05f0a06609369271f
-    Reviewed-on: https://code.wireshark.org/review/17789
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9143862
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Sep 16 21:05:39 2016 +0200
-
-    WiX: add SSHdump, Ciscodump and UDPdump to installer
-    
-    Change-Id: Iae2a222db8e9359fd8440b59f43ec90c3b7f8243
-    Reviewed-on: https://code.wireshark.org/review/17747
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 0dc32776d071fdf00754e349a0f9db20119df5df)
+    Reviewed-on: https://code.wireshark.org/review/22093
 
-commit d7fe514
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Sep 18 18:48:50 2016 -0700
-
-    Improve support for single-character fields and filter expressions.
-    
-    Add an FT_CHAR type, which is like FT_UINT8 except that the value is
-    displayed as a C-style character constant.
-    
-    Allow use of C-style character constants in filter expressions; they can
-    be used in comparisons with all integral types, and in "contains"
-    operators.
-    
-    Use that type for some fields that appear (based on the way they're
-    displayed, or on the use of C-style character constants in their
-    value_string tables) to be 1-byte characters rather than 8-bit numbers.
-    
-    Change-Id: I39a9f0dda0bd7f4fa02a9ca8373216206f4d7135
-    Reviewed-on: https://code.wireshark.org/review/17787
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 630b646
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Sep 13 17:07:15 2016 -0700
-
-    WiX: Add NSIS installer checks.
-    
-    Look for an existing NSIS installation and cancel the installation if
-    we find one. Add a note about making this process more friendly.
-    
-    Change-Id: Id6ea4d511bc813a38fa834931f5e677d3d6a4319
-    Reviewed-on: https://code.wireshark.org/review/17702
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu>
-
-commit df2f01a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Sep 18 19:38:03 2016 -0700
-
-    Add new functions.
-    
-    Change-Id: I2ae30ae84cc7c65b847f8db93828affc50a40ce1
-    Reviewed-on: https://code.wireshark.org/review/17788
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b914ec3
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Sep 18 13:41:47 2016 +0200
-
-    bootp: dissect option 82, sub-option 12 (Relay Agent Identifier)
-    
-    as defined in RFC6925
-    
-    Bug: 12907
-    Change-Id: I546d243f4b188025d8c96a1eaa0798b70a847a25
-    Reviewed-on: https://code.wireshark.org/review/17775
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 763f751
-Author: Niels de Vos <ndevos@redhat.com>
-Date:   Sun Sep 18 15:41:17 2016 +0200
-
-    glusterfs: decode upcall flags for cache-invalidation
-    
-    Add decoding of the upcall->flags value. This mask currently used do
-    give hints about the cache-invalidation structures.
-    
-    Change-Id: I4a3ab03bec6e2a2c9f8c7bbf17babb2bc93c9d7b
-    Signed-off-by: Niels de Vos <ndevos@redhat.com>
-    Reviewed-on: https://code.wireshark.org/review/17776
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9dad78a
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Sep 14 06:08:00 2016 +0200
-
-    UDLD has been an informational RFC for a while
-    
-    Fix some whitespace
-    
-    Change-Id: I7438b6b394078a23eda6d77fbda789d5413e0417
-    Reviewed-on: https://code.wireshark.org/review/17782
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit f823464
-Author: Dirk Jagdmann <doj@cubic.org>
-Date:   Sat Sep 17 02:07:52 2016 -0700
-
-    add link to Wireshark wiki to pdml2html.xsl
-    
-    Change-Id: Id756cc51d2f30f48994ec9ee07941b2680aa0ba9
-    Reviewed-on: https://code.wireshark.org/review/17772
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit baa0fee
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Sep 18 08:12:43 2016 -0700
-
-    [Automatic update for 2016-09-18]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I1fb3ac4b7bd4f44dfcf7b40b28b0b2aa89ca4d3e
-    Reviewed-on: https://code.wireshark.org/review/17778
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 553e119
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Thu Sep 8 23:00:34 2016 +0200
-
-    ISAKMP: Reduce code duplication
-    
-    Equalize attribute dissecting functions:
-    * Convert all attribute type names to range_string.
-      Add "Unassigned" and "Private use" ranges while we are at it.
-    * Swap the order of format and type fields for config attributes.
-    
-    Move common code into the new function dissect_attribute_header().
-    Try to keep the parameter list short:
-    * Group the hfindex values for attribute details into a struct.
-    * Merge attribute subtree types.
-    
-    Add a colon in the main attribute item label for visual separation.
-    
-    Skip dissection of config attributes for unknown IKE versions.
-    
-    Change-Id: I6e6286f3d4cf16f3cd16a23aca540c4af72f3442
-    Reviewed-on: https://code.wireshark.org/review/17663
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ca2a969
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Sep 16 17:37:44 2016 +0200
-
-    Qt: allow file dialogs to mark an UAT as dirty
-    
-    Otherwise changes to just the the key file path in the SSL keys list
-    dialog are not saved to disk.
-    
-    Bug: 12640
-    Change-Id: I12c66efab04a19d662b8090629b8e67aefc01984
-    Reviewed-on: https://code.wireshark.org/review/17738
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7514f98
+commit e89e2f9
 Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sat Sep 17 18:54:41 2016 +0100
+Date:   Thu Jun 8 13:38:40 2017 +0100
 
-    Make Winflex\bison the preferred option
+    CMake: Add local copy of FindHTMLHelp.cmake
     
-    Cygwin flex\bison generate shortening warnings due to size_t on
-    Win 64.  The win flex\bison versions don't so find them first.
+    Add a local copy of FindHTMLHelp.cmake to search for hhc.exe that
+    includes the 32 bit program files locations "Program Files (x86)"
+    as this is where hhc.exe normally lives.
     
-    Change-Id: Ib68c84435f859325612410b72b6cf21cf106ecc2
-    Reviewed-on: https://code.wireshark.org/review/17763
+    Change-Id: Ic5917a0765786ac483a7d4ef457043319d0e8501
+    Reviewed-on: https://code.wireshark.org/review/22037
     Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 66203b4
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Sep 18 09:31:01 2016 +0200
-
-    extcap: fix management of multicheck and saved non boolean arguments
-    
-    Launching USBPcap without going in the interface options menu exhibits 2 bugs:
-    - we should restore a value only if it is not an empty string (otherwise USBPcap with an ampty --devices multicheck argument)
-    - when building the argument list for a non boolean argument not using the default value, do not call g_strconcat. It will
-    build a string concatenating the option and value (for example "--devices 1" that will be treated as a single argument).
-    Instead option and value must be given separately to argument list.
-    
-    Bug: 12846
-    Change-Id: I5628cb264a7632089e6579e9ae7400e2c0e500e2
-    Reviewed-on: https://code.wireshark.org/review/17773
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit a978ad7
-Author: BACdaBASpert <BACdaBASpert@optigo.net>
-Date:   Fri Sep 16 16:57:50 2016 -0700
-
-    update bacapp vendor id to name mapping from BACnet
-    
-    Change-Id: Ibd09e3d8ec167a9270545e37365a2370ac6c2c28
-    Reviewed-on: https://code.wireshark.org/review/17753
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9941cc5
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sat Sep 17 10:48:41 2016 -0500
-
-    Fix up coding style in ByteViewText.
-    
-    As WSDG 12.2.2.1 says, use trailing_underscore_ convention for member
-    variables.
-    
-    Change-Id: I7d6dbcce3908aefc167cdc6ee1d054a2f5f5a072
-    Reviewed-on: https://code.wireshark.org/review/17756
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 205b67f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Sep 17 13:44:45 2016 -0700
-
-    The full identity string was added above.
-    
-    Change-Id: I0945cb9cb6a9d5ccf3756b887654d73a28035a49
-    Reviewed-on: https://code.wireshark.org/review/17768
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit db839fc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Sep 17 13:25:44 2016 -0700
-
-    Update a comment.
-    
-    In one of the two cases where we treat the first byte of an identity as
-    a prefix, we know it's EAP-AKA.  (In the other, we do *not* know that!)
-    
-    Change-Id: I16625f7193eb3ab0840739ec37dbd64e2a5a0fb5
-    Reviewed-on: https://code.wireshark.org/review/17767
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6bedad6
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Sep 17 12:37:11 2016 +0200
-
-    Qt: Hide columns after setting widths
-    
-    In columnsChanged() the visibility must be set after setting
-    the width to avoid that setting width overwrites visibility.
-    
-    This should fix hidden columns displayed during first capture.
-    
-    Bug: 12377
-    Change-Id: Idbbf36b014724970775c34b0c08803de9b006742
-    Reviewed-on: https://code.wireshark.org/review/17755
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 39c3ddf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Sep 17 13:14:04 2016 -0700
-
-    Fix handling of EAP identity.
-    
-    There's no guarantee that the identity is a string whose first character
-    is a prefix indicating the type of identity; only display it as a prefix
-    if it's one of the known types.  We really may need some other mechanism
-    to determine how to parse the identity, perhaps based on what the
-    protocol layers below it are.
-    
-    Put back the display of the full string in one case where that was
-    inadvertently removed.
-    
-    Change-Id: I2e3324f964fa25ebd7065ddb0de82ffae6597509
-    Reviewed-on: https://code.wireshark.org/review/17764
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ede1af2
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Sep 17 18:46:26 2016 +0200
-
-    eap: make eap_identity_prefix a numeric item
-    
-    This used to be string item, its value was not 0-terminated. This
-    resulted in out-of-bounds mem acceess when eap_identity_prefix was used
-    by proto_tree_add_string_format().
-    
-    ==14744== Conditional jump or move depends on uninitialised value(s)
-    ==14744==    at 0x4C294F8: strlen (mc_replace_strmem.c:390)
-    ==14744==    by 0xC19C97F: g_strdup (gstrfuncs.c:355)
-    ==14744==    by 0x739CA75: string_fvalue_set_string (ftype-string.c:51)
-    ==14744==    by 0x67136A9: proto_tree_add_string (proto.c:3515)
-    ==14744==    by 0x6713870: proto_tree_add_string_format (proto.c:3547)
-    ==14744==    by 0x69BB494: dissect_eap (packet-eap.c:838)
-    ==14744==    by 0x66FD0B4: call_dissector_work (packet.c:649)
-    
-    As the content is a number anyway, the simplest solution is to make
-    eap_identity_prefix a numeric item and use
-    proto_tree_add_uint_format_value().
-    
-    Bug: 12913
-    Change-Id: I907b1d3555a96e9662b1d8253d17d35adfdada48
-    Reviewed-on: https://code.wireshark.org/review/17760
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 983a969
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Sep 17 19:10:35 2016 +0200
-
-    eap: (trivial) reformat a comment
-    
-    Change-Id: I2c8a8066f1591004ace6362e24be57b6cec747d1
-    Reviewed-on: https://code.wireshark.org/review/17762
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 3c83afa
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Sep 17 19:03:26 2016 +0200
-
-    eap: remove unnecessary if (tree) checks
-    
-    Change-Id: If42a5d610eea7c7818a0d37dd5878c84ba7f7d81
-    Reviewed-on: https://code.wireshark.org/review/17761
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit c823036
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Sep 17 18:36:32 2016 +0200
-
-    ISUP: do not display Called Party Number twice
-    
-    Bug: 12911
-    Change-Id: I3632ffbeb85a96d9268eca6ddc0f8b38587688c4
-    Reviewed-on: https://code.wireshark.org/review/17758
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 22257e8
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Sep 16 22:15:57 2016 +0200
-
-    p_XXX_proto_data: only allow the use of pinfo and file scopes
-    
-    Those are the only ones meaningful. Let's convert the buggy dissectors
-    and add an assert to avoid the misuse of the pool parameter in the future
-    
-    Change-Id: I65f470b757f163f11a25cd352ffe168d1f8a86d3
-    Reviewed-on: https://code.wireshark.org/review/17748
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 2832f4e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Sep 16 20:59:06 2016 +0200
-
-    NSIS: add UDPdump to installer
-    
-    Change-Id: Ic340d7de5de2573bf1e4ee97c8f7ef9af822d225
-    Reviewed-on: https://code.wireshark.org/review/17746
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 2c33f74
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Sep 16 17:05:55 2016 +0200
-
-    extcap: fix heap-use-after free after saving prefs
-    
-    All strings passed to prefs must be valid for the lifetime of the
-    program (before prefs_cleanup is called). Use wmem for this purpose.
-    Fixes v2.3.0rc0-660-g26bf66f
-    
-    Change-Id: I94f3bbb8ac6e18ae59d6462525f6bbc46fdb0f1f
-    Reviewed-on: https://code.wireshark.org/review/17737
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 05ae6a7
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Sep 16 13:56:47 2016 +0200
-
-    Remove -Wdeclaration-after-statement
-    
-    This is a C99 feature which we can use now.
-    
-    Change-Id: I84a63d6bf282b79c9f0da0543b3b4f5a0cf0c81a
-    Reviewed-on: https://code.wireshark.org/review/17733
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 4156719
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Aug 23 18:14:03 2016 +0200
-
-    TLS(1.3): Add Share Key (40) Hello extension
-    
-    Bug: 12779
-    Change-Id: I5cbc911f2c7818558c5182d2e3ccf9235be9281b
-    Reviewed-on: https://code.wireshark.org/review/17301
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 5540df7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Sep 7 23:15:44 2016 +0200
-
-    TLS: Pass directly the handshake_type to dissect_hnd_hello_ext
-    
-    with TLS 1.3, there is a new 'Hello' type (Hello Retry Request)
-    
-    Change-Id: If7a11b70a5b0a69044126c50e1d6ab4e1d443f77
-    Reviewed-on: https://code.wireshark.org/review/17573
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c1d9ce4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 22 17:55:10 2016 +0200
-
-    TLS(1.3): Add new Hello extension list
-    
-    * Key share (40)
-    * Pre-Shared Key (41)
-    * Early Data (42)
-    * Cookie (44)
-    
-    Bug: 12779
-    Change-Id: I16e3cf691ae66e244608db233db180e24538a68d
-    Reviewed-on: https://code.wireshark.org/review/17239
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d32b116
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 22 11:01:59 2016 +0200
-
-    TLS(1.3): Add (experimental) extension 'Draft version TLS 1.3'
-    
-    Coming from https://github.com/tlswg/tls13-spec/wiki/Implementations#version-negotiation
-    
-    Bug: 12779
-    Change-Id: Ieca74eac737b5ba6c101b719e2e5e3aecf931279
-    Reviewed-on: https://code.wireshark.org/review/17226
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7319887
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 22 10:08:00 2016 +0200
-
-    TLS(1.3): Fix Server Hello
-    
-    There is no session_id and compression method with TLS 1.3 Server Hello
-    
-    Also no time on first bytes of random field
-    
-    Bug: 12779
-    Change-Id: Id79221c2ad50695cf6d46cd5c9255deab99e2d2c
-    Reviewed-on: https://code.wireshark.org/review/17225
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 778f7c5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Aug 21 09:33:39 2016 +0200
-
-    TLS(1.3): Add TLS 1.3 value for version Handshake
-    
-    Bug: 12779
-    Change-Id: I298ecf4a0537df2e88354aed6912d4298a094216
-    Reviewed-on: https://code.wireshark.org/review/17224
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ee2c4da
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Sep 16 20:32:04 2016 +0200
-
-    Qt: Reset expert info icon when start capture failed
-    
-    When starting capture fails the expert info icon must be removed
-    and the file status must be cleared.  This happens more frequently
-    when using sshdump with configuration errors.
-    
-    Change-Id: I9b2215c71bd16406a0978256018b1664f06c19f1
-    Reviewed-on: https://code.wireshark.org/review/17741
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 686d72f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 16 11:40:31 2016 -0700
-
-    Type and size cleanups.
-    
-    Use size_t for sizes.  Do checks to make sure we don't overflow ints.
-    
-    Change-Id: Id0846cc5c6348d67a23064517ad1c432cf1cb61a
-    Reviewed-on: https://code.wireshark.org/review/17742
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ef527fa
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Sep 16 20:55:31 2016 +0200
-
-    M3AP: remove Procedure Code from info column
-    
-    Change-Id: I69aebed5000f6544eede69e7435fb49e4e0ce179
-    Reviewed-on: https://code.wireshark.org/review/17744
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 953b85c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Sep 16 20:54:23 2016 +0200
-
-    M2AP: remove Procedure Code from info column
-    
-    Change-Id: I965cc0455f5f3ac8a676cc0e3453e8a449d76109
-    Reviewed-on: https://code.wireshark.org/review/17743
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 770a873
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 16 10:41:11 2016 -0700
-
-    Add ws_hexstrtou{bits} and use ws_hexstrtou32 in androiddump.
-    
-    Make the reply length unsigned - there's no reason for it to be signed.
-    
-    Change-Id: I5f4d1f027eeddee939547c052220efb89800f4b1
-    Reviewed-on: https://code.wireshark.org/review/17740
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1ca260b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 16 16:59:51 2016 +0200
-
-    udpdump: use socket_handle_t instead of int for portability.
-    
-    Change-Id: Ic31302046e95d1678073a8a77812316be367e9a5
-    Reviewed-on: https://code.wireshark.org/review/17736
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit f317a2b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Sep 15 18:20:05 2016 -0700
-
-    Qt: Argument vector fixups.
-    
-    In wireshark-qt.cpp we have two "argv" variables, one that we pass to
-    QCoreApplication (which it then corrupts irreversibly on Windows if you
-    pass it multibyte characters), and one that we convert to UTF-8 and use
-    normally.
-    
-    Name the throwaway argument vector "qt_argv". Name ours "argv", which is
-    the traditional and less error-prone name.
-    
-    Bug: 12900
-    Change-Id: Idd80b9f779f36ffe977465afd623d320212f92b1
-    Reviewed-on: https://code.wireshark.org/review/17723
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 547a5c8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 16 14:07:38 2016 +0200
-
-    eap: add identity details.
-    
-    Change-Id: I60e017ac48d9daf52b8a40809625dc1ae09c9d8e
-    Reviewed-on: https://code.wireshark.org/review/17735
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    (cherry picked from commit fce2f2bb1f0e6cc2a07a26e0c35b994a3253131d)
+    Reviewed-on: https://code.wireshark.org/review/22091
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3120536
+commit 6eec098
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Sep 3 22:22:50 2016 -0400
+Date:   Sun Jun 11 15:20:44 2017 -0400
 
-    Have TPKT support a TCP port range preference instead of having "subdissectors?" register their own.
+    Ranap: improve heuristic algorithm
     
-    There are a number of dissectors who are subdissectors of TPKT (and OSITP) that are
-    not called by TCP dissector directly, yet can possibly register a TCP port "on the
-    behalf" of TPKT.  Just allow TPKT to support a range of ports to possibly include
-    these protocols.
-    Remove the preferences from these dissectors, but add backwards compatibility for
-    the preferences by hooking into set_prefs and have the preferences just hook into
-    Decode As functionality directly.
+    Strength the heuristic cheking PDU-Type and Criticality field values too
     
-    Change-Id: Ic1b4959d39607f2b6b20fa6508da8d87d04cf098
-    Reviewed-on: https://code.wireshark.org/review/17476
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d67c1db
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 31 10:14:33 2016 +0200
-
-    extcap: make extcap use the ws_strtoi/u functions.
+    # Conflicts:
+    #       epan/dissectors/packet-ranap.c
     
-    Change-Id: Id75c72eba869c8a0f413ce8b5d6329ce172aed1f
-    Reviewed-on: https://code.wireshark.org/review/17415
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 2492fe4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Sep 16 10:14:00 2016 +0200
-
-    VTP: Always display reserved/unsed fields
-    
-    Change-Id: Ib0b065c20e599567224c05068dad5bd24a711609
-    Reviewed-on: https://code.wireshark.org/review/17728
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e4aa7be
-Author: Kenneth Soerensen <knnthsrnsn@gmail.com>
-Date:   Thu Sep 15 20:46:37 2016 +0200
-
-    ZigBee: Fix reassembly of APS fragments.
-    
-    The unsigned variable num_blocks was initialized to -1. Which caused the
-    dissector to set the total length to 4294967295 fragments when the second
-    fragment was processed. This made the dissector unable to reassemble data
-    made of more than two fragments.
-    
-    Change-Id: I120af090ed29ac73a1fa699bea2bfc91798ef92b
-    Reviewed-on: https://code.wireshark.org/review/17712
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 663031e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Sep 16 10:03:12 2016 +0200
-
-    ssl-utils: fix -Wshorten-64-to-32 and other warnings
-    
-    Fixes -Wshorten-64-to-32 from v2.3.0rc0-697-gb1d36fe ("ssl-utils: remove
-    block and key sizes from cipher suites table"), -Wpointer-sign,
-    -Wunreachable-code-break.
-    
-    Change-Id: I37ca5e9effe5d6560d49ccef53e9feb096cd2ad6
-    Reviewed-on: https://code.wireshark.org/review/17727
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 6d13aeb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 16 03:01:49 2016 -0700
-
-    ws_strou16() now takes three arguments.
-    
-    Change-Id: I94a3a8707de724b1b4c2fafaa4c96d2a52b418c6
-    Reviewed-on: https://code.wireshark.org/review/17732
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 689ff93
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 16 02:59:40 2016 -0700
-
-    Squelch some compiler warnings.
-    
-    gcry_cipher_get_algo_keylen() returns a size_t, which is bigger than a
-    guint on most if not all 64-bit platforms; however, if the key is bigger
-    than 2^32 bytes, we have bigger problems, so just cast it down.
-    
-    Change-Id: Ia7c97d2742686daf2e42f634c6e349cb580fa9df
-    Reviewed-on: https://code.wireshark.org/review/17731
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 47650d3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 10 15:45:45 2016 +0100
-
-    extcap: add udpdump.
-    
-    Udpdump is a generic UDP receiver that exports datagram in PCAP format.
-    
-    Change-Id: I52620a92b12530b6f9b5449c43e692663acdfc14
-    Reviewed-on: https://code.wireshark.org/review/17195
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 1cd3587
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Sep 16 00:49:15 2016 +0200
-
-    ssl-utils: fix runtime memory leak
-    
-    Ensure that Libgcrypt and zlib memory are freed when closing a pcap.
-    
-    Change-Id: I420f9950911d95d59ff046fee57900ca6f7e9621
-    Reviewed-on: https://code.wireshark.org/review/17718
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit b1d36fe
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Sep 15 23:57:15 2016 +0200
-
-    ssl-utils: remove block and key sizes from cipher suites table
-    
-    There was an implicit dependency between the block size in the cipher
-    suites table and the size expected by Libgcrypt. Just remove the block
-    size from the table and rely on the value from Libgcrypt to avoid the
-    risk of mismatching values (which could lead to a buffer overflow).
-    
-    While at it, remove the size of the key ("bits") and the size of key
-    material ("eff_bits") too. Move the key material sizes for export
-    ciphers away from the table and use byte quantities instead of bits.
-    
-    Additionally, this fixes an issue where 8 bytes of uninitialized stack
-    memory is written to the SSL debug log for stream ciphers like RC4.
-    The size of the Write Key is also corrected for export ciphers, now it
-    prints the actual (restricted) number of bytes that are used.
-    
-    Change-Id: I71d3c83ece0f02b2e11e45455dc08c41740836be
-    Reviewed-on: https://code.wireshark.org/review/17714
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 979df81
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Sep 15 01:41:20 2016 +0200
-
-    ssl-utils: fix buffer overrun (read) with AEAD cipher suites
-    
-    ssl_cipher_init should only set the IV for CBC cipher suites. NULL
-    cipher suites will not invoke gcry_cipher_setiv and AEAD ciphers will
-    set the nonce in a different place anyway.
-    
-    Fixes a buffer overrun (read) by 12 bytes for any AES-CCM and AES-GCM
-    cipher suite because the "block size" is set to 4 bytes while the
-    reported block size for AES is 16 bytes (128 bit). (The four bytes are
-    the "salt" part of the nonce that is extracted from the "client/server
-    write IV" part of the key block.)
-    
-    Observed with the DTLS packet capture from
-    https://ask.wireshark.org/questions/55487/decrypt-application-data-pending-dtls-abbreviated-handshake-using-psk
-    
-    Change-Id: I4cc7216f2d77cbd1eac9a40dca3fdfde7e7b3680
-    Reviewed-on: https://code.wireshark.org/review/17713
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8def685
-Author: Mikael Kanstrup <mikael.kanstrup@gmail.com>
-Date:   Wed Sep 14 14:21:10 2016 +0200
-
-    Use valid channel parameters from wireless toolbar
-    
-    Both the QT and GTK wireless toolbar used "-1" to indicate unused
-    channel parameters. This was an undocumented feature that recently
-    stopped working. Use the now documented way (NULL) to specify that
-    some parameters are not used.
-    
-    Bug: 12896
-    Change-Id: I4a93a15ba1d880592b355b7eca155632a4b92ea0
-    Reviewed-on: https://code.wireshark.org/review/17700
-    Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu>
-    Petri-Dish: Gilbert Ramirez <gram@alumni.rice.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f674ef7
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Sep 15 09:08:18 2016 +0200
-
-    Qt: Avoid crashes in IAX2 Stream Analysis
-    
-    Avoid crash when opening IAX2 Stream Analysis without having any
-    packets and when not having a selected packet.  Also disable the
-    Save Audio options if not having any IAX2 packets.
-    
-    Also set Close as default button.
-    
-    Change-Id: I1da04e3f907d9d562fa227ab9f0428aa6097131e
-    Reviewed-on: https://code.wireshark.org/review/17708
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1158576
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Sep 15 18:32:21 2016 -0700
-
-    Don't pick up junk from an unset error-number variable.
-    
-    Keep the actual error code and pointer-to-error-string in the scanner
-    state, rather than pointers to the variables passed in to us.
-    Initialize them to 0 and NULL, respectively.
-    
-    That way, when the actual scanner routine returns, we don't check for an
-    error by looking at the error variable pointed to by our argument, which
-    might not have been set by the scanner and might have stack junk in it,
-    we look at a structure member we set to 0 before the scan.
-    
-    Change-Id: I81a4fd6d5cf5e56f5638fae1253c48dc50c9c36d
-    Reviewed-on: https://code.wireshark.org/review/17721
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7a7d162
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Sep 15 15:20:26 2016 -0700
-
-    Don't pick up junk from an unset error-number variable.
-    
-    Keep the actual error code and pointer-to-error-string in the scanner
-    state, rather than pointers to the variables passed in to us.
-    Initialize them to 0 and NULL, respectively.
-    
-    That way, when the actual scanner routine returns, we don't check for an
-    error by looking at the error variable pointed to by our argument, which
-    might not have been set by the scanner and might have stack junk in it,
-    we look at a structure member we set to 0 before the scan.
-    
-    Bug: 12903
-    Change-Id: I5a382da569a226e60c3c2a47f3a1515b0490c31d
-    Reviewed-on: https://code.wireshark.org/review/17716
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit acb68ae
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 9 16:41:15 2016 +0200
-
-    cli: use ws_strtou function.
-    
-    Change-Id: Ic358c50aa21dac485348ee5f7af8947f75e4f952
-    Reviewed-on: https://code.wireshark.org/review/17611
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 251bc5c
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Sep 15 16:43:35 2016 +0200
-
-    [SIP] Make it possible to call a subdisector for the VIA branch parameter.
-    
-    Change-Id: I7d91780f130105f04648489d6ed0bf2a320edce9
-    Reviewed-on: https://code.wireshark.org/review/17711
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c5a477e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 15 11:37:07 2016 +0200
-
-    S1AP: add dissection of NB-IoT transparent containers
-    
-    To do so, memorize whether a given eNB UE S1AP ID belongs to a NB-IoT
-    TAI or not.
-    Also add a preference allowing to force dissection as legacy LTE or
-    NB-IoT if automatic mode fails.
-    While we are at it, let's remove the global variables and introduce
-    a S1AP private data info stored in pinfo.
-    
-    Change-Id: I7e30b3d59d909684e5cfe13510293ed38ad52574
-    Reviewed-on: https://code.wireshark.org/review/17709
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f2e7977
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Sep 14 19:45:50 2016 +0200
-
-    eap: fix EAPOL conversation tracking, fixes TLS decryption
-    
-    Use new heuristics based on the EAP Code field to determine whether a
-    field originates from the client or server. This is more reliable than
-    using "pinfo->match_uint" for two reasons: (1) the heuristics dissector
-    does not set "match_uint" (resulting in an arbitrary match on the
-    previous value) and (2) with EAP over EAPOL, there is no matching port
-    number (resulting in two conversations with different addresses and port
-    number zero).
-    
-    To fix TLS decryption, make sure to create a single conversation for
-    both direction and allow the port type to be PT_NONE (to avoid reporting
-    all packets as originating from the server).
-    
-    Bug: 12879
-    Change-Id: I7b4267a27ffcf68bf9d3f6a90d6e6e2093733f51
-    Reviewed-on: https://code.wireshark.org/review/17703
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e8e1936
-Author: Gilbert Ramirez <gram@alumni.rice.edu>
-Date:   Tue Sep 13 22:33:54 2016 -0500
-
-    Qt: Option to copy bytes to clipboard as Escaped String
-    
-    Some users need to copy the bytes to a Python script for
-    sending out through a raw socket. While they can modify a
-    plain hex dump, having Wireshark copy directly as a Python
-    string makes their work easier. This format also works
-    with Bash, so it is called "Escaped String". E.g.:
-    
-            "\x55\xb5\xd4\x67\x03"
-    
-    Change-Id: I0b6a5eb2e348f686397afda76095aaa2fb85c18d
-    Reviewed-on: https://code.wireshark.org/review/17696
-    Petri-Dish: Gilbert Ramirez <gram@alumni.rice.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c711bc6
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Sep 13 12:47:22 2016 -0700
-
-    Qt: Shorten capture file dialog name filters.
-    
-    In the capture file dialog's "Files of type" combobox separate out the
-    wildcards we display from the ones that are applied. Set the
-    HideNameFilterDetails option and for "All Files" and "All Capture Files"
-    leave the option hidden.
-    
-    For other options print the wildcard list twice so that it's both
-    displayed and applied. Go even further and filter out ".gz" wildcards in
-    the displayed list since they're effectively duplicates of their
-    uncompressed counterparts.
-    
-    Based on Dario's work in change 17605.
-    
-    Bug: 12837
-    Change-Id: I35de8f31492657e37b12ca4c8de5ed9e79d2e2f8
-    Reviewed-on: https://code.wireshark.org/review/17689
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fcc56c2
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Sep 7 15:15:57 2016 +0200
-
-    iseries: rework the read routine.
-    
-    Change the way a line is read in iseries. Instead of reading a string
-    then convert it with atoi, parse it as an integer and convert it to
-    nsecs.
-    
-    Change-Id: Id8e8e9866dbcef3b1612a608f9647bc490263dae
-    Reviewed-on: https://code.wireshark.org/review/17558
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3d7524c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Sep 14 17:05:26 2016 -0700
-
-    Fix a test to work with Xcode 8.
-    
-    (Hopefully it still does what it's supposed to; I don't have any
-    machine, real or virtual, that has the command-line tools installed
-    without Xcode being installed on which to test it.)
-    
-    Change-Id: I0ce8ce4f8532fcc6ab121641dde238180dfa69ce
-    Reviewed-on: https://code.wireshark.org/review/17704
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 057b6bb
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Sep 13 13:37:11 2016 +0200
-
-    Qt: Set Close as default button
-    
-    Set Close as default button in some statistics dialogs.
-    
-    Change-Id: I82e17d27de256aabaec1633bb973c554eec907c3
-    Reviewed-on: https://code.wireshark.org/review/17685
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit c9abf97
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Sep 13 15:27:23 2016 -0700
-
-    NSIS: Disable a debugging MessageBox.
-    
-    Disable a MessageBox added in gec5f578.
-    
-    Change-Id: I4a1ad044836a9363b2e4d9f80df419e7c81f73dd
-    Reviewed-on: https://code.wireshark.org/review/17694
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 0dc96da
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Sep 13 22:38:32 2016 +0200
-
-    X2AP: remove Procedure Code from info column
-    
-    Change-Id: I8d4632ef3b338063e96f4a417f0e3280489968a4
-    Reviewed-on: https://code.wireshark.org/review/17692
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit c644651
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Sep 13 22:36:30 2016 +0200
-
-    S1AP: remove Procedure Code from info column
-    
-    Change-Id: I53ece74627adc038ee6ff2af2959f2dae76ab879
-    Reviewed-on: https://code.wireshark.org/review/17691
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 48433e9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Sep 13 22:23:15 2016 +0200
-
-    NAS EPS: add an option to dissect User Data Container as IP packet
-    
-    Change-Id: I7d1196b79c22df5abe7d399bd9bea5c3d60bff7f
-    Reviewed-on: https://code.wireshark.org/review/17690
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ec5f578
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Sep 9 09:30:54 2016 -0700
-
-    NSIS: Look for an installed WiX package.
-    
-    Dig through the registry and look for a WiX / Windows Installer package.
-    Offer to uninstall it if we find one.
-    
-    Change-Id: I513ce4184880571c484461483a3d25e6d90a85e0
-    Reviewed-on: https://code.wireshark.org/review/17613
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit aa44e3b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Sep 8 11:24:34 2016 -0700
-
-    NSIS: Disable GTK+ by default.
-    
-    Disable the legacy UI by default. Associate our Programs and Features icon
-    with Wireshark.exe. Move some GTK+-specific code to SecWiresharkGtk. Make
-    sure the /desktopicon and /quicklaunchicon apply to Wireshark.exe. Remove
-    unneeded parentheses in the display name.
-    
-    Change-Id: Ia7662d003d15afd809d81631e059e249a93d0999
-    Reviewed-on: https://code.wireshark.org/review/17593
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 3c16363
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Sep 13 11:29:25 2016 -0700
-
-    WSUG: Fixup PDF images.
-    
-    Pass relative image directory paths to xsltproc. The DocBook documentation
-    says you can use a URI, but trying to get that to work with CMake
-    and Windows appears to be a path to tears and undignified wails of
-    frustration.
-    
-    Add attributes for our different types of images and use them so that
-    the PDFs don't scale our screenshots to an unusable size.
-    
-    Change-Id: I786d09d9ef9be3d423b2af426a8867739ae12c1a
-    Reviewed-on: https://code.wireshark.org/review/17688
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 1e3c57b
-Author: Tom Haynes <loghyr@primarydata.com>
-Date:   Tue Sep 13 09:24:53 2016 -0700
-
-    nfs: Primary Data's NFSv4 DataSphere filehandle decoder
-    
-    Change-Id: I0d339f69f37fd3b6a2f7b37b1c239edb2a4cf7a5
-    Signed-off-by: Tom Haynes <loghyr@primarydata.com>
-    Reviewed-on: https://code.wireshark.org/review/17676
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5e03d31
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Sep 13 12:49:23 2016 +0200
-
-    Qt: Fix open Flow Graph in full screen
-    
-    Check if initialized in SequenceDialog::resizeEvent because loadGeometry()
-    may call resizeEvent (from showFullScreen()) before init_ is initialized.
-    
-    Change-Id: I1a514454f1521f68df71c3113077c68acb2f3218
-    Reviewed-on: https://code.wireshark.org/review/17684
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 5b03a42
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 13 11:14:01 2016 +0200
-
-    sshdump: remove -P.
-    
-    This option is incompatible with other capture binaries (like tcpdump).
-    
-    Change-Id: If93fca69f93b7833e7f8bb28b70311373f42f3f5
-    Reviewed-on: https://code.wireshark.org/review/17682
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 9c1e9b2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Sep 12 21:30:26 2016 +0200
-
-    qt: fix default action in Time Shift dialog
-    
-    Use "Apply" as default action, not "Open Help".
-    
-    Change-Id: Ida9b878732e444bbc450f8e63cc8e30a76f29bdc
-    Reviewed-on: https://code.wireshark.org/review/17672
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 8d2016d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 9 17:16:10 2016 +0200
-
-    addr_resolv: use ws_strtou8 function.
-    
-    This change prevents to accept netmasks as /24x. The
-    mask must be an clean integer.
-    
-    Change-Id: I46aeb089dd6538b5cc4bde7efd4dc317621a5245
-    Reviewed-on: https://code.wireshark.org/review/17612
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 3fd7030
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Sep 13 01:51:07 2016 -0700
-
-    Fix indentation.
-    
-    Change-Id: I2b2d1cd584eb1ec56ec5cdcd33fb789843c8192c
-    Reviewed-on: https://code.wireshark.org/review/17680
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b616554
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Nov 2 19:41:12 2015 +0100
-
-    Bluetooth: HCI vendor: Add support for some Intel commands/events
-    
-    This change based on BlueZ code on the same license that Wireshark is.
-    It seems that a lot of commands/events are incomplete or unknown,
-    however better to have them.
-    
-    Also rename variables (etc.) of the first dissector to contain
-    vendor name like new one, to distinguish them.
-    
-    Change-Id: I2db3ed73d477699032a44bac2d3c88a9230b0095
-    Reviewed-on: https://code.wireshark.org/review/17657
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ad980c7
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue May 3 22:45:05 2016 +0200
-
-    Qt/Bluetooth: Implement hover for rows
-    
-    This improves readability, especially while presenting results
-    to the other people.
-    
-    Change-Id: I1a6fc93c1b858078e171729971561321a4ddd956
-    Reviewed-on: https://code.wireshark.org/review/16469
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 99fff00
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Sep 12 15:44:16 2016 -0700
-
-    WSDG: Updates for Qt 5.6.
-    
-    Refer to Qt 5.6 for Windows builds. Update the download URL.
-    
-    Change-Id: Id4de0d55679a6ac1b7aac82ddd5eb80d6b54568a
-    Reviewed-on: https://code.wireshark.org/review/17674
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6c4b0ff
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Sep 12 12:41:48 2016 +0200
-
-    telnet: get rid of atoi().
-    
-    Change-Id: Id445aef1af21fcf176611122a757482c0b22f4bd
-    Reviewed-on: https://code.wireshark.org/review/17662
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8443643
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 12 09:51:47 2016 -0700
-
-    Fix file name in comment.
-    
-    Change-Id: I2a5b6e5c0ba8e729fbfa7e9e218aca1c747d6e45
-    Reviewed-on: https://code.wireshark.org/review/17667
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f2d6d07
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 12 09:45:12 2016 -0700
-
-    Remove unnecessary extcap_cleanup() declaration.
-    
-    That wasn't sufficient to avoid #ifdeffing calls to extcap_cleanup(), as
-    this header wasn't even being included if HAVE_EXTCAP wasn't defined,
-    hence change I18c855e13281013a6277c1f38eeac92e74d52b34 was necessary.
-    
-    It's probably best that this not be included if HAVE_EXTCAP isn't
-    defined, so as to catch *other* references to functions etc. that aren't
-    available without extcap.
-    
-    Change-Id: I5c4ad331b6df93bbbcd28ad3b9815e4cd226039a
-    Reviewed-on: https://code.wireshark.org/review/17666
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cea1737
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Sep 12 11:22:16 2016 +0200
-
-    Let strtoi with NULL endptr require no invalid characters
-    
-    If the caller is not interested in checking its end, then it probably
-    wants a valid number only if the string contains a valid number. Add a
-    shortcut for this.
-    
-    Change-Id: I39701bd445e29fb2606720b18ca3764c74a7255b
-    Reviewed-on: https://code.wireshark.org/review/17658
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit e3247b3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Sep 12 15:07:36 2016 +0200
-
-    fix some compilation issues without extcap.
-    
-    Change-Id: I18c855e13281013a6277c1f38eeac92e74d52b34
-    Reviewed-on: https://code.wireshark.org/review/17665
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 159d431
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 11 12:00:10 2016 +0200
-
-    androiddump: fix memleaks
-    
-    Most of the actions (e.g.  `androiddump --extcap-interfaces`) return
-    immediately without cleaning up. Fix this by adding a common exit path.
-    
-    Change-Id: If02b18da49d866fb5525306e52fbf4590d98ecd2
-    Reviewed-on: https://code.wireshark.org/review/17634
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 26bf66f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 11 14:17:14 2016 +0200
-
-    extcap: plug more memory leaks
-    
-    Fix leak of the preference key name which happen for every new extcap
-    argument. Fix leak of extcap arguments and the interface names in
-    extcap_register_preferences.
-    
-    Change-Id: Idd68f924baa000303043cb98b32b23ce34fddb64
-    Reviewed-on: https://code.wireshark.org/review/17637
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c64762d
-Author: Mikael Kanstrup <mikael.kanstrup@gmail.com>
-Date:   Thu Sep 8 14:26:58 2016 +0200
-
-    extcap: Fix misc memory leaks triggered by network interface changes
-    
-    Valgrind reports plenty of misc memory leaks in extcap after the network
-    interface list has changed or is refreshed. Errors can be seen by
-    starting Wireshark with Valgrind's memcheck tool and bringing a network
-    interface up and down a few times with:
-    
-    ifconfig eth0 up
-    ifconfig eth0 down
-    
-    Change-Id: I90f53847071854b7d02facb39b7a380732de79b4
-    Reviewed-on: https://code.wireshark.org/review/17606
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit e079862
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Sep 12 10:37:03 2016 +0200
-
-    cmake: fix breakage with libnl2
-    
-    I accidentally assumed that libnl2 works fine with just libnl.so, but
-    apparently the other libraries are also necessary.
-    
-    Change-Id: I1636710ea3f41ed10a5ccb37106cae9e688abec9
-    Reviewed-on: https://code.wireshark.org/review/17654
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 3c70e6d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Mar 7 21:10:46 2016 +0100
-
-    dmp: Code cleanup
-    
-    Change-Id: I06c80ca44e8f727c9dc8ec552117ff60e44a7ef4
-    Reviewed-on: https://code.wireshark.org/review/17659
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit b28cd2d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Sep 12 10:53:16 2016 +0200
-
-    Qt: Word wrap static text preferences
-    
-    The preferences static text may be too long for the preferences
-    dialog width, so set word wrap for this label.
-    
-    Change-Id: I0828601b39a5e189de707087e317c598576fc3db
-    Reviewed-on: https://code.wireshark.org/review/17656
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 68fafcf
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Sep 12 10:43:16 2016 +0200
-
-    dmp: Remove obsolete structured id handling
-    
-    The structured id handling is not in use by anyone.
-    
-    Change-Id: I643fb03f642a5c1900aaec7d41e2b66dba5a2b05
-    Reviewed-on: https://code.wireshark.org/review/17655
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 2e42199
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Aug 24 13:14:55 2016 +0200
-
-    [SELFM] Fix reassembly, tcp_dissect_pdus() can't be used as the real
-    length of the PDU is not known(length is exluding escape bytes).
-    
-    Change-Id: I762419f12ca80f6597163e232c4b853819927b65
-    Reviewed-on: https://code.wireshark.org/review/17302
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4fe91cf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Sep 11 22:25:24 2016 +0200
-
-    S1AP: add missing messages in info column
-    
-    While we are at it, let's reorder them in the .cnf file to match their
-    definition in S1AP-PDU-Contents.asn and ease review
-    
-    Change-Id: I4c433fa862d83053d8b01cc951e756379356fa57
-    Reviewed-on: https://code.wireshark.org/review/17649
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 032a6ac
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 11 22:19:31 2016 +0200
-
-    Fix memleaks in capture file dialog
-    
-    Tried to poke various fields (including the capture filter field), this
-    revealed some memleaks.
-    
-    Change-Id: I1eca431a09839906a4b3c902ad85e55bffc71ca8
-    Reviewed-on: https://code.wireshark.org/review/17648
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 71c41a0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 11 17:04:13 2016 +0200
-
-    epl: fix memleaks
-    
-    Fixes a memleak that occurs on (re)loading a pcap. While at it, remove
-    some unnecessary variables.
-    
-    Change-Id: Ibb662e5c608881bc7dfde9d12cdb77f699ff6542
-    Reviewed-on: https://code.wireshark.org/review/17639
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5c505e7
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Sep 11 22:57:45 2016 +0200
-
-    X2AP: add dissection of X2AP-Message information element
-    
-    Change-Id: I2993e1a9ebad1660573bce8a61b44962af08bbb3
-    Reviewed-on: https://code.wireshark.org/review/17652
+    Change-Id: Id95603634a93033664bdbd169880e6b411cfbc11
+    Bug: 13791
+    Reviewed-on: https://code.wireshark.org/review/22076
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8629e60
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Sep 11 13:48:35 2016 -0700
-
-    More signed vs. unsigned argument cleanups.
-    
-    Use the get.*guint32 routines to get unsigned values.
-    
-    Change-Id: I75e83b2d21bdf08c7c995e36e4deb3b1c6d6959d
-    Reviewed-on: https://code.wireshark.org/review/17651
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4abf452
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Sep 11 13:32:02 2016 -0700
-
-    Use the get.*guint32() routines to get guint32s.
-    
-    Change-Id: Ie3b451549a29970a5e3204b449f198aa1c82de5b
-    Reviewed-on: https://code.wireshark.org/review/17650
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4f46d9d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Sep 11 13:23:20 2016 -0700
-
-    Allow a zero change offset in editcap.
-    
-    It doesn't have to be non-zero.
-    
-    Change-Id: If578906855abd9eb9fa07e97ee5508c139b6f61b
-    Reviewed-on: https://code.wireshark.org/review/17646
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 11d3a0f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Sep 11 12:08:45 2016 -0700
-
-    Add a -a flag to specify running under ASan, and don't set ulimit -v if so.
-    
-    You can't run ASan-built programs with a ulimit, as ASan allocates a
-    huge amount of shadow memory.
-    
-    Change-Id: Ic4d3c2fae77719f65d4594774bc8aa92d2a3a035
-    Ping-Bug: 12797
-    Reviewed-on: https://code.wireshark.org/review/17645
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9360f41
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Sep 11 20:27:50 2016 +0200
-
-    mqtt: Only suback has failure in QoS values
-    
-    Change-Id: Ib308090dfc0911a9bb7580e601cab0bfbfe58efe
-    Reviewed-on: https://code.wireshark.org/review/17644
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit c2b858e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Sep 11 20:21:10 2016 +0200
-
-    mqtt: Fix subscribe/suback QoS values
-    
-    Change-Id: I15424b768e6e0fe2e8268db69b82d81351146155
-    Reviewed-on: https://code.wireshark.org/review/17643
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit bb46efd
-Author: Matt Lawrence <bugzilla.wireshark@erisa.co.uk>
-Date:   Mon Aug 29 11:39:04 2016 +0100
-
-    MySQL: verify connection state before dissecting as greeting/login.
-    
-    Change-Id: I419fad047c91ff1d8544eb3458534c132ec23821
-    Bug: 12791
-    Reviewed-on: https://code.wireshark.org/review/17368
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c31527d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Sep 8 21:26:12 2016 +0200
-
-    mqtt: Added elements from version 3.1.1
-    
-    Added version 3.1.1 CONNACK session present flag and SUBACK failure
-    indication.  Adjusted SUBSCRIBE and SUBACK QoS values.
-    
-    Added string length values.  Removed the message type subtree as it
-    had no purpose.  Put the message type in the top tree mqtt node instead.
-    
-    Removed unused code and fixed code layout.
-    
-    Change-Id: I8a9ae26ac9a2af04dc6f8d08ac46aa305c225c4f
-    Reviewed-on: https://code.wireshark.org/review/17590
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e954569
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Sep 7 18:07:01 2016 +0200
-
-    CQL: rename code for don't only support v3
-    
-    There is a v4 (and v5) with some change (patches coming !)
-    
-    Change-Id: I3107727e2b86f7f6c0019ba6f2638bb40b41c0fb
-    Reviewed-on: https://code.wireshark.org/review/17626
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0332275
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 11 16:10:46 2016 +0200
-
-    qt: fix minor memory leaks on exit
-    
-    Change-Id: I4856b7ce7eec15abe1278e9ba8314be61845347a
-    Reviewed-on: https://code.wireshark.org/review/17638
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 1d493ce
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Sep 11 08:12:41 2016 -0700
-
-    [Automatic update for 2016-09-11]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I29e1c1ae96c686a2c97609e939c2c35845d2d9ee
-    Reviewed-on: https://code.wireshark.org/review/17640
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 456312e
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 11 11:25:51 2016 +0200
-
-    dumpcap: fix memleak on exit
-    
-    Invocation of tshark -D (dumpcap -D -Z none) under ASAN fails with:
-    
-        tshark: Child dumpcap process died: Abort - core dumped
-    
-    Change-Id: Ida363089066205d579e841b019b32c2e33516f12
-    Reviewed-on: https://code.wireshark.org/review/17633
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5831501
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 11 01:16:24 2016 +0200
-
-    extcap: fix use-after-free for preferences
-    
-    In commit v2.3.0rc0-117-g485bc45 (backported to v2.2.0rc0-44-g66721ca),
-    extcap_prefs_dynamic_vals and extcap_cleanup were added in an attempt to
-    address dangling pointers.
-    
-    Unfortunately it is not sufficient:
-    
-     - A pointer to the preference value is stored in extcap_arg and passed
-       to the prefs API, but this extcap_arg structure can become invalid
-       which result in use-after-free whenever the preference is accessed.
-     - On exit, a use-after-free occurs in prefs_cleanup when the preference
-       value is being checked.
-    
-    As the preference subsystem actually manages the memory for the string
-    value and consumers should only provide a pointer where the value can be
-    stored, convert the char* field in extcap to char**. This has as
-    additional benefit that values are not limited to 256 bytes anymore.
-    
-    extcap_cleanup is moved after epan_cleanup to ensure that prefs_cleanup
-    does not operate on dangling pointers.
-    
-    Crash is reproducible under ASAN with: tshark -i randpkt
-    
-    Ping-Bug: 12183
-    Change-Id: Ibf1ba1102a5633aa085dc278a12ffc05a4f4a34b
-    Reviewed-on: https://code.wireshark.org/review/17631
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit b82695d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Sep 7 14:53:10 2016 -0700
-
-    WiX: Add a warning and increase compression.
-    
-    Note that you should probably uninstall the NSIS package first if it's
-    installed. Set the compression level to "high".
-    
-    Change-Id: I10de8df580f8410fd13cdf414db1b1812a9fcf02
-    Reviewed-on: https://code.wireshark.org/review/17566
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2fb9cbd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Aug 23 13:38:27 2016 +0200
-
-    TLS: Enhance display of Hello Extension
-    
-    Append the length to the extension and display the contents of
-    unknown extensions as bytes.
-    
-    Change-Id: Iba1204a1d5e187f28cb41c4369b10eeb86e6b43a
-    Reviewed-on: https://code.wireshark.org/review/17265
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 193e366
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 9 16:33:55 2016 +0200
-
-    remove unused mkcap.c.
-    
-    mkcap.c is not used in any place.
-    
-    Change-Id: Ie29b2ed66bc304a5b6a19fc9128ead2958f8062a
-    Reviewed-on: https://code.wireshark.org/review/17610
-    Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e8f1d2a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Sep 10 12:54:08 2016 -0700
-
-    Fix indentation.
-    
-    Change-Id: I440eac95172fe040255ab010fd17a17b21b68ae8
-    Reviewed-on: https://code.wireshark.org/review/17630
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8bfe20b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 10 19:29:49 2016 +0200
-
-    debian: Update symbols file with new/missing symbols
-    
-    wtap_get_all_file_extensions_list was renamed in v2.3.0rc0-621-g4a6dde1
-    ws_strtou* functions were introduced in v2.3.0rc0-544-gba981ac
-    get_guint32 and get_nonzero_guint32 were added in v2.3.0rc0-595-ge09b03e
-    
-    Change-Id: I9aea9c48f2da03590952b995fd21cddb17532af0
-    Reviewed-on: https://code.wireshark.org/review/17629
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit af3a065
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 10 15:05:35 2016 +0200
-
-    extcap-base: fix memleak from help options
-    
-    Also correct modelines, this file really uses 4 spaces and not tabs.
-    
-    Change-Id: I828d0249cc7637275e5a04e9117b22e9eea6bd8c
-    Reviewed-on: https://code.wireshark.org/review/17625
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ac7c05f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 9 14:40:01 2016 +0200
-
-    sll: add unused bytes to tree.
-    
-    The bytes that are not part of the address are not dissected.
-    Added them to the tree as "unused", to have a complete dissection
-    of the packet.
-    
-    Found by incomplete dissector check.
-    
-    Change-Id: Iafffebe8bc0f8254ac0b451d007e0a99aab91924
-    Reviewed-on: https://code.wireshark.org/review/17608
+    Reviewed-on: https://code.wireshark.org/review/22080
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f9fc92a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Sep 10 16:43:28 2016 +0200
-
-    CQL: fix indent modelines
-    
-    Change-Id: Ie7ad09b3141fa6f4753981bd814736ee88c817d1
-    Reviewed-on: https://code.wireshark.org/review/17627
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7fad354
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 30 10:54:25 2016 -0400
+commit c238d2f
+Author: Petr Sumbera <petr.sumbera@oracle.com>
+Date:   Sun Jun 11 15:32:12 2017 +0200
 
-    Add Socket CANFD dissector.
+    Fix airpdcap compilation on Sun
     
-    Bug: 12687
-    Change-Id: Ib489b4c6aff1e0611e9b8a086054e56284f24b84
-    Reviewed-on: https://code.wireshark.org/review/16787
+    Bug: 13786
+    Change-Id: Iaa3890610768605b5c579aaddc73124b9f85bdd9
+    Reviewed-on: https://code.wireshark.org/review/22074
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 2073457ab9ef817a2342e3c4dd858b88198020e4)
+    Reviewed-on: https://code.wireshark.org/review/22075
 
-commit 7541a00
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 10 13:03:38 2016 +0200
-
-    reordercap: fix memleak on exit
-    
-    Change-Id: I328fe03ab6c72b2bb9c4ead01170a341e5bd4d1a
-    Reviewed-on: https://code.wireshark.org/review/17624
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit e5fef1d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 10 01:27:28 2016 +0200
-
-    Fix version-string releated memleak for some CLI tools
-    
-    These programs resulted on a memleak report on exit.
-    
-    Change-Id: I630618f50d723b7af4cb00ba29671d4e7c6fcdc2
-    Reviewed-on: https://code.wireshark.org/review/17623
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 4b05159
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 10 01:25:55 2016 +0200
-
-    capinfos: fix memleaks
-    
-    Change-Id: Ib3145bb13d2a72c16f9c219fa19321e44958a30e
-    Reviewed-on: https://code.wireshark.org/review/17622
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d1a8213
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 10 01:20:41 2016 +0200
-
-    editcap: fix memleaks
-    
-    The version string stuff mirrors an earlier tshark change. Move some
-    cleanup calls (in case no packets are selected) and add wtap_close.
-    
-    Change-Id: I6f282e89279a732c226824e10857be04b40841e8
-    Reviewed-on: https://code.wireshark.org/review/17621
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit ba2a3b3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Sep 10 01:12:58 2016 +0200
-
-    wiretap: fix memory leak of interface_data for wtap_dumper
-    
-    Mirrors the behavior of wtap_close.
-    
-    Change-Id: I1a04878fdd0409fa74931737332f9b8a1ae77fb1
-    Reviewed-on: https://code.wireshark.org/review/17620
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit d6f91a7
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Sep 9 23:37:46 2016 +0200
-
-    S1AP: prettify dissection
-    
-    Change-Id: I2b4339e489d11ade2751cad8874ba220d12fe3db
-    Reviewed-on: https://code.wireshark.org/review/17615
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 4a6dde1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 9 23:44:25 2016 -0700
-
-    Have "All Capture Files" match only capture files.
-    
-    We support reading some types of files that aren't capture files, in
-    case we have a dissector for that file format (because, for example,
-    it's often transported over HTTP).  Don't include them in the set of
-    files "All Capture Files" matches; you can still look for them as they
-    have individual entries in the drop-down menu of file type patterns.
-    
-    Ultimately, there should be Fileshark/TFileshark programs to read those
-    files - and other file types, and even capture files if the goal is to
-    look at the file structure rather than at the packets - and *that's* the
-    program that should offer the ability to load JPEGs and so on.
-    
-    (No, this does not reduce the "All Capture Files" list down to a level
-    that makes the problem in bug 12837 go away.  The right way to fix
-    *that* is to arrange, somehow, that the "All Capture Files" entry not
-    actually list all the suffixes it matches.)
-    
-    Change-Id: I705bff5fcd0694c6c6a11892621a195aa7cd0264
-    Reviewed-on: https://code.wireshark.org/review/17619
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d1cacbb
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Sep 9 15:04:15 2016 -0700
-
-    PortableApps: Allow multiple instances.
-    
-    The documentation for the [Launch]SingleAppInstance key doesn't seem
-    to match its behavior in that its default value (true) keeps multiple
-    portable instances from running, at least for us. Set it to false since
-    we're happy with users running as many concurrent instances as they can
-    stand. Set the related SinglePortableAppInstance key to false while
-    we're here in case its default value ever changes.
-    
-    Change-Id: Iea1a6a80d5b204814b7569776734e0b0e254d657
-    Reviewed-on: https://code.wireshark.org/review/17616
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 559bb37
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Sep 8 14:31:03 2016 -0700
-
-    Remove name resolution from the file dialogs.
-    
-    A single name resolution checkbox was added to the file dialog way back
-    in 2000 in g0f7cf64. At that time it was needed because resolution was
-    synchronous and could drastically affect your load time. Since then
-    we've added asynchronous name resolution and more recently made it
-    mandatory (ge005bc8). We've also added more name resolution checkboxes
-    and other controls.
-    
-    Remove the name resolution checkboxes. You can just as easily change
-    resolution options before or after opening a file and they take up
-    valuable real estate.
-    
-    Combine the size and packets in the Qt and Win32 dialogs and
-    pretty-print the size. Combine the start and elapsed times in the Qt,
-    Win32, and GTK+ dialogs. This lets us shrink the custom areas of the
-    file dialogs even further. Make the default file type combo item more
-    descriptive.
-    
-    Change-Id: Id770adc0f284a4c7f08ee5a7db84f8435f4bf907
-    Reviewed-on: https://code.wireshark.org/review/17597
-    Tested-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit ecd82d0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Sep 9 22:16:02 2016 +0200
-
-    X2AP: shorten field description
-    
-    Change-Id: I37828fe5611fa835050427ac0c73e979aa7a1ddf
-    Reviewed-on: https://code.wireshark.org/review/17614
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ae7c4ad
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Sep 7 20:43:01 2016 -0400
-
-    Remove "Elasticsearch HTTP" dissector.
-    
-    It was just a wrapper over regular HTTP dissector, which can already
-    pick its own ports to use.
-    
-    Also some other minor cleanup related to removal.
-    
-    Change-Id: I20dd37670c676551a06aaeb69fd657684af9685d
-    Reviewed-on: https://code.wireshark.org/review/17567
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 82f1d14
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Sep 9 13:31:24 2016 +0200
-
-    nordic_ble: Capitalize short name
-    
-    Change-Id: I2130b012f28b23342679f33e1e19a4e5e0943090
-    Reviewed-on: https://code.wireshark.org/review/17607
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit cb96331
-Author: Adrien Aubry <adraub@gmail.com>
-Date:   Thu Sep 8 15:26:25 2016 +0200
-
-    CANopen: EMCY manufacturer error field size bug fix
-    
-    -Manufacturer error field has 5 bytes (not 4)
-    -corrected two descriptions
-    
-    Change-Id: Ic6f3e8fdf08c52f1d4f987410e1e0597a9f6aaed
-    Reviewed-on: https://code.wireshark.org/review/17575
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f7a59da
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 4 21:30:03 2016 +0200
-
-    ssl: set protocol column to "TLS" when possible
-    
-    The protocol version from a SSL/TLS record contains the minimum
-    supported SSL/TLS version and is the best guess for Client Hello
-    handshake messages if no authorative version is available.
-    
-    By considering the version from the conversation for the initial
-    col_set_str call, we can also remove some other calls down the road.
-    
-    Change-Id: I4be25f5c9057ffd0abcea7280d826867c135fed7
-    Reviewed-on: https://code.wireshark.org/review/17490
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit faa04b1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Sep 7 14:39:46 2016 +0200
-
-    ipfix: use ws_strtoi function.
-    
-    Change-Id: Icca32f714381166e505932958b87f9ffab62aa1d
-    Reviewed-on: https://code.wireshark.org/review/17557
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d5826f1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Sep 7 14:18:06 2016 +0200
-
-    erf: use ws_strtoi function.
-    
-    Change-Id: I1d94deb547bd30076e0c171bf9e6b97aac98a545
-    Reviewed-on: https://code.wireshark.org/review/17556
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fd38b0c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 9 01:34:13 2016 -0700
-
-    Fix copy-and-pasteo.
-    
-    Change-Id: Ifead0872053943b7cfe192e15d7099e2328ae456
-    Reviewed-on: https://code.wireshark.org/review/17603
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d62d867
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 9 01:31:23 2016 -0700
-
-    Get rid of trailing blank.
-    
-    Change-Id: I3aa2f4a6e25f610e0e9236835bbcb588eeb15c08
-    Reviewed-on: https://code.wireshark.org/review/17602
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2163929
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 9 01:30:12 2016 -0700
-
-    Clean up error reporting.
-    
-    Have xml_get_int() handle the setting of the two error reporting values
-    and give a better error message.  Have it check to make sure that there
-    isn't cruft after the digits.
-    
-    Change-Id: Id590430eb52668ef76de8aa7096a27d8fc094208
-    Reviewed-on: https://code.wireshark.org/review/17601
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 381be23
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 9 00:50:08 2016 -0700
-
-    Add a comment.
-    
-    Change-Id: Ia5bedaf8718985b325ed244a471cdc4e27f2928f
-    Reviewed-on: https://code.wireshark.org/review/17599
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4312ec8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Sep 7 14:07:51 2016 +0200
-
-    dct3trace: use ws_strtoi function.
-    
-    Change-Id: Iaa656dc4b939ac9649b87e88c9d27082d3e53f00
-    Reviewed-on: https://code.wireshark.org/review/17555
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 113c1ed
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 6 17:44:56 2016 +0200
-
-    catapult: use ws_strtou/i functions.
-    
-    Change-Id: I0a9d3674c0cc2d0dba8c1fbeba2d739373cf8655
-    Reviewed-on: https://code.wireshark.org/review/17535
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1948f7b
-Author: Jeff Layton <jlayton@redhat.com>
-Date:   Fri Sep 2 12:02:32 2016 -0400
-
-    nfs: add dissector for CB_NOTIFY_LOCK args
-    
-    Show the filehandle and lockowner for the callback.
-    
-    Change-Id: Id09b260d4b31f8fa35ba8452dc143095e5cc88ec
-    Signed-off-by: Jeff Layton <jlayton@redhat.com>
-    Reviewed-on: https://code.wireshark.org/review/17574
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6519f8e
-Author: Makoto Shimamura <makoto.shimamura@toshiba.co.jp>
-Date:   Tue Sep 6 20:55:10 2016 +0900
-
-    OCFS2: dissector incorrectly parses LVB data and claims malformed message
-    
-    Some messages related to LVB data are mistakenly treated as malformed.
-    This patch fixes it by checking LVB flags before parsing LVB data.
-    I found that "Convert lock" and "Unlock" use PUT_LVB flags, but "Proxy AST" uses GET_LVB flags.
-    
-    Ping-Bug: 12122
-    Change-Id: I2c62c8cc9f9bd84abaf92de9f216550101962520
-    Reviewed-on: https://code.wireshark.org/review/17532
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bd45929
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Sep 8 13:43:00 2016 -0700
-
-    extcap_child_watch_cb() always uses the status argument.
-    
-    Change-Id: I2537f2e3babe2158796acda6855f5aebeb0b7d4d
-    Reviewed-on: https://code.wireshark.org/review/17595
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f1a7497
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 8 20:41:05 2016 +0200
-
-    IRemUnknown: initialize remunk_remqueryinterface_call_t structure
-    
-    Bug: 12841
-    Change-Id: I5916c30a18029d0872e0439d3393eaa6d27964dd
-    Reviewed-on: https://code.wireshark.org/review/17589
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit fb85325
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 8 19:57:04 2016 +0200
-
-    IPP: fix use after free error
-    
-    Packet memory pool is already freed when columns are printed
-    
-    Bug: 12840
-    Change-Id: If3e63586f14872aafe701612998370fffe506443
-    Reviewed-on: https://code.wireshark.org/review/17584
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 2f0a99e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 8 17:56:19 2016 +0200
-
-    M2AP: fix a typo leading to an expert info when decoding an IPv6 address
-    
-    Change-Id: I10b67541427ca39a8f1d0989d680841b9d7883c9
-    Reviewed-on: https://code.wireshark.org/review/17581
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d0e55f0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 8 20:06:37 2016 +0200
-
-    M3AP: fix dissection of IP address
-    
-    Change-Id: I96faed61c33f6fe14cc4196c3440d873b69d5334
-    Reviewed-on: https://code.wireshark.org/review/17585
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a1368ce
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Sep 8 11:40:20 2016 -0700
-
-    Use get_nonzero_guint32() to fetch guint32 values.
-    
-    Change-Id: I3adeb2974b1093270bec12039cd855c92f660f4d
-    Reviewed-on: https://code.wireshark.org/review/17588
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 83eb448
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Sep 8 11:38:03 2016 -0700
-
-    Fix the signature of the stub version of ws80211_set_freq().
-    
-    Change-Id: I5f0da4fb5d8d452f3cff3d37e0749dde8e98b600
-    Reviewed-on: https://code.wireshark.org/review/17587
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fcb6fd3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Sep 5 15:45:21 2016 +0200
-
-    dumpcap: change types.
-    
-    Change-Id: I6520971e607623dadcb3ae392ce264bf49c621bd
-    Reviewed-on: https://code.wireshark.org/review/17499
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e09b03e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Sep 8 11:26:45 2016 -0700
-
-    Add get_ routines to get a guint32, and use them.
-    
-    By analogy to get_natural_int() and get_positive_int(), add routines to
-    get a guint32 and to get a non-zero guint32, doing all the necessary
-    error checks, and use it.
-    
-    Change-Id: I65a9ac8a3d136886df3588806ae7af5bdc7b8cb6
-    Reviewed-on: https://code.wireshark.org/review/17586
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 132632b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Sep 5 15:50:38 2016 +0200
-
-    editcap: use ws_strtou/i functions.
-    
-    Change-Id: Ib69241eb04088fe32f53ac4e87911499cf5e9e40
-    Reviewed-on: https://code.wireshark.org/review/17500
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 468acff
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 8 17:04:43 2016 +0200
-
-    PER: only display internal extension presence bit if activated in
-    preferences
-    
-    Change-Id: I889b32c5e609c8c10ed2a8aa5a5e6d5b88baadc4
-    Reviewed-on: https://code.wireshark.org/review/17580
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 6652620
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 8 16:49:34 2016 +0200
-
-    M2AP: display IP address in a subtree
-    
-    Change-Id: Ic1853e1d265797e482495b8d07aa324545a7442e
-    Reviewed-on: https://code.wireshark.org/review/17579
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-
-commit 1e83b59
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 8 07:20:29 2016 +0200
-
-    U3V: ensure that gencp_transaction_t structure is fully initialized
-    
-    Bug: 12829
-    Change-Id: Iee8817fc0331af037284e5ec21b30671c6b3bd7d
-    Reviewed-on: https://code.wireshark.org/review/17569
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit b20b9c9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Sep 7 15:22:01 2016 +0200
-
-    QUIC: Add FHOL (Force Head Of Line blocking) tag from Q036
-    
-    Change-Id: Ieb0d1d0b2ebe2a6f325cdd18ef51677ee1a5535e
-    Reviewed-on: https://code.wireshark.org/review/17564
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 03e4307
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Sep 7 22:56:39 2016 +0200
+commit 325895b
+Author: Robert Sauter <sauter@locoslab.com>
+Date:   Sun Jun 11 12:37:14 2017 +0200
 
-    NBT: fix  Bad description for NBSS error code 0x81
-    
-    Issue reported by Pavel Kankovsky
-    https://tools.ietf.org/html/rfc1002#section-4.3.4
+    packet-spdy: Fix -Wunused-const-variable error when compiling without zlib
     
-    Bug:12835
-    Change-Id: Iac7e58b9fd61f1f0dfd86960ef4f306ac6ed5a9c
-    Reviewed-on: https://code.wireshark.org/review/17565
+    Change-Id: Id471772488d3a0568f16f604585b3155a57e47b2
+    Reviewed-on: https://code.wireshark.org/review/22072
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 35affe3
-Author: Michael Sweet <michael.r.sweet@gmail.com>
-Date:   Sat Aug 20 12:09:25 2016 -0400
-
-    Changes to the IPP dissector:
-    
-        - xxx-time values are not UNIX timestamps (that is a CUPS-ism - they are
-          time since bootup in IPP itself)
-        - Change all of the display strings to use the official IANA values
-          (confusing otherwise)
-        - Add support for newer value/group tags.
-        - Add support for all enum attribute values.
-        - Add request/response tracking so you can easily match things up.
-        - Decode octetString, rangeOfInteger, textWithLanguage, nameWithLanguage,
-          dateTime, and resolution values.
-        - Don't treat integers and enums as interchangeable (they aren't).
-        - Integers and enums are signed integers.
-        - Put operation id or status code in info column.
-    
-    Change-Id: I9fb5cd89d3c386a2b3932ef4c75967ce2547bc22
-    Reviewed-on: https://code.wireshark.org/review/17192
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Smith Kennedy <smith.kennedy@hp.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c9a3b72
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Sep 7 12:53:34 2016 -0700
-
-    Note recent packaging updates.
-    
-    Add notes about the Windows Installer and source packages.
-    
-    Change-Id: Ic1aea3b547afab6dfdf0218b6ea257046a20cf00
-    Reviewed-on: https://code.wireshark.org/review/17562
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit c7fc280
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Sep 7 10:43:15 2016 -0700
-
-    Make the ws_strto* routines more like the strto* routines.
-    
-    Not all uses of atoi() or various strto* routines in Wireshark expect
-    the string to contain *only* a number, so not all uses should require
-    that the byte after the number be a '\0'.  Have the ws_strto* routines
-    take a "pointer a pointer set to point to the character after the
-    number" argument, and have the callers do the appropriate checks of the
-    character after that.
-    
-    This fixes the VMS trace reading code so that it can read those files
-    again.
-    
-    The get_ routines are handed command-line arguments, so they *do* expect
-    the string to contain only a number; have them check to make sure the
-    byte after the number is a '\0'.
-    
-    Change-Id: I46fc1bea7912b9278e385fe38491a0a2ad60d697
-    Reviewed-on: https://code.wireshark.org/review/17560
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a66aa4c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Sep 7 22:15:31 2016 +0200
-
-    Add M2AP to release notes
-    
-    Change-Id: Ied05b57c668d99bf386e8ced55c13bf8c17c453b
-    Reviewed-on: https://code.wireshark.org/review/17563
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f90d436
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Tue Sep 6 20:43:17 2016 +0100
-
-    ICMP: Avoid spurious reply not found for broadcast ping
-    
-    Bug: 12830
-    Change-Id: Ie73b2b6e75c396660d0d2f2fc975c57bbb58d2eb
-    Reviewed-on: https://code.wireshark.org/review/17541
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 693c745
-Author: Marius Paliga <mareko.paliga@gmail.com>
-Date:   Wed Sep 7 11:17:25 2016 +0200
-
-    Add support for TWAN-User-Location-Info
-    
-    Bug: 12834
-    Change-Id: Ibb196a4e1e8d05b3f124409b18093623f3694af0
-    Reviewed-on: https://code.wireshark.org/review/17553
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ee1a410
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Mon Sep 5 07:54:47 2016 +0200
-
-    extcap: Add tool-specified helppage
-    
-    Allow the tool to provide a link to a helppage, displayed
-    by clicking on help in the configuration dialog.
-    
-    The URL will be opened using an URL based service, therefore local
-    as well as remote URLs are possible.
-    
-    Change-Id: I58b30244e97919d5cf6892faf96536ddc30fb5a7
-    Reviewed-on: https://code.wireshark.org/review/17549
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 859cf86
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Sep 7 10:54:08 2016 +0200
-
-    M2AP: fix dissection of procedure codes
-    
-    Change-Id: I6c8f01e65a16561ff78593edc263fb26d99c182b
-    Reviewed-on: https://code.wireshark.org/review/17552
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 773c71f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Sep 7 10:33:03 2016 +0200
-
-    M3AP: display short protocol name in protocol column
-    
-    Change-Id: I7575caad67101d394c2c80d4bfd81f83389043aa
-    Reviewed-on: https://code.wireshark.org/review/17551
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit affa9df
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 08:16:30 2016 +0200
-
-    QUIC: Add preference to force decode all payload
-    
-    For debugging...
-    
-    Change-Id: I23eb70c89ac95371e1d7b05a52ffeed4f993a52a
-    Reviewed-on: https://code.wireshark.org/review/17135
-    Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 7786a97
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Sep 6 21:47:27 2016 -0700
-
-    Further ws_strto* cleanups.
-    
-    Make pkt_len unsigned.
-    
-    Improve the error message for ws_strtou32() failure.
-    
-    Change-Id: I080b4fc132c8e405bc1dbd87fc717c2b337517bc
-    Reviewed-on: https://code.wireshark.org/review/17547
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c95c536
-Author: Makoto Shimamura <makoto.shimamura@toshiba.co.jp>
-Date:   Tue Sep 6 22:36:33 2016 +0900
-
-    OCFS2: dissector incorrectly takes pdu length as little endian
-    
-    This patch fixes incorrect endian conversion in pdu length.
-    Actually pdu length is big endian.
-    
-    Ping-Bug: 12122
-    Change-Id: I9f8827293e684a5b4c957138f5879efdd140c500
-    Reviewed-on: https://code.wireshark.org/review/17533
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4c39e19
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 6 17:58:43 2016 +0200
-
-    vms: use ws_strtoi function.
-    
-    Change-Id: I30c32a6fc4200da5a150769b84f91b4d193f8f5d
-    Reviewed-on: https://code.wireshark.org/review/17536
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a4c95eb
-Author: Makoto Shimamura <makoto.shimamura@toshiba.co.jp>
-Date:   Mon Sep 5 21:01:54 2016 +0900
-
-    OCFS2: dissector incorrectly treats keepalive messages as unknown type
-    
-    Keepalive req/resp messages are shown as "Unknown type (0x00)" in info column.
-    This patch fixes them to "Keepalive Request" and "Keepalive Response".
-    
-    Ping-Bug: 12122
-    Change-Id: If09192067736b78c7785ba1ff05ae62a05d3dc23
-    Reviewed-on: https://code.wireshark.org/review/17497
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0495fc3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Sep 6 20:51:23 2016 -0700
-
-    Add some notes about XLC, HP C, and Sun/Oracle C.
-    
-    Change-Id: I2f65face2aa7354ec350aed308402bb719bd619f
-    Reviewed-on: https://code.wireshark.org/review/17546
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5c38838
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Sep 6 16:57:56 2016 -0700
-
-    Place variable declarations where they're used.
-    
-    Fix
-    
-        ../../ui/io_graph_item.h:251:29: warning: will never be executed [-Wunreachable-code]
-                            guint64 t, pt; /* time in us */
-                                    ^
-    
-    Change-Id: I0e861e892c2c03151d9f98e31ac68ce296baa26a
-    Reviewed-on: https://code.wireshark.org/review/17545
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit facc953
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Sep 6 15:59:24 2016 -0700
-
-    Autotools: Distribute packaging/wix.
-    
-    …otherwise you can't compile from the tarball on Windows.
-    
-    Change-Id: I99c73b09d9468f0da753c05451fa54348680963f
-    Reviewed-on: https://code.wireshark.org/review/17543
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 9fb9e9f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Sep 6 22:59:45 2016 +0200
-
-    X2AP: prettify info column
-    
-    Change-Id: I1630199383e0b83bf14e8d9850870268d7db777c
-    Reviewed-on: https://code.wireshark.org/review/17542
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 9be89dd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Sep 6 21:24:13 2016 +0200
-
-    X2AP: upgrade dissector to v13.4.0
-    
-    Change-Id: I97250d022a40ac888522f885968e7cd3c86e3485
-    Reviewed-on: https://code.wireshark.org/review/17540
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 26551ba
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 6 14:42:29 2016 +0200
-
-    ciscodump: fix line parsing and fix memleak.
-    
-    Change-Id: I4aee51d7def06317a543fdc8fa05120af0e68453
-    Reviewed-on: https://code.wireshark.org/review/17531
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 595610f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Sep 6 11:00:57 2016 -0700
-
-    Always set *cint before returning.
-    
-    Change-Id: I333aef7d3fe4ad3bf7c2a4d7318766fcbd2e4cd2
-    Reviewed-on: https://code.wireshark.org/review/17539
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 295dbc6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Sep 6 10:14:12 2016 -0700
-
-    Suppress another warning if told not to report failures.
-    
-    That's another failure that can occur if you're trying to load a
-    libwireshark plugin in a program that doesn't use libwireshark if, for
-    example, references to an undefined symbol don't prevent the module from
-    being loaded in the first place.
-    
-    Change-Id: I21629c0094fdca7dfbd88f39b7e6c10fb600b401
-    Reviewed-on: https://code.wireshark.org/review/17537
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7a674c0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 4 01:23:37 2016 +0200
-
-    ssl: fix TLS renegotiation, add test for this
-    
-    A handshake starts a new session, be sure to clear the previous state to
-    avoid creating a decoder with wrong secrets.
-    
-    Renegotiations are also kind of transparant to the application layer, so
-    be sure to re-use an existing SslFlow. This fixes the Follow SSL stream
-    functionality which would previously ignore everything except for the
-    first session.
-    
-    The capture file contains a crafted HTTP request/response over TLS 1.2,
-    interleaved with renegotiations. The HTTP response contains the Python
-    script used to generate the traffic. Surprise!
-    
-    Change-Id: I0110ce76893d4a79330845e53e47e10f1c79e47e
-    Reviewed-on: https://code.wireshark.org/review/17480
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 36c8065
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Sep 6 12:41:23 2016 +0200
-
-    strtoi(.c): fix extra ';' outside of a function [-Wextra-semi]
-    
-    Change-Id: I2d92678b2117da732be309c2d430d0c97c7a7eed
-    Reviewed-on: https://code.wireshark.org/review/17528
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3fce8da
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Sep 6 13:41:46 2016 +0200
-
-    checkAPI: move atoi from deprecated to soft-deprecated list.
-    
-    atoi must lie in soft-deprecated list until close to complete removal.
-    
-    Change-Id: Ia26ada56114559637fdc598913ee93523ed9434d
-    Reviewed-on: https://code.wireshark.org/review/17529
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 10e84a6
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 4 02:06:50 2016 +0200
-
-    ssl: really fix session resumption expert info
-    
-    In a two-pass dissection with renegotiated sessions, the
-    is_session_resumed flag is not updated according to the current protocol
-    flow. Fix this by performing detection of abbreviated handshakes in
-    all cases, do not limit it to the decryption stage (where ssl != NULL).
-    
-    Reset the resumption assumption after the first ChangeCipherSpec
-    (normally from the server side, but explicitly add this in case client
-    packets somehow arrive earlier in the capture). This should not have a
-    functional effect on normal TLS captures with Session Tickets.
-    
-    Bug: 12793
-    Change-Id: I1eb2a8262b4e359b8c1d3d0a1e004a9e856bec8c
-    Reviewed-on: https://code.wireshark.org/review/17483
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit c8de455
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Sep 6 10:13:20 2016 +0200
-
-    zvt: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I68b4fa08a7f65b92e56a6e72a6bb113e72ee33da
-    Reviewed-on: https://code.wireshark.org/review/17524
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 27d522d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Sep 6 08:06:19 2016 +0200
-
-    SMB2: Always display reserved field
-    
-    Change-Id: Ic26603488cb020da3885f5bc97c65aae18fdf191
-    Reviewed-on: https://code.wireshark.org/review/17517
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3b3c515
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Sep 6 07:52:06 2016 +0200
-
-    smb2: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I714e2ea4808213901a8be64e65a0cb37c3002372
-    Reviewed-on: https://code.wireshark.org/review/17516
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b6dd50f8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 2 10:19:44 2016 +0200
-
-    caputils: add conditional unused (_U_).
-    
-    Change-Id: I50ccedd876bf78961397b55e5a707c98900f7b9f
-    Reviewed-on: https://code.wireshark.org/review/17457
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 9b39db0
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Mon Sep 5 13:29:23 2016 +0200
-
-    extcap:Replace self-organized lists with glib ones
-    
-    Replace the error-prone next/prev handling with GList and GHashTable
-    Cleanup extcap_parser to only expose necessary functions
-    Remove token know-how from extcap
-    
-    Change-Id: I7cc5ea06f58ad6c7a85ac292f5d2cb3d33e59833
-    Reviewed-on: https://code.wireshark.org/review/17496
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4ec7675
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 19:43:48 2016 -0700
-
-    We now support C++/C99-style comments.
-    
-    Change-Id: I175a6b0060235c2dfc7a5b3dc4ab62843d242e94
-    Reviewed-on: https://code.wireshark.org/review/17514
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 232a879
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Aug 31 15:58:20 2016 +0200
-
-    Allow a lot more C99 features
-    
-    Flexible array members are supported by gcc, clang and even MSVC2013.
-    Note, so far it was only used in the Windows-specific airpcap.h.
-    
-    Trailing commas in enum declaration are already in use since for
-    these dissectors (commit ID is the first occurrence):
-    epan/dissectors/packet-gluster.h v2.1.0rc0-1070-g3b706ba
-    epan/dissectors/packet-ipv6.c v2.1.2rc0-81-ge07b4aa
-    epan/dissectors/packet-netlink.h v2.3.0rc0-389-gc0ab12b
-    epan/dissectors/packet-netlink-netfilter.c v2.3.0rc0-239-g1767e08
-    epan/dissectors/packet-netlink-route.c v2.3.0rc0-233-g2a80b40
-    epan/dissectors/packet-quic.c v2.3.0rc0-457-gfa320f8
-    
-    Inline functions using the "inline" keyword are supported via all glib
-    versions we support (if it is missing, glib will define a suitable
-    inline macro).
-    
-    Other c99 functions listed in the README.developer document were found
-    to be compatible with GCC 4.4.7, Clang 3.4.2 and MSVC 2013.
-    
-    Change-Id: If5bab03bfd8577b15a24bedf08c03bdfbf34317a
-    Reviewed-on: https://code.wireshark.org/review/17421
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5eb9170
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 19:23:36 2016 -0700
-
-    Use ws_strtoi32() in get_natural_int().
-    
-    Change-Id: I9a95239de8db18cff0f6c62cb526f3ef0cb29f01
-    Reviewed-on: https://code.wireshark.org/review/17513
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9ef70fc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 19:05:11 2016 -0700
-
-    Return the maximum or minimum value for ERANGE.
-    
-    That way, for signed values, the caller knows whether ERANGE means "too
-    large" or "too small"; this is analogous to what the C routines return.
-    
-    Change-Id: Ifc1fc4723733be606487093f8aa77ae2d89d2c40
-    Reviewed-on: https://code.wireshark.org/review/17512
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 97103d4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 18:08:08 2016 -0700
-
-    Check for signs in unsigned numbers and fail if we see one.
-    
-    -1 is not an unsigned number.  For that matter, neither is +1;
-    "unsigned" means "without a sign", and they both have signs.
-    
-    ANSI C's strto{whatever} routines - even the ones that supposedly are
-    for "unsigned" values - and the GLib routines modeled after them allow a
-    leading sign, so we have to check ourselves.
-    
-    Change-Id: Ia0584bbf83394185cde88eec48efcdfa316f1c92
-    Reviewed-on: https://code.wireshark.org/review/17511
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4adf7f2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 17:57:29 2016 -0700
-
-    Use get_positive_int() to parse signed positive arguments.
-    
-    Change-Id: I323b2c203b49a6921251583772bdb3c3afacd31b
-    Reviewed-on: https://code.wireshark.org/review/17510
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c02865d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 17:51:43 2016 -0700
-
-    Return after calling cmdarg_err().
-    
-    cmdarg_err() prints a message, but it doesn't exit.
-    
-    Change-Id: I887d96bce483f873a4375cb6b5254915d014f1b1
-    Reviewed-on: https://code.wireshark.org/review/17509
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c1dcaff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 17:33:20 2016 -0700
-
-    Use get_positive_int() to parse signed positive arguments.
-    
-    Clean up indentation while we're at it.
-    
-    Change-Id: Ie7223f96c758bd71d2435203635db9c2b28e2249
-    Reviewed-on: https://code.wireshark.org/review/17508
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 94d8250
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 16:39:25 2016 -0700
-
-    Use get_positive_int() to parse signed positive arguments.
-    
-    Change-Id: Id17b56704f484abdf047a3d1b0775f7fa46eb380
-    Reviewed-on: https://code.wireshark.org/review/17507
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2a38dc7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 16:26:29 2016 -0700
-
-    Have scan_plugins() take an argument specify what to do on load failures.
-    
-    That's a less gross hack to suppress load failures due to not having
-    libwiretap than providing a no-op failure-message routine, as it at
-    least allows other code using a failure-message routine, such as
-    cmdarg_err() and routines that call it, to be used.
-    
-    We really should put libwiretap and libwireshark plugins into separate
-    subdirectories of the plugin directories, and avoid even looking at
-    libwireshark plugins in programs that don't use libwireshark.
-    
-    Change-Id: I0a6ec01ecb4e718ed36233cfaf638a317f839a73
-    Reviewed-on: https://code.wireshark.org/review/17506
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ae87794
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Sep 5 13:45:35 2016 -0700
-
-    Report an error if the channel type isn't valid.
-    
-    Change-Id: Ie9d47da4b1758cbf475989a04847853a714e1447
-    Reviewed-on: https://code.wireshark.org/review/17503
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 70f3737
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Mon Sep 5 16:39:45 2016 +0200
-
-    ISAKMP: Fix handling of cert requests without CA
-    
-    Check IKEv1 Certificate Request Payloads for an empty
-    Certificate Authority field, which is allowed by RFC 2408.
-    Suppress dissection of this field if it is indeed empty.
-    
-    Change-Id: Ifb997e460a4c12003215fde86c374cfc769c5d72
-    Reviewed-on: https://code.wireshark.org/review/17501
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 474199a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Sep 5 17:53:42 2016 +0200
-
-    checkAPI: add deprecated atoi.
-    
-    Instead use ws_strtoi/u functions. atoi() doesn't make any kind
-    of check so it should be avoided. ws_strtoi/u should be used
-    instead of strtol & co., but they're still acceptable for some
-    cases that deviate from the basic usage.
-    
-    Change-Id: I145ff4d8f893852e024c4ea8fc6a836b15bd2b0d
-    Reviewed-on: https://code.wireshark.org/review/17502
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 5617527ee3831a8012f076b67e2532eeb8b1da2d)
+    Reviewed-on: https://code.wireshark.org/review/22073
 
-commit ba981ac
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Aug 30 17:52:54 2016 +0200
-
-    wsutil: add string to integer conversion utilities.
-    
-    In the current code many functions have been used for convertion
-    (strtol, atoi, g_ascii_strtoll, etc). Those utilities want to be
-    the only, shared, way to convert integers.
-    
-    Change-Id: I22ba1bf54e144e73a4728612a4437de5a2d339e2
-    Reviewed-on: https://code.wireshark.org/review/17414
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 87519e4
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Sep 4 22:21:42 2016 +0200
-
-    S1AP: fix dissection of TransportLayerAddress IE when it contains both IPv4 and IPv6
-    
-    Change-Id: I8c257d79b4e842da6853ea3c53ae479f33a8047a
-    Reviewed-on: https://code.wireshark.org/review/17491
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 98b5820
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Sep 4 18:58:35 2016 +0200
-
-    zvt: dissect Initialisation message
-    
-    It contains the same password field that appears in the Registration
-    message. Make this field generic and reuse it here.
-    
-    Change-Id: I7be9a99b5da1713937ffca5624be66150ff453d1
-    Reviewed-on: https://code.wireshark.org/review/17489
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 397a9d0
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Sep 4 18:42:03 2016 +0200
-
-    zvt: start dissecting Intermediate Status Information
-    
-    Change-Id: I351621f1def5ad6da577a9b0d1b2c5ab49018564
-    Reviewed-on: https://code.wireshark.org/review/17488
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 6c46279
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Sep 4 18:20:41 2016 +0200
-
-    zvt: dissect the currency code bitmap
-    
-    add the value for euro
-    
-    Change-Id: Id8624e356ad4fcddcf77483a721428782c6bb0b2
-    Reviewed-on: https://code.wireshark.org/review/17487
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 54b2f2d
+commit ead3354
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Sep 4 08:12:46 2016 -0700
+Date:   Sun Jun 11 08:19:37 2017 +0000
 
-    [Automatic update for 2016-09-04]
+    [Automatic update for 2017-06-11]
     
     Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I11d066907492642f5baaa38a79b8bcd086a579c4
-    Reviewed-on: https://code.wireshark.org/review/17484
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 668e6bc
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Sun Sep 4 00:32:33 2016 +0200
-
-    ANSI_A: Rationalize test expession (CID-1372216 ... 1372267)
-    
-    Implement the same changes in the ELEM_TLV() and ELEM_TV() macros as in
-    packet-gsm_a_common.h, to remove superfluous code and squelch about 50
-    Coverity issues.
-    
-    Change-Id: I262dc60fdfa3482876d8525b34f6b1dbbe371257
-    Reviewed-on: https://code.wireshark.org/review/17478
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7c7497a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Sep 4 13:40:20 2016 +0200
-
-    ssl,http: rename http-over-ssl to http-over-tls
-    
-    This name is displayed in the SSL prototcol tree (Application Data
-    Protocol: http-over-tls), rename to avoid possible user confusion.
-    
-    Modify the SSL dissector such that both "http" and "http-over-tls"
-    invoke the same dissector function.
-    
-    Change-Id: I2d52890a8ec8fa88b6390b133a11df607a5ec3dc
-    Reviewed-on: https://code.wireshark.org/review/17481
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 29a243d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Sep 4 11:52:24 2016 +0200
-
-    irda: restore a line removed by mistake in ge4c059f
-    
-    Bug: 12821
-    Change-Id: If6423c7f8443eccd6ddb4b699bbc327a965d0d74
-    Reviewed-on: https://code.wireshark.org/review/17477
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 4ec5cbe
-Author: Uri Simchoni <urisimchoni@gmail.com>
-Date:   Thu Sep 1 23:52:41 2016 +0300
-
-    SMB2: dissect the buffer of getinfo quota request
-    
-    Source: [MS-SMB2] 2.2.37.1
-    
-    Change-Id: I526066700a88398366f31cd51552f9fa8bb761b8
-    Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17447
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3b9771a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Sep 3 23:17:34 2016 +0200
-
-    M2AP: fix registration of extensions in proper dissector table
-    
-    Change-Id: If529448539f9e8d740fd20009221e9221db83b2b
-    Reviewed-on: https://code.wireshark.org/review/17475
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 4a3b320
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Sep 3 19:59:26 2016 +0200
-
-    S1AP: add more LTE-RRC transparent containers dissection
-    
-    Change-Id: I08246d3fa97ceafefd3a1ab5c36de50a5728fd19
-    Reviewed-on: https://code.wireshark.org/review/17474
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 8f5ab27
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Sep 3 16:43:44 2016 +0200
-
-    Add M2AP dissector (3GPP 36.443 v13.3.0)
-    
-    Change-Id: I1a5d4390e91c5a758e52feba6059407d873adf7a
-    Reviewed-on: https://code.wireshark.org/review/17472
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7471b46
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Sep 2 00:01:38 2016 +0200
-
-    cmake: fix libnl caching issue, make it more robust
-    
-    Dario reported that the cmake build fails after installing libnl3-devel
-    (libnl-devel was already present). This results from a name collision
-    for NL_LIBRARY and NL_INCLUDE_DIR variables.
-    
-    Initially these variables contained the values for libnl-1. When libnl3
-    is installed, these variables were not updated (because it was cached),
-    but HAVE_LIBNL3 would still be set, resulting in a header and feature
-    mismatch. Use separate variables for libnl1 and libnl3 to fix this.
-    
-    Other fixes: also set HAVE_LIBNL for libnl1; fallback to libnl1 if
-    libnl3 is unusable (e.g. because libnl-route-3.0 is missing).
-    
-    Change-Id: Icf0a03843ea870347ddf365f69bacf4883d07f6d
-    Reviewed-on: https://code.wireshark.org/review/17449
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a547dfb
-Author: Uri Simchoni <urisimchoni@gmail.com>
-Date:   Thu Sep 1 23:52:39 2016 +0300
-
-    SMB2: dissect getinfo request fixed parameters
-    
-    Dissect SMB2 getinfo request fix-sized parameters according
-    to [MS-SMB2] section 2.2.37.
-    
-    This does not include extended attributes at the moment.
-    
-    Change-Id: I5281edf0c21517cdf43ef00e89b5680b8174c383
-    Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17444
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dae5f88
-Author: Uri Simchoni <urisimchoni@gmail.com>
-Date:   Thu Sep 1 23:52:40 2016 +0300
-
-    SMB: dissect FILE_GET_QUOTA_INFORMATION
-    
-    Add a function that dissects FILE_GET_QUOTA_INFORMATION
-    structure ([MS-FSCC] 2.4.33.1)
-    
-    This structure is used to define a set of SIDs whose quota
-    is to be fetched.
-    
-    Change-Id: I81f6bca98fb239935ca593bd8725cebbb2037fbe
-    Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17445
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5846524
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Sep 1 13:51:13 2016 -0700
-
-    Qt: Conversation time column updates.
-    
-    Add a checkbox which lets you toggle between absolute and relative start
-    times. Use the local time for now. Fixes bug 11618.
-    
-    Adjust our time precision based on the capture file's time precision.
-    Fixes bug 12803.
-    
-    Update the User's Guide accordingly.
-    
-    Bug: 11618
-    Bug: 12803
-    Change-Id: I0049d6db6e4d0b6967bf35e6d056a61bfb4de10f
-    Reviewed-on: https://code.wireshark.org/review/17448
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I7fc53087dbb81293f8bd5f62e505f879896f668f
+    Reviewed-on: https://code.wireshark.org/review/22068
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit df3bf9c
+commit 3d5c9b3
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Sep 2 13:30:28 2016 -0700
+Date:   Fri Jun 9 19:59:39 2017 -0700
 
-    Note that not all UN*X file systems are case-sensitive.
-    
-    Expand a comment to suggest what we should probably do on macOS.
-    
-    Change-Id: Ic18afe5d1b165dbb27b5f0f5ff3ff9a33835a0f4
-    Reviewed-on: https://code.wireshark.org/review/17470
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 770aaf1
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Sep 2 14:10:31 2016 +0200
-
-    Qt: Preserve capture filter when preferences changed
-    
-    Avoid that the last entry from recent.capture_filter is added to the
-    capture filter combo when editing preferences or changing profile.
-    
-    This bug was introduced in gb7897dde.
-    
-    Change-Id: I38a32386765c9e7ffaa93d006ff0ef7b78ac8252
-    Reviewed-on: https://code.wireshark.org/review/17453
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 893e0e9
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Aug 30 12:12:33 2016 -0700
-
-    Qt: Add a timeline indicator to conversations.
-    
-    Add a timeline indicator to the Start and Duration columns in the
-    Conversations dialog. Add tooltips to the columns that explain what's
-    going on.
-    
-    Round the timeline rect corners and do the same for Prototocol Hierarchy
-    Statistics. This should hopefully differentiate the graph bars from a
-    text selection and IMHO it looks better.
-    
-    Update the PHS and Conversations images in the User's Guide.
-    
-    Change-Id: I61d6c25843be522cc444e01ba77cb5b1e991fa36
-    Reviewed-on: https://code.wireshark.org/review/17396
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2ddb46d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Aug 25 10:18:11 2016 +0200
-
-    btavctp: rework the reassemble routine (CID 1355682).
-    
-    The CID is about the lack of check of wmem_tree_lookup32_le()
-    return value, but the old code worths a bit of rework.
-    
-    Change-Id: I3adb868d2baa1c8aea3f914f7fb9fdf75f222960
-    Reviewed-on: https://code.wireshark.org/review/17322
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f01190c
-Author: Peter Palúch <Peter.Paluch@fri.uniza.sk>
-Date:   Tue Aug 30 11:37:38 2016 +0200
-
-    Reworked dissection of BGP Extended Community attributes
-    
-    This patch contains a partial rewrite of the BGP dissector for Extended
-    Communities.  The changes were primarily motivated by my dissatisfaction
-    with the generally unreadable way in which the types, names and values of
-    BGP Extended Communities were displayed in Wireshark GUI.  The rewrite
-    provides a hopefully more readable and eye-pleasing way of displaying the
-    extended communities.  I have also corrected numerous other flaws with the
-    Extended Community dissector I stumbled across.
-    
-    In particular, the changes encompass the following:
-    
-    1.) The Type octet of an Extended Community is now analyzed including its
-    Authority and Transitivity bits.  These were not dissected before.
-    
-    2.) Dissection for EVPN Extended Community was improved.  The original
-    implementation blindly assumed that there is just a single subtype and
-    decoded the community ignoring the actual subtype.
-    
-    3.) I have removed the hf_bgp_ext_com_value_unknown16 and ..._unknown32.
-    The current code uses a different approach to display values of unrecognized
-    communities, and for recognized communities, there are no "unknown"
-    subfields.
-    
-    4.) Removed a couple of variables declared at the
-    dissect_bgp_update_ext_com() level.  These stored the result of a
-    tvb_get_...() call but the value was used only once.  I have replaced them
-    with the direct use of tvb_get_...()
-    
-    5.) Moved duplicate code to add the Type value into the community_tree from
-    each branch in the switch(com_type_high_byte) out of it and placed it before
-    the switch().
-    
-    6.) Reworked the style in which individual communities are displayed.  Each
-    community item (collapsed) is now displayed using the following label
-    format:
-    
-    Community name: Values [Generic community type]
-    
-    Examples:
-    
-    Route Target: 1:1 [Transitive 2-Octet AS-Specific]
-    Unknown subtype 0x01: 0x8081 0x0000 0x2800 [Non-Transitive Opaque]
-    Unknown type 0x88 subtype 0x00: 0x0000 0x0000 0x0000 [Unknown community]
-    
-    6.) To keep the filter names more consistent, changed names of selected filters:
-    
-    bgp.ext_com.type_high -> bgp.ext_com.type
-    bgp.ext_com.type_low -> bgp.ext_com.stype_unknown
-    
-    In particular, I do not want to call the subtype as bgp.ext_com.type_low
-    because that filter applied only to unrecognized subtypes even though its
-    name would suggest to users that they can filter any community based on it.
-    
-    7.) Numerous corrections in text labels, names and labels that have been
-    incorrect or incomplete.
-    
-    Bug: 12794
-    Change-Id: I9653dbbc8a8f85d0cd2753dd12fd537f0a604cf3
-    Reviewed-on: https://code.wireshark.org/review/17377
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d68f622
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Sep 2 16:34:02 2016 +0200
-
-    aruba_erm: register dissector by name.
-    
-    Change-Id: Ifad70ed2ee2a554cdc31496ad47148728071abdb
-    Reviewed-on: https://code.wireshark.org/review/17458
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit fb7a60e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Sep 2 15:45:53 2016 +0200
-
-    Qt: Clear open files list when clear recent menu
-    
-    Remove all recent files from the main welcome page when clearing
-    recent files from the menu.
-    
-    Change-Id: Ic410a729e63d82ee58b6bbb31f7e4a658b17d794
-    Reviewed-on: https://code.wireshark.org/review/17456
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 2cac047
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Sep 2 15:21:46 2016 +0200
-
-    Qt: Add newly saved files to the recent files
-    
-    Update the recent files list when saving unsaved capture files.
-    
-    Change-Id: I469fa1f2ce3216c66de328c0b3558c9f9db115e0
-    Reviewed-on: https://code.wireshark.org/review/17454
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 12eee84
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Sep 2 15:25:41 2016 +0200
-
-    [SIP] Call sub dissectors for Diagnostics in SIP reason texts.
-    
-    Change-Id: I68cbcf257b63a86ee37e1357876a90ea683a1d5a
-    Reviewed-on: https://code.wireshark.org/review/17455
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2c5a485
-Author: Binh Trinh <beango@gmail.com>
-Date:   Wed Aug 31 21:16:49 2016 -0400
-
-    GTP: continuation of patch for Target Identification, correction of PLMN in the case of non-compliance
-    
-    Change-Id: Id848574ea748786ccd6808d370cb480caa948cfb
-    Reviewed-on: https://code.wireshark.org/review/17433
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e2b0aa2
-Author: Anthony Coddington <anthony.coddington@endace.com>
-Date:   Tue Aug 30 11:04:23 2016 +1200
-
-    ERF: Fix dissector abort on short meta tags and typos
-    
-    Fix dissector abort on short tags.
-    Fix value typo in hash mode enum.
-    Differentiate unexpectedly short value, zero length (deliberate invalid)
-    and off-end-of-record tags through expertinfo.
-    Continue to use proto_tree_add_*() length mismatch warnings for unxepectedly
-    long tags for now.
-    Change WWN tags to FT_BYTES for now as they are 16 not 8 byte WWN. Not
-    currently implemented outside Wireshark anyway.
-    
-    Ping-Bug: 12303
-    Change-Id: I79fe4332f0c1f2aed726c69acdbc958eb9e08816
-    Reviewed-on: https://code.wireshark.org/review/17382
-    Reviewed-by: Anthony Coddington <anthony.coddington@endace.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e0e2396
-Author: Uri Simchoni <urisimchoni@gmail.com>
-Date:   Thu Sep 1 23:52:38 2016 +0300
-
-    SMB2: dissect class and infolevel in get quota info request
-    
-    (actually, in [MS-SMB2] those are called "InfoType" and
-    "FileInfoClass", respectively)
-    
-    Change-Id: Id583be4574cea5ce092c374a5624a4bd17d5d4c6
-    Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17443
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 79b5020
-Author: Uri Simchoni <urisimchoni@gmail.com>
-Date:   Thu Sep 1 23:52:37 2016 +0300
-
-    SMB2: dissect quota info
-    
-    This info appears in the request buffer of setinfo quota,
-    or in the response buffer of getinfo quota.
-    
-    Change-Id: I5c8d96a05eddfa123547a7dd2577a01ac8cbd32d
-    Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17442
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit aa2471d
-Author: Uri Simchoni <urisimchoni@gmail.com>
-Date:   Thu Sep 1 23:52:36 2016 +0300
-
-    SMB: make dissect_nt_user_quota public
-    
-    To be usable by SMB2 dissector
-    
-    Change-Id: I7f5b9a021951c2529f8058cd2fc160eff2e865c6
-    Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17441
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 416bd9a
-Author: Uri Simchoni <urisimchoni@gmail.com>
-Date:   Thu Sep 1 23:52:33 2016 +0300
-
-    smb: parse user quota change time
-    
-    In SMB user quota records, parse unknown 8-byte field
-    as quota record's last change time
-    
-    (source - [MS-FSCC] 2.4.33)
-    
-    Change-Id: I1f2839934fc0ab8e3d38105e02ef91a547256a70
-    Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17440
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1ba3426
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Mon Aug 29 21:07:28 2016 +0200
-
-    GSM MAP: Add OSM URI for locationEstimate
-    
-    As requested by bug 10969 add a link to OSM for locationEstimate.
-    
-    Bug: 10969
-    Change-Id: I715b3b5eae9728999d5c8f8c155bbcef3911ee93
-    Reviewed-on: https://code.wireshark.org/review/17375
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit abd78dc
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Sep 1 15:09:12 2016 -0700
-
-    CMake: Move version declarations to the top of CMakeLists.txt.
-    
-    This lets me be more lazy during releases.
-    
-    Change-Id: Ie59e200f1f46282e9271f459c0bbf31dc74a59a7
-    Reviewed-on: https://code.wireshark.org/review/17450
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8018153
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Sep 1 02:04:31 2016 +0200
-
-    uat: fix memleak after parsing and on errors
-    
-    Memleaks could occur in these scenarios:
-     - Two consecutive fields fail in their chk callback, overwriting the
-       first heap-allocated error message.
-     - After parsing one record, the internal record was never freed.
-     - Syntax errors abort the parsing process and leaks the record and
-       current field value.
-    
-    These leaks will only happen at startup, when the UAT files are read or
-    when UAT strings are loaded (e.g. from the ssl.keys_list preference).
-    
-    Change-Id: I4cf7cbc8131f71493ba70916a8f60168e5d65148
-    Reviewed-on: https://code.wireshark.org/review/17432
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 27164dd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Sep 1 21:34:20 2016 +0200
-
-    E.212: update Chinese PLMN list
-    
-    Bug: 12798
-    Change-Id: Id9569cb0f79094d5152ea5949d398eb7384ee76f
-    Reviewed-on: https://code.wireshark.org/review/17439
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e7cac43
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Sep 1 00:30:23 2016 +0200
-
-    uat: clarify documentation
-    
-    No functional change, fixes typos, adds some meaningful function
-    parameters and tries to clarify the memory management concerns.
-    
-    Also fix a -Wdocumentation issue in epan/proto.h
-    
-    Change-Id: I59d1fcd2ce96178e0a64a0709409a9a7a447c7c6
-    Reviewed-on: https://code.wireshark.org/review/17431
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 1bffa8e
-Author: Binh Trinh <beango@gmail.com>
-Date:   Wed Aug 31 22:33:18 2016 -0400
-
-    GTP: Added dissection of UTRAN Container for Forward Rel Req/Resp Messages
-    
-    Change-Id: I8330e7e57d3ad09e526da0d7a0970f96fedd03a6
-    Reviewed-on: https://code.wireshark.org/review/17434
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 77ae30f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Aug 29 18:38:45 2016 +0200
-
-    gtk: fix compilation with GTK+ before 2.18
-    
-    Removed in v1.99.2rc0-399-g43f09e6, but some includes are still needed.
-    
-    Basically I looked for the functions defined in the
-    ui/gtk/old-gtk-compat.h header file that were in files below ui/gtk/.
-    Then I matched it against the removed part in the above commit and added
-    the header back at its old place. In two other cases, the header was
-    only needed for Windows.
-    
-    If the above commit did not reference the file, I checked which function
-    was in use and added the header on top, removing redundant conditionals.
-    
-    Reported and tested by a user of GTK+ 2.12.12 on top of v2.0.5.
-    
-    Change-Id: I649eec1e5531070f88c99d893c4920306f56d849
-    Reviewed-on: https://code.wireshark.org/review/17371
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 717ca58
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Aug 31 11:31:54 2016 +0200
-
-    ipv6: fix build with old 32-bit glib headers (master only)
-    
-    Introduced with v2.3.0rc0-112-gdcb7b71, nxt is only a guint8* which
-    fails on 32-bit glib before 2.31.2.
-    
-    Change-Id: Ide1816a971fa213f5669a7fa71bc111d5b1cc921
-    Reviewed-on: https://code.wireshark.org/review/17418
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 71f8674
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Aug 31 11:32:54 2016 +0200
-
-    ipsec: fix build with old 32-bit glib headers
-    
-    In commit v2.3.0rc0-121-gb6d13ef, GUINT_TO_POINTER(ah_nxt) was added,
-    but on 32-bit glib before 2.31.2 this results in a type error. Change
-    the type of ah_nxt since all its users take a guint anyway.
-    
-    Change-Id: I2fb030f79011b8a7159a0b0df26d3545b0ce3c06
-    Reviewed-on: https://code.wireshark.org/review/17419
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit e3c3d7a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Aug 31 11:11:56 2016 +0200
-
-    gtk: fix 32-bit build
-    
-    32-bit glib before 2.31.2 expand GUINT_TO_POINTER(x) as (gpointer)x.
-    add explicit cast since curr_layer_num is 8 bits. Fixes
-    v1.99.10rc0-179-g1d7bcb2.
-    
-    Storing a 64-bit integer into a 32-bit pointer makes the compiler
-    complain. Add explicit cast. Fixes v1.99.1rc0-76-ged0b19b.
-    
-    Change-Id: I75fdf17882a0f5ddce7d3b3e74b1bf80ff6cd4ae
-    Reviewed-on: https://code.wireshark.org/review/17417
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 717215d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Aug 31 22:16:10 2016 +0200
-
-    E.212: update list to Operational Bulletin No. 1106 (15.VIII.2016)
-    
-    Also manually add PLMN 460 02 (Chian Mobile) as it is not listed by ITU yet
-    
-    Bug: 12622
-    Bug: 12798
-    Change-Id: I7c6fab9dcb9da90178186e94f624301ef1861421
-    Reviewed-on: https://code.wireshark.org/review/17428
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit cb2f8fc
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Wed Aug 31 21:06:34 2016 +0200
-
-    OSSP: Retrieve OUI at proper offset in packet
-    
-    Bug: 12801
-    Change-Id: Ic70f0d93bbffc99ceacf6b2963b04d7477e4914b
-    Reviewed-on: https://code.wireshark.org/review/17425
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ce2fa7b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Aug 31 17:24:54 2016 +0200
-
-    NFS: fix indent (remove some trailing spaces)
-    
-    Change-Id: Ic72d264686c3b37ac15118eec07057c7bb8a2a50
-    Reviewed-on: https://code.wireshark.org/review/17422
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5c2d82a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Aug 31 17:55:15 2016 +0200
-
-    diam_dict.l: remove use of strdup
-    
-    This should fix crashes on Windows, _strdup should not be mixed with
-    g_free. This was only uncovered in v2.3.0rc0-474-ga04b6fc, before that
-    ddict_free was never called.
-    
-    Change-Id: I34111385c82715de70fb42fe44b99b89e132a374
-    Reviewed-on: https://code.wireshark.org/review/17423
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a7dd070
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Aug 31 11:48:33 2016 +0200
-
-    Win: switch back to Lua library compiled with MinGW
-    
-    It does not suffer anymore from bug 9957
-    
-    Change-Id: I871f01db67101b09a21545ecec5473941997a5cb
-    Reviewed-on: https://code.wireshark.org/review/17416
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit bccbae5
-Author: Jonathan Brucker <jonathan.brucke@gmail.com>
-Date:   Wed Aug 31 09:05:09 2016 +0000
-
-    rftap: add new dissector
-    
-    The RFtap protocol is a simple metadata header designed to provide
-    Radio Frequency (RF) metadata about frames.
-    
-    For official specifications see: https://rftap.github.io/
-    
-    Signed-off-by: Jonathan Brucker <jonathan.brucke@gmail.com>
-    Change-Id: I0d008b2baadcc5cc9577113e9795eef2691b961a
-    Reviewed-on: https://code.wireshark.org/review/17355
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6362183
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Aug 31 08:16:24 2016 +0000
-
-    Revert "Revert "diameter: fix 400kb leaked memory on exit""
-    
-    This reverts commit 5fea2b5f4198f1a36f313ef38532ddffd02ac5b1.
-    
-    I.e., it puts back the change; the reverted version passed the tests on which the versions with this change crashed.
-    
-    Change-Id: Idcc0eb11588cf14e2fe666de1905ee63917b0fcf
-    Reviewed-on: https://code.wireshark.org/review/17413
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5fea2b5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Aug 31 07:42:31 2016 +0000
-
-    Revert "diameter: fix 400kb leaked memory on exit"
-    
-    This reverts commit a04b6fcb3db901734ed948134c973996786be8b7.
-    
-    Temporary revert to see if this prevents the "tshark -G" crashes being seen on the 64-bit Windows buildbot.
-    
-    Change-Id: I561439039ca2667b72d7e2319a6f3f5f97e18d15
-    Reviewed-on: https://code.wireshark.org/review/17412
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c8869f6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Aug 31 00:37:27 2016 -0700
-
-    OK, it probably crashed in proto_initialize_all_prefixes().
-    
-    Remove the debugging printouts.
-    
-    The changes that were committed between the last build that didn't crash
-    and the first build that did were:
-    
-    commit 961f743d69b323aa217a6b39184485d6a0bfb2d5
-    Author: Peter Wu <peter@lekensteyn.nl>
-    Date:   Mon Aug 29 01:34:22 2016 +0200
-    
-        xml: fix some memleaks
-    
-        No more memleaks reported for the attachment in bug 12790 :-)
-    
-        Change-Id: I8472e442143b332edfacdf9ef3b8b893f1ec4386
-        Ping-Bug: 12790
-        Reviewed-on: https://code.wireshark.org/review/17365
-        Reviewed-by: Michael Mann <mmann78@netscape.net>
-        Petri-Dish: Michael Mann <mmann78@netscape.net>
-        Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-        Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    
-    commit a04b6fcb3db901734ed948134c973996786be8b7
-    Author: Peter Wu <peter@lekensteyn.nl>
-    Date:   Sun Aug 28 22:19:29 2016 +0200
-    
-        diameter: fix 400kb leaked memory on exit
-    
-        Before:
-    
-            SUMMARY: AddressSanitizer: 399684 byte(s) leaked in 17208 allocation(s).
-    
-        After addressing to-do by calling ddict_free:
-    
-            SUMMARY: AddressSanitizer: 3024 byte(s) leaked in 256 allocation(s).
-    
-        After fixing all remaining leaks cases in the flex file for diameter:
-    
-            SUMMARY: AddressSanitizer: 735 byte(s) leaked in 58 allocation(s).
-    
-        Not bad huh :-)
-    
-        Ping-Bug: 12790
-        Change-Id: I0c730ad77ae15c69390bc6cf0a3a985395a64771
-        Reviewed-on: https://code.wireshark.org/review/17364
-        Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-        Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-        Reviewed-by: Michael Mann <mmann78@netscape.net>
-        Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-        Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    
-    commit 14312835c63a3e2ec9d311ed1ffee5285141f4f9
-    Author: Peter Wu <peter@lekensteyn.nl>
-    Date:   Sun Aug 28 19:20:59 2016 +0200
-    
-        pcapng: do not leak blocks
-    
-        pcapng_open and pcapng_read have 'wblock' allocated on the stack, so if
-        they return, they do not have to set wblock.block to NULL.
-    
-        pcapng_read_block always sets wblock->block to NULL and may initialize
-        it for SHB, IDB, NRB and ISB. Be sure to release the memory for IDB and
-        ISB. It is better to have more wtap_block_free calls on a NULL value
-        than missing them as this would be a memleak (on the other hand, do not
-        release memory that is stored elsewhere such as SHB and NRB).
-    
-        Ping-Bug: 12790
-        Change-Id: I081f841addb36f16e3671095a919d357f4bc16c5
-        Reviewed-on: https://code.wireshark.org/review/17362
-        Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-        Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-        Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    
-    *If* one of those is the cause, my guess is that it's the Diameter one,
-    as the crash happens before any file is read (so it's probably not the
-    pcapng one) and thus before any dissection is done (so it's probably not
-    the XML dissector one).
-    
-    Change-Id: I816c1bbd6078eab251efd02ebb7c3195f6dd1483
-    Reviewed-on: https://code.wireshark.org/review/17411
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1178ee6
-Author: Binh Trinh <beango@gmail.com>
-Date:   Wed Aug 31 00:18:17 2016 -0400
-
-    GTP: patch for Target identification for non-compliance workaround
-    
-    bug 3974
-    
-    Change-Id: I2faa473c725a803056d6ffd0cb34b46d75121061
-    Reviewed-on: https://code.wireshark.org/review/17410
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5be39d9
-Author: Chaitanya T K <chaitanya.mgit@gmail.com>
-Date:   Tue Aug 30 20:59:34 2016 +0530
-
-    ieee80211: Fix the BAR Ack policy values
-    
-    As per 802.11-2012 table 8-15 the string should be reverse.
-    0 - Send Immediate Ack (False)
-    1 - Dont't Send Immediate Ack (True)
-    
-    Change-Id: Iea3b179e11781f891d2294b0bcdf92de2bdba7ba
-    Reviewed-on: https://code.wireshark.org/review/17394
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a68fb13
-Author: Tom Haynes <loghyr@primarydata.com>
-Date:   Tue Aug 30 12:15:13 2016 -0700
-
-    nfs4: Handle CB_GETATTR
-    
-    Change-Id: Ifb68af443c6f13dfab99e32488d86c148621a316
-    Signed-off-by: Tom Haynes <loghyr@primarydata.com>
-    Reviewed-on: https://code.wireshark.org/review/17399
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1512ee7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 30 20:03:42 2016 -0700
-
-    Crashing in proto_initialize_all_prefixes()?  Debugging output.
-    
-    Change-Id: I6db711b1730b95460983ee190762753198c1959e
-    Reviewed-on: https://code.wireshark.org/review/17409
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 18a873d
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Fri Aug 26 14:36:57 2016 -0700
-
-    MAUSB: Add Cancellation Status values defined in v1.0a Spec
-    
-    Change-Id: I72812fa0650da0cde37ea6cbef81a3c7a9ba333d
-    Reviewed-on: https://code.wireshark.org/review/17373
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 33bb9be
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 30 19:23:09 2016 -0700
-
-    Debugging printouts, to see why tshark -G crashes on the Win64 buildbot.
-    
-    Change-Id: I16f6b7a69eed5ec66842df9d0640216fd273d3b0
-    Reviewed-on: https://code.wireshark.org/review/17408
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 290e232
-Author: Juanjo Martin <juanjo@rti.com>
-Date:   Fri Aug 26 16:27:16 2016 +0200
-
-    RTPS: Fixed data holder dissection to match the standard
-    
-    The OMG standard has changed in this new version. I have fixed
-    the implementation.
-    
-    Change-Id: Ie9054ed52c66580c76096af86e0fb8e34a44e9d1
-    Reviewed-on: https://code.wireshark.org/review/17348
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 436ed87
-Author: Tom Haynes <loghyr@primarydata.com>
-Date:   Tue Aug 30 10:47:13 2016 -0700
-
-    nfs: Fix style in switch
-    
-    Change-Id: Ica9fc960946542badb64af12769e7dfa3793db82
-    Signed-off-by: Tom Haynes <loghyr@primarydata.com>
-    Reviewed-on: https://code.wireshark.org/review/17397
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d781979
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 30 17:59:59 2016 -0700
-
-    Use "ecatf" as the protocol name, to parallel everything else.
-    
-    The fields have names beginning with "ecatf.", the dissector is called
-    "ecatf", and it's only the frame layer of EtherCAT anyway, so just call
-    it "ecatf".
+    Fix indentation.
     
-    Change-Id: I2f127363fd115c307f0525f612fe184a30d46c55
-    Reviewed-on: https://code.wireshark.org/review/17406
+    Change-Id: I9ea3947a4100d4d566c0d6815de5336214f9f581
+    Reviewed-on: https://code.wireshark.org/review/22062
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit b01c85c17a0a1e78837aeab79b15054ab15c8483)
+    Reviewed-on: https://code.wireshark.org/review/22063
 
-commit a4c8ebc
+commit baacfcf
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 30 15:51:54 2016 -0700
+Date:   Fri Jun 9 18:43:00 2017 -0700
 
-    Don't do any Decode As stuff for dissector tables not used with Decode As.
+    Put the non-filter part of epan/color_filters.h into wsutil/color.h.
     
-    Have all dissector tables have a "supports Decode As" flag, which
-    defaults to FALSE, and which is set to TRUE if a register_decode_as()
-    refers to it.
+    Places that only need color_t, such as certain preferences, don't need
+    the color filter stuff.
     
-    When adding a dissector to a dissector table with a given key, only add
-    it for Decode As if the dissector table supports it.
-    
-    For non-FT_STRING dissector tables, always check for multiple entries
-    for the same protocol with different dissectors, and report an error if
-    we found them.
-    
-    This means there's no need for the creator of a dissector table to
-    specify whether duplicates of that sort should be allowed - we always do
-    the check when registering something for "Decode As" (in a non-FT_STRING
-    dissector table), and just don't bother registering anything for "Decode
-    As" if the dissector table doesn't support "Decode As", so there's no
-    check done for those dissector tables.
-    
-    Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed
-    Reviewed-on: https://code.wireshark.org/review/17402
+    Change-Id: I88fc2858454d04e659b323a8bc28b21d362ca3fb
+    Reviewed-on: https://code.wireshark.org/review/22060
     Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1dbd221
-Author: Juanjo Martin <juanjo@rti.com>
-Date:   Tue Aug 30 01:57:32 2016 +0200
-
-    RTPS: Allowing duplicates in the rtps.type_name table
-    
-    Change-Id: Ie7a35b0bb3275a0895fad646bf9a81406eadf37c
-    Reviewed-on: https://code.wireshark.org/review/17393
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8b705b3
-Author: Tom Haynes <loghyr@primarydata.com>
-Date:   Tue Aug 30 11:00:21 2016 -0700
-
-    nfs: Standardize on FileHandle vs filehandle
-    
-    Change-Id: Ib945ddee4a35bf984a9411e56ed3801cde70c6c4
-    Signed-off-by: Tom Haynes <loghyr@primarydata.com>
-    Reviewed-on: https://code.wireshark.org/review/17398
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit afa2605
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 30 13:38:03 2016 -0700
-
-    Support Decode As for {SSL,TLS}-over-TCP.
-    
-    We register dissectors for "Decode As" for {SSL,TLS}-over-TCP, so we
-    should actually set up the "Decode As" stuff for it.
-    
-    Change-Id: I2a738667efdec1007069df74885a4fe8fc3fcbab
-    Reviewed-on: https://code.wireshark.org/review/17400
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 68b7398
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Aug 30 14:55:54 2016 +0200
-
-    [Diameter] Improve dissection of malformed packets by continnuing
-    dissection and display the problem more prominetly.
-    
-    Change-Id: Ia1a32667a18e1e5b60b5c167da9b6dd945ba3dfc
-    Reviewed-on: https://code.wireshark.org/review/17385
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a892c90
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Aug 30 11:12:44 2016 +0200
-
-    time_util: fix -Wshadow issue
-    
-    time_util.c was already fixed, but the header was missing the change,
-    breaking the build on a very old compiler.
-    
-    Change-Id: I95685c9a3e25dcb7567f2551b92f20c8792a6e47
-    Reviewed-on: https://code.wireshark.org/review/17384
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 7c75370
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Aug 30 00:10:50 2016 +0200
-
-    ssl: fix wrong detection of non-resumed renegotiated session
-    
-    If the heuristics fail to detect a resumed session, then it must mark
-    the session as a normal session. This will also prevent from
-    applying secrets that do not apply to this renegotiated session.
-    
-    Bug: 12793
-    Change-Id: I90f794a7bbaf7f1839e39656ac318183ecf48887
-    Reviewed-on: https://code.wireshark.org/review/17376
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cbd3648
-Author: Binh Trinh <beango@gmail.com>
-Date:   Mon Aug 29 23:22:58 2016 -0400
-
-    GTP: add new RAT Type values
-    
-    Change-Id: Ia3d8956197faff9366de2635a9bd29f2bfc40f0d
-    Reviewed-on: https://code.wireshark.org/review/17381
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8e9b6f4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Aug 29 19:49:58 2016 -0700
-
-    Don't use a no-longer-extant variable.
-    
-    Change-Id: I41c1a37248335d983da58b0b657a28ec521be290
-    Reviewed-on: https://code.wireshark.org/review/17378
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 961f743
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Aug 29 01:34:22 2016 +0200
-
-    xml: fix some memleaks
-    
-    No more memleaks reported for the attachment in bug 12790 :-)
-    
-    Change-Id: I8472e442143b332edfacdf9ef3b8b893f1ec4386
-    Ping-Bug: 12790
-    Reviewed-on: https://code.wireshark.org/review/17365
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a04b6fc
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Aug 28 22:19:29 2016 +0200
-
-    diameter: fix 400kb leaked memory on exit
-    
-    Before:
-    
-        SUMMARY: AddressSanitizer: 399684 byte(s) leaked in 17208 allocation(s).
-    
-    After addressing to-do by calling ddict_free:
-    
-        SUMMARY: AddressSanitizer: 3024 byte(s) leaked in 256 allocation(s).
-    
-    After fixing all remaining leaks cases in the flex file for diameter:
-    
-        SUMMARY: AddressSanitizer: 735 byte(s) leaked in 58 allocation(s).
-    
-    Not bad huh :-)
-    
-    Ping-Bug: 12790
-    Change-Id: I0c730ad77ae15c69390bc6cf0a3a985395a64771
-    Reviewed-on: https://code.wireshark.org/review/17364
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 1431283
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Aug 28 19:20:59 2016 +0200
-
-    pcapng: do not leak blocks
-    
-    pcapng_open and pcapng_read have 'wblock' allocated on the stack, so if
-    they return, they do not have to set wblock.block to NULL.
-    
-    pcapng_read_block always sets wblock->block to NULL and may initialize
-    it for SHB, IDB, NRB and ISB. Be sure to release the memory for IDB and
-    ISB. It is better to have more wtap_block_free calls on a NULL value
-    than missing them as this would be a memleak (on the other hand, do not
-    release memory that is stored elsewhere such as SHB and NRB).
-    
-    Ping-Bug: 12790
-    Change-Id: I081f841addb36f16e3671095a919d357f4bc16c5
-    Reviewed-on: https://code.wireshark.org/review/17362
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 22ba931
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Fri Aug 26 14:40:58 2016 -0700
-
-    MAUSB: Add Status value defined in v1.0a Spec
-    
-    Change-Id: Ie8e77fffd54eb9b1918d90999a4419a80de8bc5e
-    Reviewed-on: https://code.wireshark.org/review/17374
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 24fd16d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Aug 29 11:31:11 2016 +0200
-
-    tap-iostat.c: ensure that interval is set to its maximum value when using 0
-    
-    Otherwise the statistics will be wrong if the capture duration is greater
-    than G_MAXINT32 and it the user specifies an interval of 0
-    
-    Bug: 12778
-    Change-Id: I83a0f627ec0bb7c535446c17afa486835091ab8b
-    Reviewed-on: https://code.wireshark.org/review/17367
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 09a6383
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Aug 29 10:40:29 2016 +0200
-
-    telnet: remove meaningless line (CID 1372125).
-    
-    Change-Id: I3b9bc01a4f72e2e0de3f83426a9b8e7060d0c89a
-    Reviewed-on: https://code.wireshark.org/review/17366
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9b272d8
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Aug 28 19:27:52 2016 +0200
-
-    tproxy: fix memleak in is_banner_exchange_for
-    
-    strdup and strcmp is a recipe for leaking.
-    
-    Change-Id: I522c71964e39f671a4101df9b2b432433fc1c12e
-    Reviewed-on: https://code.wireshark.org/review/17363
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0bae842
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Aug 28 19:15:01 2016 +0200
-
-    tvbparse: fix memleak
-    
-    Use same wmem_epan_scope() as "w" (tvbparse_wanted_t).
-    
-    Change-Id: I73fdb1fb3b55a91b7bb0fc36e435024c6f0b3d73
-    Ping-Bug: 12790
-    Reviewed-on: https://code.wireshark.org/review/17361
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 16b7128
-Author: Michał Skalski <mskalski13@gmail.com>
-Date:   Mon Aug 22 22:21:57 2016 +0200
-
-    UAT gtk-ui, Qt-ui: Fixed copying records when no cp callback is defined
-    
-    According to documentation of uat_copy_cb_t, if uat->copy_cb is NULL,
-    memcpy() should be used.
-    
-    This affected IKEv1 and IKEv2 UAT tables (possibly others).
-    
-    
-    Change-Id: I27ebdc08385d260945699f101e714d3abb288b22
-    Reviewed-on: https://code.wireshark.org/review/17245
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7da7691
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Aug 28 08:12:43 2016 -0700
-
-    [Automatic update for 2016-08-28]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Ic4d32253800cb94d52c817f1cd40179d878323cb
-    Reviewed-on: https://code.wireshark.org/review/17358
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 294fcd1
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Sun Aug 28 14:49:52 2016 +0200
-
-    ISAKMP: fix # of SPIs field name in Delete payload
-    
-    Fix the "Number of SPIs" field name in the Delete payload.
-    References: RFC 2408, RFC 7296
-    
-    Change-Id: I205fb830275fc011e6605fdae53c6b9141e1628b
-    Reviewed-on: https://code.wireshark.org/review/17353
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 9a935d3
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Aug 26 11:31:03 2016 +0200
-
-    xmpp: Improve stanza reassembly.
-    
-    A XMPP stanza may be fragmented inside a conversation, so don't
-    check for this only when starting a new conversation.
-    
-    Change-Id: I63b987184f52645e6c72c3c4155b39b7948de828
-    Reviewed-on: https://code.wireshark.org/review/17344
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5fe3e6a
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Aug 27 11:53:29 2016 +0200
-
-    Qt: Support "Resolve Names" with multiple custom column fields
-    
-    Make "Resolve Names" enabled if at least one of the custom column
-    fields can be resolved.
-    
-    Change-Id: I702471be5d90c91f71209923e6abcc6921dca850
-    Reviewed-on: https://code.wireshark.org/review/17350
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 124fb83
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 24 12:42:15 2016 +0200
-
-    extcap: improve interface print in help.
-    
-    Change-Id: Ife8e73b6cb1756623e937452fc042d8b31e2554f
-    Reviewed-on: https://code.wireshark.org/review/17321
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 139170c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 24 16:48:39 2016 +0200
-
-    wsutil: add enumeration of local ip addresses in Windows.
-    
-    Routine used by ssh-based extcaps.
-    
-    Change-Id: I06d8e1e1444cd03a0508dc0c7cb91d340a451c58
-    Reviewed-on: https://code.wireshark.org/review/17308
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit d0565ad
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Fri Aug 26 08:53:33 2016 +0200
-
-    Properly end address type search by name (CID-1362742)
-    
-    Search address type by name iterates over an array, but fails to find its end.
-    Therefore it may dereference invalid pointers, or NULL.
-    
-    Add the proper check in the for loop and make sure an end condition is always
-    there in the array searched.
-    
-    Change-Id: I60ade9d438dc394340b6483b4fcb23e5ce432000
-    Reviewed-on: https://code.wireshark.org/review/17337
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 18e1ee7
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Fri Aug 26 08:28:49 2016 +0200
-
-    SDP: Restore usability of conversation debug feature.
-    
-    Some type changes were not carried forwared into the conversation
-    debugging code. These changes allow compilation again.
-    
-    Change-Id: I90dde7cc94496828cf8931d74225773c2cea42a1
-    Reviewed-on: https://code.wireshark.org/review/17336
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e19c176
-Author: Juanjo Martin <juanjo@rti.com>
-Date:   Fri Aug 26 15:41:36 2016 +0200
-
-    RTPS: Added missing parameters
-    
-    Added the dissection of three parameters.
-    
-    Change-Id: I07e7b655ad7fd3462625c2fb565e41593c62f897
-    Reviewed-on: https://code.wireshark.org/review/17346
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fa320f8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Aug 26 13:58:55 2016 +0200
-
-    QUIC: Update COL_INFO when packet is RST Stream and use rst stream code error
-    
-    Issue reported by Lucas Pardue
-    Change-Id: Ic3c53fce9751a556c5f1aa30d55687a60c9c6a4d
-    Reviewed-on: https://code.wireshark.org/review/17345
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 14bd879
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Aug 26 10:43:00 2016 +0200
-
-    QUIC: Update COL_INFO when packet is GOAWAY
-    
-    Issue reported by Lucas Perdue
-    Change-Id: I4852f6bad7a4c98b345ff198b33ab560eacb5ed0
-    Reviewed-on: https://code.wireshark.org/review/17341
-    Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit df28c82
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Aug 26 10:41:45 2016 +0200
-
-    QUIC: Fix some typo (copy/paste error) on GOAWAY/CONNECTION_CLOSE Frame
-    
-    Issue reported by Lucas Perdue
-    
-    Change-Id: I9c4ede6ba2fb0303aab05f1d59835e5a8b386a3e
-    Reviewed-on: https://code.wireshark.org/review/17340
-    Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 09be463
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Aug 25 18:03:35 2016 +0200
-
-    qt: fix crash on Search Packet while redissecting
-    
-    Before redissection, PacketList::freeze() is called which clears the
-    model. This results in a NULL-deref when pressing Ctrl-F (Packet
-    Search) or Ctrl-G (Go To Packet). Reproducer: in a large capture file,
-    enter some display filter (e.g. "udp") and immediately press Ctrl-F.
-    
-    Thanks to Github user SNAPESNATCH for the initial report via IRC that
-    included a helpful stack trace on Windows.
-    
-    Change-Id: If7334d6df4e9591fb1f2a52e3e2f837285b2959f
-    Reviewed-on: https://code.wireshark.org/review/17326
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 17f977e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Aug 25 16:58:25 2016 -0700
-
-    Handle ETH_P_CANFD as well as ETH_P_CAN.
-    
-    Both of them need to have the CAN ID/flags field of the header
-    byte-swapped as necessary to make sure it's in the *reading* host's byte
-    order, not the *writing* host's byte order, if the two are different.
-    
-    Change-Id: Iac1589fdd9fe4d9ee6fbac8d821b48694d68919b
-    Reviewed-on: https://code.wireshark.org/review/17333
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 27372ca
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Aug 25 14:39:42 2016 -0700
-
-    One more change for the removal of LINKTYPE_SOCKETCAN_HOSTENDIAN.
-    
-    Change-Id: If1615e23efa30119fff5eb2935335c2cde34b89e
-    Reviewed-on: https://code.wireshark.org/review/17330
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c8157aa
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Aug 25 14:14:11 2016 -0700
-
-    Go back to having only one SocketCAN LINKTYPE_ value.
-    
-    Libpcap just backed out the "host-endian" SocketCAN LINKTYPE_ value; we
-    don't need it any more.
-    
-    Change-Id: I33a7dc21207a0009e20b4abaefe1119eb649c39a
-    Reviewed-on: https://code.wireshark.org/review/17327
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ce9a4b2
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Aug 25 15:39:40 2016 +0200
-
-    xmpp/xml: Store item length in xml_frame.
-    
-    The created XML proto_item can be faked (if not visible and not referenced),
-    so ensure we store the correct item length to be used in XMPP.
-    
-    This will avoid an invalid "Malformed Packet" for some XMPP packets.
-    
-    Change-Id: I79d805b725dbeb93f26a38b72bdcc84187aee16f
-    Reviewed-on: https://code.wireshark.org/review/17324
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f597234
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 24 15:10:51 2016 +0200
-
-    extcap: add binary name and version to help message.
-    
-    Change-Id: I8f8083c817065cf66fd006a1caeb309d26209509
-    Reviewed-on: https://code.wireshark.org/review/17305
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit c661da4
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Aug 25 12:44:41 2016 +0200
-
-    xmpp: Add whitespace keepalive indication
-    
-    RFC 6120 section 4.6.1 defines the use of a single whitespace as
-    "whitespace keepalive", so indicate this in the Info column.
-    
-    Change-Id: I685431d91be2a37fbd66f8d1cdabe53f33092e93
-    Reviewed-on: https://code.wireshark.org/review/17323
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 8ce3017
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Aug 24 19:23:09 2016 -0700
-
-    Expand comments.
-    
-    Change-Id: I4e3de542d24c567434f4554917e826ccbd64cb6c
-    Reviewed-on: https://code.wireshark.org/review/17319
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b66fb7d
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Tue Aug 23 03:01:32 2016 +0200
-
-    debian: Fix libwscodecs' symbols file
-    
-    Change-Id: I842fd2339788c2cbe5ca88294aaf74bf9adc5ae2
-    Reviewed-on: https://code.wireshark.org/review/17285
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a1af188
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 24 16:54:02 2016 +0200
-
-    wsutil: fix indentation of interface.c
-    
-    Change-Id: Icf0c0c4ce1e3763eb385de24dc608a120e0f4af2
-    Reviewed-on: https://code.wireshark.org/review/17307
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4cf9a1d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 24 12:00:54 2016 +0200
-
-    dtls: remove unneeded checks (CID 1158712 & 1158716).
-    
-    Change-Id: Id463f7746880f71f317bb52b40dc8b298965b4ec
-    Reviewed-on: https://code.wireshark.org/review/17300
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 47a95f6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Aug 24 19:53:04 2016 +0200
-
-    HTTP2: Display PUSH_PROMISE Header in bytes
-    
-    and also use the name of spec for field (Header BLock Fragment
-    
-    Change-Id: I5a3884186258dac1f243f991a3392c875403eb97
-    Reviewed-on: https://code.wireshark.org/review/17310
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c7986c5
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Aug 6 19:57:23 2016 +0200
-
-    zbee-nwk-gp: don't THROW() an exception from a dissector
-    
-    show expert infos and return the number of bytes we dissected
-    
-    Change-Id: Ibb12372e8670380137f4fc3d012d0b0afa4cd638
-    Reviewed-on: https://code.wireshark.org/review/17313
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1c7a960
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 24 16:42:16 2016 +0200
-
-    extcap: remove unused #define from ssh-base.
-    
-    Change-Id: I52d26cb1e60452f8fa4d79f988fde2268486fc1c
-    Reviewed-on: https://code.wireshark.org/review/17306
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 7ccec07
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Aug 24 10:03:38 2016 -0700
-
-    IEEE 1722: Fixup ranges.
-    
-    Use RVALS + BASE_RANGE_STRING for range_strings. This should fix the "-G
-    values" failure on the Win32 buildbot.
-    
-    Change-Id: I9a42b66a22b615d3de9c04b485adc7b9aa2cc154
-    Reviewed-on: https://code.wireshark.org/review/17309
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c2b9800
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Aug 23 16:55:16 2016 -0700
-
-    Fuzz test: Make Valgrind error detection more verbose.
-    
-    When we set VG_ERR_CNT=1 print the reason.
-    
-    Change-Id: Icb8f2a1e7074044521873b116fc891cc4be4b204
-    Reviewed-on: https://code.wireshark.org/review/17287
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 88b9b75
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 24 11:10:10 2016 +0200
-
-    Qt: add initializer (CID 1328485).
-    
-    Change-Id: I1ce4ddc8bfb66522d4e472c258de2f928d5c776f
-    Reviewed-on: https://code.wireshark.org/review/17298
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit f269f56
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 24 10:43:11 2016 +0200
-
-    extcap: make extcaps use the version registered in config.
-    
-    Change-Id: I12d0d0bec06e02af0a9d0877c0f0f1d86261d752
-    Reviewed-on: https://code.wireshark.org/review/17296
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 2095b32
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Aug 23 22:10:08 2016 +0200
-
-    call_heur_dissector_direct: do not trigger an assert if heuristic dissector rejects packet
-    
-    This can happen for example is the heuristics changed between the Wireshark
-    version used to export PDUs, and the one used to open the file.
-    Instead, call data dissector.
-    
-    Change-Id: I29f7754f883fd710c3557a610583ef988ca13e43
-    Reviewed-on: https://code.wireshark.org/review/17280
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 20908f55f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Aug 23 19:41:46 2016 +0200
-
-    SCSI: Mode Sense 10: Wrong block descriptor length
-    
-    Issue reported by Sharon Samuel Enoch
-    
-    Bug:12780
-    Change-Id: I94ad5355cdfa4d8cd3915c9e261931ff56dc765b
-    Reviewed-on: https://code.wireshark.org/review/17272
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5213496
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Aug 24 08:10:27 2016 +0200
-
-    IPMI: do not use col_set_str with non const strings
-    
-    Bug: 12782
-    Change-Id: Ia082ccf5355d7f8dd6073861c59c804fecc96266
-    Reviewed-on: https://code.wireshark.org/review/17289
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 8915bb2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Aug 23 23:37:12 2016 +0200
-
-    ISAKMP: remove useless callback
-    
-    isakmp_cleanup_protocol() and isakmp_init_protocol() are already registered
-    as cleanup and init routines
-    
-    Change-Id: I4fd2348dc507c8bc933aebd5abfb2522b57da0b4
-    Reviewed-on: https://code.wireshark.org/review/17284
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0fcca6f
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Tue Aug 23 16:29:57 2016 +0200
-
-    ISAKMP: fix DOI field read size
-    
-    Read 4 bytes from the packet instead of 1 because that is the
-    correct size of the DOI field.
-    Reference: RFC 2408
-    
-    Change-Id: I5745363811bb46af307a925d688ec36cfb29984b
-    Reviewed-on: https://code.wireshark.org/review/17271
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 640382c
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Tue Aug 16 22:21:59 2016 +0100
-
-    CMake: Allow setting per target compiler warnings
-    
-    Setting our compiler warning flags in CMAKE_C_FLAGS does not allow
-    using different flags per target.
-    
-    Allow for that possibility by setting the internal WS_WARNINGS_{C,CXX}_FLAGS
-    and using the COMPILE_OPTIONS property to set them.
-    
-    This change is just setting mechanism and there should be no difference
-    in generated warnings.
-    
-    The check_X_compiler_flag cmake test is changed to test each flag individually.
-    We need a list, not a space separated string, and the aggregate test is not
-    significant.
-    
-    Change-Id: I59fc5cd7e130c7a5e001c598e3df3e13f83a6a25
-    Reviewed-on: https://code.wireshark.org/review/17150
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 505bcefd
-Author: Michał Skalski <mskalski13@gmail.com>
-Date:   Tue Aug 23 01:12:59 2016 +0200
-
-    isakmp Fix IKEv2 modification UAT crash
-    
-    Problem is that not all fields of UAT are updated on change (only those
-    defined in UAT definition with ikev2_uat_flds, specifically pointers to
-    encr_spec and auth_spec in ike2_decr_data_t were set to NULL.
-    
-    Fixed by re-setting pointers after update table callback was called.
-    
-    Also fixed memory leaks after UAT modification.
-    
-    Bug was partially resolved with change
-    Ibdab979b5959eb561635cbcb446e17138baca87b
-    https://code.wireshark.org/review/17078
-    
-    which eliminated crash, but decryption still didn't work after UAT
-    modification (DISSECTOR BUG was displayed).
-    
-    Bug: 12748
-    Change-Id: I8209edd8e214d62e34b641fdd2e046b9ff4c95eb
-    Reviewed-on: https://code.wireshark.org/review/17249
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e11d4a8
-Author: Chris Bontje <cbontje@gmail.com>
-Date:   Tue Aug 23 08:42:59 2016 -0600
-
-    [lg8979] - Fix dissection of 'Analog Group Change Report' Responses (FC2)
-    
-    They follow the same dissection as normal 'Analog Change Report' Responses (FC0)
-    
-    Change-Id: I854084f43fd0cc52ba02b6f1e760a63033ab48dd
-    Reviewed-on: https://code.wireshark.org/review/17270
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit f4ad204
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 23 11:50:51 2016 -0700
-
-    Remove now-redundant check.
-    
-    We now check much earlier for an invalid message length; remove the
-    check done afterwards.
-    
-    Also, note that dissect_netlink_error() should also check the message
-    length, to make sure it doesn't run past the end of the message, and
-    indicate why we are assuming an "integer" is 4 bytes (it's because the
-    RFC is vague here).
-    
-    Change-Id: Ie0b5074acc852cdeaa008fee1125130a6c8771a1
-    Reviewed-on: https://code.wireshark.org/review/17279
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3479406
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 23 11:41:24 2016 -0700
-
-    Get rid of trailing tabs.
-    
-    Change-Id: I0c26f02a63a12acc900637cd6a106d26e386a7a8
-    Reviewed-on: https://code.wireshark.org/review/17278
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 111358e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 23 11:39:56 2016 -0700
-
-    Catch too-short netlink message lengths.
-    
-    0 would cause an infinite loop. and any value < 16 is clearly wrong, so
-    if we see such a packet, just show the header's length field and stop
-    dissecting.
-    
-    Bug: 12776
-    Change-Id: Iefc56b26b83ff5424968d065bdb9fa84a7a65481
-    Reviewed-on: https://code.wireshark.org/review/17277
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 12cae9d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Aug 23 19:41:48 2016 +0200
-
-    MAC LTE: fix dissection of CE Mode A RAR message
-    
-    The Msg3 PUSCH narrowband index parameter depends on the UL bandwidth
-    
-    Change-Id: Ib57c85ffbd4c108e9c8f3d14fa53a48f0df1b0e6
-    Reviewed-on: https://code.wireshark.org/review/17274
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 40ac3c8
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Tue Aug 23 13:53:23 2016 +0200
-
-    Documentation with unset license is under project's license (GPL-2+)
-    
-    doc/idl2deb.pod is licensed explicitly under GPL-2+ it is just
-    not recognized by the check.
-    
-    Change-Id: Iabc7ee6bd6fe9080d6cdd28a29bb4c5f97b0ece9
-    Reviewed-on: https://code.wireshark.org/review/17268
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-
-commit c7ca0e8
-Author: Michał Skalski <mskalski13@gmail.com>
-Date:   Sun Aug 21 22:00:44 2016 +0200
-
-    dissector ISAKMP IKEv2: fixed bug with libgcrypt-1.6.x and AEAD ciphers
-    
-    IKEv2:
-    Fixed bug with AEAD ciphers with 8- and 12-byte length ICVs and
-    libgcrypt 1.6.x - gcry_cipher_checktag() returned INVALID_LENGTH.
-    Fixed for merged changeset https://code.wireshark.org/review/17078
-    
-    
-    Added support for verification of encrypted data with HMAC_MD5_128
-    [RFC4595] and HMAC_SHA1_160 [RFC4595] integrity algorithms
-    
-    Added IKEv2 decryption suite for few combinations of encryption and
-    integrity algorithms: 3DES-CBC/SHA1_160, AES-128-CCM-12, AES-128-CCM-12
-    (using CTR mode), AES-192-CTR/SHA2-512, AES-256-CBC/SHA2-256,
-    AES-256-CCM-16, AES-256-GCM-16, AES-256-GCM-8
-    
-    
-    Change-Id: Ic564b25f1fd41e913c605322b7b8aa030cf90ddf
-    Reviewed-on: https://code.wireshark.org/review/17213
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 8d7aba1
-Author: Jonathan Muñoz <jonathan.munoz@inria.fr>
-Date:   Tue Jul 5 17:13:14 2016 +0200
-
-    IEEE 802.15.4:dissecting header & payload information elements used by 6tisch.
-    
-    This patch shows the Information Elements (IE) defined by the
-    IEEE802.15.4. It dissects the information of those IE which are used
-    by the IETF WG 6tisch and announces the others. Here the list of the
-    fully dissected ones:
-    
-    - For the header IEs:
-        - Time Correction.
-        - Header Termination 1.
-        - Header Termination 2.
-    
-    - For the payload IEs:
-        - MLME:
-            - Nested Shorts:
-                - TSCH Synchronization IE.
-                - TSCH Timeslot IE.
-                - TSCH Slotframe and Link IE.
-            - Nested Longs:
-                - Channel Hopping IE.
-        - Payload Termination IE.
-    
-    For the rest of the IEs defined in the standart, this patch shows them
-    but does not analyze their inner fields.
-    
-    References:
-    https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/
-    IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs).
-    
-    Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4
-    Reviewed-on: https://code.wireshark.org/review/16671
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 52910f4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Aug 22 22:29:21 2016 +0200
-
-    isakmp: fix type confusion
-    
-    Caught by ASAN with WIRESHARK_DEBUG_WMEM_OVERRIDE=simple set.
-    
-    Manually inspection of all type casts to decrypt_data_t and
-    ikev2_decrypt_data_t showed no other users that do not check
-    isakmp_version first.
-    
-    Change-Id: If889afff85a20e31222d33cbea8db3a91a77f389
-    Reviewed-on: https://code.wireshark.org/review/17246
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michał Skalski <mskalski13@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bee0cd7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Aug 22 20:36:24 2016 -0700
-
-    See if *this* convinces the compiler that valuelen and value will be set.
-    
-    Change-Id: I2a7715ac3255502f244a0d0a7e588b3a44c34f11
-    Reviewed-on: https://code.wireshark.org/review/17258
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9edb7af
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Aug 22 19:57:22 2016 -0700
-
-    More fields, more pre-allocated memory for fields.
-    
-    Change-Id: I8362e64354c4ca985dbabc190cfb75d2bd31a5ad
-    Reviewed-on: https://code.wireshark.org/review/17257
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ff00166
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Aug 22 19:28:24 2016 -0700
-
-    Fix handling of parameters with no value.
-    
-    Return a value length of 0 if there's no parameter value.
-    
-    (And don't return anything if the pointers through which we return them
-    are null.)
-    
-    If no value is present, return NULL from ws_find_media_type_parameter().
-    
-    Change-Id: I32b57623d7651bcf065af5b81f2390a600988b21
-    Reviewed-on: https://code.wireshark.org/review/17255
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4458c48
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Aug 22 18:25:33 2016 -0700
-
-    Add cast to squelch "building with a C++ compiler" warnings.
-    
-    Change-Id: Ia95c40096018479aec99fafd93d7b95d31ba4723
-    Reviewed-on: https://code.wireshark.org/review/17253
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0b3a962
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Aug 22 17:53:10 2016 -0700
-
-    Handle quoted-pairs in quoted-strings correctly.
-    
-    Backslash, in a quoted-string, escapes quotes (and any other characters,
-    although the only ones that *need* escaping are a double-quote and a
-    backslash).
-    
-    This means that the value of a parameter isn't just the raw characters
-    from the parameters string; for a quoted string, it needs to be
-    un-escaped, and for a *non*-quoted string, it has to stop at the first
-    non-token character (you can put comments in).  So
-    ws_find_media_type_parameter() must return an allocated string with the
-    actual value.
-    
-    Get rid of index_of_char(); it doesn't do anything that strchr() does.
-    
-    Change-Id: I36328ea71c28fe6ac4918a8e73c281a25f6be844
-    Reviewed-on: https://code.wireshark.org/review/17251
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 943a9ed
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Aug 22 15:10:24 2016 -0700
-
-    Update docbook/README.txt
-    
-    Update to reflect current reality. Still needs a lot of work.
-    
-    Change-Id: Id6bb12f5e8ca42bbadc237f148bb388b54a321e2
-    Reviewed-on: https://code.wireshark.org/review/17247
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 9c80ff0
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Mon Aug 22 13:25:33 2016 +0200
-
-    IKEv2: Add D-H Transform IDs for Brainpool Curves
-    
-    Add Diffie-Hellman Group Transform IDs for the ECC Brainpool Curves.
-    
-    References: RFC 6932, RFC 6954
-    
-    Change-Id: I1ca0da8e5e06abbd1c53a591d01c1f05aa60c35a
-    Reviewed-on: https://code.wireshark.org/review/17231
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ee0f94a
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Aug 22 13:26:14 2016 +0200
-
-    Make index_of_char() static again
-    
-    Change-Id: I1c0d344c50ee5d78dd8247ccfe795ce0cd94aaa2
-    Reviewed-on: https://code.wireshark.org/review/17230
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-
-commit e129aec
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Aug 22 14:11:32 2016 +0200
-
-    debian: Update symbols file with new symbols
-    
-    Some symbols are marked as appearing in 2.2 intentionally,
-    because they are cherry-picked to master-2.2.
-    
-    Change-Id: Ia7807b3bddab0a069812f56c1be2eca8bf7d1cd4
-    Reviewed-on: https://code.wireshark.org/review/17232
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c43b8b5
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Mon Aug 22 12:59:01 2016 +0200
-
-    Rename find_parameter() to ws_find_media_type_parameter()
-    
-    The symbols exported from libs should use less generic. preferably
-    prefixed names to avoid name collisions with other shared library
-    symbols.
-    
-    Change-Id: I8323b3e194a7ee4d61baec0c007342fab6cbde84
-    Reviewed-on: https://code.wireshark.org/review/17229
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 22e421f
-Author: Andreas Leibold <andreas.leibold@harman.com>
-Date:   Mon Aug 22 12:51:05 2016 +0200
-
-    Fixed a bug which might have caused a division by 0.
-    
-    Variable "channels_per_frame" could have caused a division by 0.
-    This is now changed, by stopping dissection in this case. A warning is
-    shown for this case.
-    
-    Change-Id: I6d4dcb91b833a7d7f0759e28f56950b94ab1ed7e
-    Reviewed-on: https://code.wireshark.org/review/17228
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b9e70e9
-Author: Binh Trinh <beango@gmail.com>
-Date:   Sun Aug 14 23:41:48 2016 -0400
-
-    RANAP:  Add an heuristic to decode the HO-to-UTRAN Command embedded in the RRC Container within the TargetRNC-to-SourceRNC Transparent Container
-    
-    Change-Id: Iea7c8d24f52cf8bd11e13a53853e11ec1ecdcd36
-    Reviewed-on: https://code.wireshark.org/review/17058
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3f4ef54
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 22 11:55:52 2016 +0200
-
-    ipp: fix typo indent
-    
-    Change-Id: Ibc44ab1e009f2dc07258b702f0e08aced38a66e2
-    Reviewed-on: https://code.wireshark.org/review/17223
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e8ba606
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Aug 22 12:33:08 2016 +0200
-
-    [Diameter] Add Command codes 8388718 - 8388722.
-    
-    Bug: 12774
-    Change-Id: I413ba4a195ee1bd3d7de66399d1be714ef77d7e2
-    Reviewed-on: https://code.wireshark.org/review/17227
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e83bdc6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Aug 22 00:37:42 2016 -0700
-
-    wmem_array_index() returns a *pointer* to the array element.
-    
-    The array is an array of guint8 *'s that point to strings;
-    wmem_array_index() doesn't return a pointer to the string, it returns a
-    pointer to a pointer to the string, and you have to dereference the
-    result of the wmem_array_index() call to get a pointer to the string.
-    
-    Change-Id: I8c7b3320f0979b01383ad255419c21cdeb7df4c7
-    Reviewed-on: https://code.wireshark.org/review/17221
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c00ea6f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Aug 21 23:43:38 2016 -0700
-
-    Look up the XML dissector the right way.
-    
-    Looking up "text/xml" in the "media_type" dissector is somewhat of a
-    long-way-around way of finding the XML dissector; just look for it by
-    name.
-    
-    Change-Id: Ifafeabc563bf7bfa529bc44ba31bf6ae376a09c8
-    Reviewed-on: https://code.wireshark.org/review/17219
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e1f11c9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Aug 21 23:36:54 2016 -0700
-
-    Get rid of trailing blank line.
-    
-    Change-Id: I409a843b48983355c242708f6c9972bd8f337bf6
-    Reviewed-on: https://code.wireshark.org/review/17218
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5825f59
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Aug 21 23:33:23 2016 -0700
-
-    Pass an HTTP message type to all HTTP subdissectors.
-    
-    This gets complicated, because those subdissectors might be called by
-    other dissectors as well.  We need a better way of passing that sort of
-    out-of-bound information.
-    
-    Pull some routines used for processing Content-Type parameters into
-    common code; we can't guarantee that the media parameters passed in
-    would be writable (passing it as *the* data hid that; passing a
-    structure with that *and* the HTTP message type revealed it), so don't
-    convert it to lower-case in place.
-    
-    Use that information, if available, to determine whether an IPP message
-    is a requet or a response.
-    
-    Change-Id: I4bccc9f05cd0b14ad445be7ab37b3d884d841325
-    Reviewed-on: https://code.wireshark.org/review/17216
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit efdcb25
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Aug 17 10:39:54 2016 +0200
-
-    ISUP: Enhance display of unknown (opt) parameter
-    
-    Ping-Bug:12674
-    Change-Id: If67920246a9122dc693a71a4afcea212fb7f84ab
-    Reviewed-on: https://code.wireshark.org/review/17108
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f062341
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Aug 21 11:23:20 2016 -0700
-
-    Merge the CaveBear list into manuf.tmpl.
-    
-    If the following lines at the top of "Ethernet.txt" are anything to go
-    by
-    
-    ----
-    $Revision: 2.83 $
-    $Date: 1999/03/09 11:36:19 $
-    $Author: map $
-    $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $
-    ----
-    
-    we've been fetching the same list over and over for quite some time.  Go
-    ahead and merge the CaveBear list with manuf.tmpl and stop fetching it
-    remotely.
-    
-    Fixup the way we split the lines we get from the IEEE while we're here,
-    otherwise we log carriage returns in the middle of lines.
-    
-    The following CaveBear lines were skipped during the merge:
-    
-    Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c
-    00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes"
-    00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix"
-    00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD"
-    00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB"
-    00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C"
-    00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom"
-    00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T"
-    00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR"
-    00:00:4B - Skipping CaveBear "APT       -ICL also reported" in favor of "APT"
-    00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T"
-    00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei               # SK        (Schneider & Koch in Europe and Syskonnect outside of Europe)"
-    00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell  # Honeywell"
-    00:00:63 - Skipping CaveBear "Hewlett-Packard           LanProbe" in favor of "HP"
-    00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI"
-    00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS"
-    00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent"
-    00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc            [Also Harris (3M) (old)]" in favor of "Cray"
-    00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT"
-    00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC"
-    00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD)   X-terminals" in favor of "NCD"
-    00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys              # Network Systems"
-    00:00:DD - Skipping CaveBear "Gould" in favor of "Gould"
-    00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph"
-    00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi"
-    00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge"
-    00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq"
-    00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell"
-    00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco         # RACAL-DATACOM"
-    00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com"
-    00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc"
-    00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet         # Cisco Systems, Inc."
-    00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP"
-    00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC"
-    00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco         # NEWPORT SYSTEMS SOLUTIONS"
-    00:80:96 - Skipping CaveBear "HDS (Human Designed Systems)      X terminals" in favor of "HDS"
-    00:80:AD - Skipping CaveBear "CNet Technology                   Used by Telebit (among others)" in favor of "Telebit"
-    00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco"
-    00:E0:98 - Skipping CaveBear "Linksys                           PCMCIA card" in favor of "Trend"
-    02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan               # Interlan [now Racal-InterLAN]        DEC (UNIBUS or QBUS), Apollo, Cisco"
-    02:CF:1F - Skipping CaveBear "CMC                               Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC"
-    08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com"
-    08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC"
-    08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN"
-    08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP"
-    08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General"
-    08:00:38 - Skipping CaveBear "Bull" in favor of "Bull"
-    08:00:3E - Skipping CaveBear "Motorola                  VME bus processor modules" in favor of "Motorola"
-    08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI"
-    08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI"
-    08:00:90 - Skipping CaveBear "Retix, Inc.                       Bridges" in favor of "Retix"
-    09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T"
-    10:00:90 - Skipping CaveBear "Hewlett-Packard                   Advisor products" in favor of "HP"
-    10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC"
-    3C:00:00 - Skipping CaveBear "3Com                              dual function (V.34 modem + Ethernet) card" in favor of "3Com"
-    44:45:53 - Skipping CaveBear "Microsoft                 (Windows95 internal "adapters")" in favor of "Microsoft"
-    Reviewed-on: https://code.wireshark.org/review/17212
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6a7d5df
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Aug 21 18:04:42 2016 -0400
-
-    Add "Modbus/TCP over UDP"
-    
-    There already is "ModbusRTU over UDP", this is the Modbus/TCP format over UDP.
-    
-    Bug: 12768
-    Change-Id: I883aa8e88f8a1640459115434be84354e22bb361
-    Reviewed-on: https://code.wireshark.org/review/17215
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3aac4b1
-Author: Tom <tom916@qq.com>
-Date:   Sun Aug 21 10:29:11 2016 -0400
-
-    Loosen HTTP token sting requirements so HTTP 1.0 can be included.
-    
-    Bug: 12770
-    Change-Id: I5f71072231a752ce6cdedf6f22ce8931a61c39c7
-    Reviewed-on: https://code.wireshark.org/review/17214
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 928e907
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Aug 20 18:33:27 2016 +0200
-
-    nflog: add fields for interface indices
-    
-    Allows me to see the interface indices in a column.
-    
-    Change-Id: I0dd31d7ec06eb860e7c80a4273779ec9034ee42d
-    Reviewed-on: https://code.wireshark.org/review/17193
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 767e1a2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Aug 21 15:54:43 2016 +0200
-
-    RANAP: fix indent (use 2 spaces) and modelines
-    
-    Change-Id: I84e3157a9303572dcd3d9ff5df6802c42553e62f
-    Reviewed-on: https://code.wireshark.org/review/17197
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cfa11ed
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Aug 19 11:03:17 2016 +0200
-
-    mongo: add support for new mongodb 3.2 wire protocol opcodes
-    
-    Add OP_COMMAND (2010) and OP_COMMANDREPLY (2011)
-    
-    Bug:12723
-    Change-Id: Ib66e7136c7a6589286bbea11db2cff76d689db35
-    Reviewed-on: https://code.wireshark.org/review/17166
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 565dbf4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Aug 20 15:10:21 2016 +0200
-
-    nflog: support NFLOG bridge (ebtables) dissection
-    
-    See net/netfilter/nfnetlink_log.c, that is the only place that sets
-    NFULA_PACKET_HDR to struct nfulnl_msg_packet_hdr.
-    
-    Tested with nflog-ebtables.pcapng from SampleCaptures wiki.
-    
-    Change-Id: I7e21f8f584f3911b3aa7d0d027ff9624886bef73
-    Reviewed-on: https://code.wireshark.org/review/17191
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dc42aad
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sun Aug 21 17:27:39 2016 +0200
-
-    CDP: Don't read outside payload for Port ID
-    
-    Check if tvb remaining length is greater than expected length.
-    
-    Bug: 12767
-    Change-Id: Ia04b559432af417db519cfcfbec06e6010b496bf
-    Reviewed-on: https://code.wireshark.org/review/17208
-    Petri-Dish: Jim Young <jim.young.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 3509b07
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Aug 21 16:54:13 2016 +0200
-
-    LLC/STP (Cisco): Add Cisco Root Link Query PDU (STP)
-    
-    Cisco RLQ BPDUs, request (PID 0x0108) and response (PID 0x0109) used to support Cisco's extension (Backbone Fast [1]) to original 802.1D spanning-tree protocol. The format of the BPDUs is same as original STP configuration BPDUs
-    [1] http://www.cisco.com/c/en/us/support/docs/lan-switching/spanning-tree-protocol/12014-18.html
-    [2] http://www.cisco.com/c/en/us/support/docs/lan-switching/spanning-tree-protocol/12014-18.html#anc9
-    
-    Issue reported by Garri
-    
-    Bug:12772
-    Change-Id: I0ffd169bf252ae11817c7a44ca3a67dfd4e221eb
-    Reviewed-on: https://code.wireshark.org/review/17204
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a792a3b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Aug 21 08:05:53 2016 -0700
-
-    [Automatic update for 2016-08-21]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I92e3eefcb4670994fcab0d089c184ba5da2ab788
-    Reviewed-on: https://code.wireshark.org/review/17205
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 7804be0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Aug 21 16:21:40 2016 +0200
-
-    ieee1722: fix Division by Zero found by Clang Analyzer and Coverity (CID 1371610)
-    
-    Change-Id: Iac0ef122062f8dc3160e112d76c35a256f8d8c2a
-    Reviewed-on: https://code.wireshark.org/review/17201
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0761192
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Aug 21 16:24:45 2016 +0200
-
-    nstrace: fix Control flow issues (UNREACHABLE) found by Coverity (CID 1371612)
-    
-    Change-Id: I76b3956d5b346412af5ff3aa5e0f6263dcb525a4
-    Reviewed-on: https://code.wireshark.org/review/17202
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c0ab12b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Aug 20 13:22:30 2016 +0200
-
-    netlink-netfilter,nflog: use NFPROTO_xxx instead of AF_xxx
-    
-    These constants are mostly overlapping, except for NFPROTO_ARP. A manual
-    study of the Linux v4.7 code shows which fields to use and also reveal
-    that nflog.family can never be NFPROTO_ARP because (1) bridge traffic
-    use NFPROTO_BRIDGE and (2) arptables has no ULOG/NFLOG target.
-    
-    This patch affects how some family fields are displayed but do not
-    affect subdissector calls.
-    
-    Change-Id: I7cc73a8dcf73fe68c7ccaaa0f3b329fe484c8bfe
-    Reviewed-on: https://code.wireshark.org/review/17190
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9902117
-Author: Guillaume Autran <gautran@clearpath.ai>
-Date:   Tue Jan 12 14:48:57 2016 -0500
-
-    TCPROS - Protocol dissector improvements
-    
-     - Added specific dissector for ROS Clock messages
-     - Added dissector heuristics
-     - Improve ROS traffic detection
-    
-    Problems to resolve:
-     - Some topics are mistaken for Clock messages. These includes the wheel encoder topic.
-     - ROS Services are not detected.
-     - Ideally, the TF topic should be dissected as it is a very common topic
-    
-    Bug: 12749
-    Change-Id: I14255cbb42ae36b7e39f64dc1a5c6efffe19c8b1
-    Reviewed-on: https://code.wireshark.org/review/17086/
-    Reviewed-on: https://code.wireshark.org/review/17086
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0a9e842
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Aug 20 21:03:02 2016 +0200
-
-    COAP: ensure that key_token is always initialized
-    
-    Even when the token length is 0.
-    
-    Bug: 12771
-    Change-Id: I0d77f0411fe90a6702d1f23ba9cd4b61433a5995
-    Reviewed-on: https://code.wireshark.org/review/17194
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8f98f7c
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Fri Aug 19 21:21:29 2016 +0200
-
-    BOOTP: Catch undefined Client Identifier (Option 61)
-    
-    [1] stats "A hardware type of 0 (zero) should be used when the value field
-    contains an identifier other than a hardware address (e.g. a fully
-    qualified domain name)."
-    
-    This commit displays these other identifier.
-    
-    [1] https://tools.ietf.org/html/rfc2132#section-9.14
-    
-    Bug: 12766
-    Change-Id: I3d991164641b41fb95891b2f78411d2e98a22e0d
-    Reviewed-on: https://code.wireshark.org/review/17180
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 68a9ea6
-Author: Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>
-Date:   Wed Aug 17 18:48:24 2016 +0200
-
-    ICMPv6: Add support for MPL Control Message (RFC 7731)
-    
-    Bug: 12757
-    Change-Id: I454c8a9a85c703a746e5152157817b1d8a48accf
-    Reviewed-on: https://code.wireshark.org/review/17115
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 302660b
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Sun Aug 14 23:50:25 2016 +0200
-
-    ISAKMP: Add regression tests
-    
-    Add regression tests for bugs 12610 and 12620
-    
-    Bug: 12610
-    Bug: 12620
-    Change-Id: I6325a3ccb3e27fd4d3be52190e8763737b99fe73
-    Reviewed-on: https://code.wireshark.org/review/17083
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6eebf94
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 08:09:53 2016 +0200
-
-    QUIC: Enhance dissection of STREAM
-    
-    stream_id = 1 is reserved for QUIC handshake/crypto...
-    stream_id = 3 is reserved for H2 HEADERS (PUSH_PROMISE..) (and call H2 dissector for dissection)
-    
-    Thanks for Lucas for pcap
-    
-    Change-Id: I563c44af88c3e72476f8637d8b7c5ba4d8a4a995
-    Reviewed-on: https://code.wireshark.org/review/17134
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bb999e2
-Author: Andreas Leibold <andreas.leibold@harman.com>
-Date:   Fri Aug 19 10:29:51 2016 +0200
-
-    1722 extensions: code clean up, warning removed
-    
-    code clean up
-    dissector bugfixing
-    1722 / 61883 subtype: packet inspection enhanced regarding warnings
-    1722 / 61883-6 subtype: more detailed packet dissection
-    
-    Change-Id: I0d762f37402ca27ad33e0d22da50c184297bed57
-    Reviewed-on: https://code.wireshark.org/review/17110
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c06da45
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Aug 19 16:18:43 2016 -0700
-
-    Add a preference to byte-swap the CAN ID field.
-    
-    This can be useful when dealing with 1) captures from versions of
-    libpcap without the bug fix to use DLT_CAN_SOCKETCAN_HOSTENDIAN when
-    appropriate and 2) DLT_CAN_SOCKETCAN_HOSTENDIAN captures if processed by
-    a machine with a different byte order from the capturing machine with
-    software that doesn't properly put the field into host byte order when
-    reading and writing.
-    
-    Change-Id: Ia206e5c51aecccf2508cca01cff65a4feb379ac8
-    Reviewed-on: https://code.wireshark.org/review/17187
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 22a4f8e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Aug 19 13:37:59 2016 +0200
-
-    LCSAP: fix indent (use 2 spaces) and modelines
-    
-    Change-Id: I688c71a94703cecbf62b0e29f1e389551cedbeb9
-    Reviewed-on: https://code.wireshark.org/review/17171
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9bfbea9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Aug 19 18:02:58 2016 +0200
-
-    NAS EPS: generate the consecutive TAC values when using the TAI list format 1
-    
-    Change-Id: I79442a95c52c0ac334ad27b83b78af78d0d23dcc
-    Reviewed-on: https://code.wireshark.org/review/17179
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9a0a7e5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Aug 19 13:19:06 2016 -0700
-
-    Do all data fetching in the appropriate byte order.
-    
-    Change-Id: I481288b566c2b9888b3f068d2dbae1240fa2930e
-    Reviewed-on: https://code.wireshark.org/review/17181
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3646cbb
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Aug 19 15:10:06 2016 +0200
-
-    [Diameter] Add subdissection of AVP 1242 location estimate and AVP 2516
-    EUTRAN-Positioning-Data.
-    
-    Change-Id: I8eebd94ab82889cff5ef3a209c485e8d2769a71d
-    Reviewed-on: https://code.wireshark.org/review/17177
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6cfb20d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Aug 19 18:00:36 2016 +0200
-
-    NLM: fix dissection of NLM_FREE_ALL message
-    
-    The second parameter is the state, not the status as seen in C702 doc, page 159
-    
-    Bug: 12764
-    Change-Id: I0a91a0e586c7663ace7c4c6b1044cafc1c0975ac
-    Reviewed-on: https://code.wireshark.org/review/17178
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 7cfb8b8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Aug 19 13:59:49 2016 -0700
-
-    Answer a locale question in a comment.
-    
-    Change-Id: If2c287ed8d2a3b518ceff891f1e6d995d7a7daad
-    Reviewed-on: https://code.wireshark.org/review/17182
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f52ce40
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Aug 19 15:06:51 2016 +0200
-
-    [Diameter] Add stray AVP "Pseudonym-Indicator" code="2519"
-    
-    Change-Id: I050c27b7118fb98fea20fec697279dc68820763d
-    Reviewed-on: https://code.wireshark.org/review/17176
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8bca5f6
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Aug 19 13:02:34 2016 +0200
-
-    [LCS-AP] Add decoding of Civic-Address, add expert info if wrongly
-    encoded.
-    
-    Change-Id: I2631fe5ae7f8e73f8f4067c73197ae4cd386b633
-    Reviewed-on: https://code.wireshark.org/review/17169
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3a7e305
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Aug 8 22:10:48 2016 +0200
-
-    codecs/speex: add check in speex_resampler_init_frac/set_rate_frac (CID 1355648).
-    
-    Add checks to avoid den_rate and num_rate to be set to 0.
-    
-    Change-Id: Ia4880521e7ab73d0fdc44377f4badadb09365471
-    Reviewed-on: https://code.wireshark.org/review/16963
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c3a8a0c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Aug 17 21:14:57 2016 +0200
-
-    netlink: fix flags dissection
-    
-    Flags are not in network byte order, use given encoding instead.
-    
-    Show both flags fields for GET and NEW requests since the netlink
-    dissector cannot yet determine whether a request is for GET, NEW or
-    something else. This has no effect for the sockdiag dissector but it
-    will influence the route and netfilter netlink subdissectors.
-    
-    Change-Id: I472ff9e0498debbbceef657a14408c4e6a9df75b
-    Reviewed-on: https://code.wireshark.org/review/17118
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d2ee571
-Author: Michał Skalski <mskalski13@gmail.com>
-Date:   Tue Aug 16 03:21:09 2016 +0200
-
-    dissector ISAKMP: Added decryption using AES-GCM, AES-CCM and AES-CTR
-    
-    Added support for decryption of IKEv2 packets encrypted with PAED or CTR
-    cipher mode.
-    Verification of integrity requires libgcrypt 1.6.0 or later. If it is
-    not the case, only decryption is performed
-    Can easily be extended to other ciphers supported by libgcrypt.
-    
-    NOTE: There is long-term bug in handling UAT for IKEv2 - any change
-    resulting in change count of IKEv2 UAT entries causes crash when
-    matching key from UAT is found.
-    Crash does not occur when UAT is read from user prefs file.
-    I observed this bug also on stock 1.10.6 version from Ubuntu 14.04 LTS
-    
-    I have no knowledge, how to fix it.
-    
-    Change-Id: Ibdab979b5959eb561635cbcb446e17138baca87b
-    Reviewed-on: https://code.wireshark.org/review/17078
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5b57c79
-Author: Juanjo Martin <juanjo@rti.com>
-Date:   Thu Aug 18 13:39:10 2016 +0200
-
-    RTPS: Added locator information to the parameter tree.
-    
-    This makes the user avoid to click twice in order to see the info.
-    
-    Change-Id: Ib983c78634b1309f12ab29d673abc1195088f55c
-    Reviewed-on: https://code.wireshark.org/review/17146
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 72a8e95
-Author: Francois-Xavier Le Bail <fx.lebail@yahoo.com>
-Date:   Fri Aug 19 09:15:31 2016 +0200
-
-    bfd: Fix a comment on Control packet version 1
-    
-    Bug:12761
-    Change-Id: I5877878f19be4907b9fc0c00f19601a3c7a67005
-    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/17163
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2557f03
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Aug 19 11:10:50 2016 +0200
-
-    mongo: set on subtree when Empty Document
-    
-    Change-Id: I2b6b7cf771ab7bc2f6dbc0aac5eddda2a9d2fb53
-    Reviewed-on: https://code.wireshark.org/review/17167
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7f173c0
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Aug 19 12:34:53 2016 +0200
-
-    [LCS-AP] id-E-UTRAN-Cell-Identifier is sued also as an extension value.
-    
-    Change-Id: I86c7ff51a16801c2995161c45cb3d8e6800f54c4
-    Reviewed-on: https://code.wireshark.org/review/17168
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a837263
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Aug 19 10:18:44 2016 +0200
-
-    [Diameter] Ad dissetion of Access-Restriction-Data bitfield.
-    
-    Change-Id: I3e751f07c540b056b55fc98fb9c26d23718bd8fc
-    Reviewed-on: https://code.wireshark.org/review/17164
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d1c763c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Aug 18 21:15:52 2016 +0200
-
-    NAS EPS: fix dissection of multiple partial tracking area identity list
-    
-    As reported on https://ask.wireshark.org/questions/54955/nas-tracking-area-identity-list-decoding-not-proper
-    
-    Change-Id: I8c4ed1982e1d72136558fb381d2d15b15c9e376c
-    Reviewed-on: https://code.wireshark.org/review/17151
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8963303
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Aug 18 19:48:35 2016 -0700
-
-    Adjust to the split of the SocketCAN encapsulation.
-    
-    Change-Id: Ibbe97f15854163163ad2bdf3b425c63d4cbfed50
-    Reviewed-on: https://code.wireshark.org/review/17158
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit b420d4f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jul 16 08:30:06 2016 +0200
-
-    Add tools for setup macos dev environnement using brew
-    
-    Will be reused for Travis osx
-    
-    Change-Id: Ida905768efc4e48be9936b3113704dcb651d4ca0
-    Reviewed-on: https://code.wireshark.org/review/16495
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 95c4c43
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Aug 18 18:39:43 2016 -0700
-
-    Handle the new LINKTYPE_CAN_SOCKETCAN_HOSTENDIAN.
-    
-    Unfortunately, only one libpcap code path puts the CAN ID in the
-    SocketCAN header in network byte order; the others leave it in host byte
-    order.  Therefore, a new LINKTYPE_/DLT_ value was introduced, and
-    libpcap was changed to use that for the cases where the CAN ID is in
-    host byte order.  Support them both.
-    
-    This means we need to, when reading pcap and pcapng files, fix up the
-    CAN ID if the host that wrote the file has a different byte order from
-    ours (as libpcap also now does).  This includes Linux "cooked" captures,
-    which can include CAN packets.
-    
-    Change-Id: I75ff2d68d1fbdb42753ce85d18f04166f21736dd
-    Reviewed-on: https://code.wireshark.org/review/17155
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2a4d6f1
-Author: Chris Brandson <chris.brandson@gmail.com>
-Date:   Thu Aug 18 11:05:55 2016 -0700
-
-    fix endianess of rejoin source address
-    
-    Change-Id: I71e6e2f569524642a24778ceef81c03fdc0f54c5
-    Reviewed-on: https://code.wireshark.org/review/17149
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8accce8
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Aug 18 19:15:53 2016 +0200
-
-    etypes: Add ETHERTYPE_LINK_CTL
-    
-    The definition was found in the Linux kernel source code.
-    
-    Change-Id: I41d1435497042bc5905efc7e1af3941b9e8808e2
-    Ping-Bug: 12759
-    Reviewed-on: https://code.wireshark.org/review/17148
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ea024e2
-Author: Chris Bontje <cbontje@gmail.com>
-Date:   Thu Aug 18 11:07:13 2016 -0600
-
-    SEL Protocol - Fix 'Fast Meter Config' sub-tree addition typo & 'if (tree)' usage
-    
-    - The proto_tree_add_subtree call was previously using the length of the full tvb,
-    instead of len-2 like all other calls.  This typo did not previously cause an issue,
-    but in newer versions of Wireshark it causes an assert.
-    
-    - When I created the selfm dissector 4-5 years ago, I used packet-synphasor.c
-    as a template and there was an 'if (tree)' wrapper around several initial GUI calls
-    including col_*** info column clear/set functions.  It looks like in recent years
-    this layout has been removed (for example, https://code.wireshark.org/review/#/c/6725/ ).
-    I'm not sure of the exact reasoning behind this, but in Wireshark 2.x (QT), there are
-    several conditions where in the SEL protocol dissector the info column will be
-    cleared and not repopulate - I can only assume because col_clear has been called
-    with no col_add's.  Removal of this 'if' condition does correct the issue with no immediate ill effects..
-    
-    Change-Id: I4c619cb320cd2152e1d4d1b76c809b1498dfda61
-    Reviewed-on: https://code.wireshark.org/review/17147
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit fce1871
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 15 19:26:50 2016 +0200
-
-    QUIC: Add detection of server port
-    
-    Some debug tools don't use the standard 443
-    
-    Change-Id: I5826de69afe343e4c112ecb78ffa1e26bd35b242
-    Reviewed-on: https://code.wireshark.org/review/17069
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 65c885f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 13:16:12 2016 +0200
-
-    TCP: fix no previous prototype for 'exp_pdu_tcp_dissector_data_size/exp_pdu_tcp_dissector_data_populate_data' [-Wmissing-prototypes]
-    
-    Change-Id: I259f457868f4b8cde7e188d88d3d55f97070ee3b
-    Reviewed-on: https://code.wireshark.org/review/17145
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2a4c115
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 13:17:21 2016 +0200
-
-    logcat (text): fix no previous prototype for 'logcat_text_init/logcat_text_cleanup' [-Wmissing-prototypes]
-    
-    Change-Id: I1c8462064e7c07ee7f626fb26ad6bb744a7fc5b3
-    Reviewed-on: https://code.wireshark.org/review/17144
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 26464b0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 13:23:11 2016 +0200
-
-    ERF: fix no previous prototype for 'erf_ts_to_nstime/dissect_relative_time/dissect_ptp_timeinterval' [-Wmissing-prototypes]
-    
-    Change-Id: I21ee4f8850f63de3a7fa91ed9e8a426c82a9d62e
-    Reviewed-on: https://code.wireshark.org/review/17143
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6d02362
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 09:28:24 2016 +0200
-
-    btatt: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I4c8d2fc74a84e4fe4a85efeb75f666f5402c6030
-    Reviewed-on: https://code.wireshark.org/review/17137
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3771bc7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 13:14:47 2016 +0200
-
-    UDS: fix fix no previous prototype for 'proto_register_uds/proto_reg_handoff_uds' [-Wmissing-prototypes]
-    
-    Change-Id: I14567ea0142555aedb859e52eb4d92f89da8d695
-    Reviewed-on: https://code.wireshark.org/review/17142
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c996629
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 13:18:53 2016 +0200
-
-    iso15765: fix no previous prototype for 'proto_register_iso15765/proto_reg_handoff_iso15765' [-Wmissing-prototypes]
-    
-    Change-Id: Id563eb5c44a988a7ea5149e312f4033cd4ca31e9
-    Reviewed-on: https://code.wireshark.org/review/17141
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e4a37b9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 13:22:05 2016 +0200
-
-    gsm abis tfp: fix no previous prototype for 'proto_register_abis_tfp/proto_reg_handoff_abis_tfp' [-Wmissing-prototypes]
-    
-    Change-Id: I86d397e0fb37ff12e58c923a63fbb201934d0e66
-    Reviewed-on: https://code.wireshark.org/review/17140
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 81fe1ca
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 13:20:53 2016 +0200
-
-    gsm abis pgsql: fix no previous prototype for 'proto_register_abis_pgsl/proto_reg_handoff_abis_pgsl' [-Wmissing-prototypes]
-    
-    Change-Id: I6138ca727e6802bc2066bc1ecb8549365b588da2
-    Reviewed-on: https://code.wireshark.org/review/17139
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b2a6bb1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 13:02:53 2016 +0200
-
-    QUIC: fix typo about stream offset
-    
-    it is only Offset not Offset Length
-    
-    Issue reported by Lucas
-    
-    Change-Id: I3129d62a0601b896fd0d44d5ce4d32864afdd96e
-    Reviewed-on: https://code.wireshark.org/review/17138
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5bc19fe
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Aug 18 08:07:00 2016 +0200
-
-    HTTP2: export dissect_http2_pdu
-    
-    for used on another dissector...
-    
-    Change-Id: I7c27517ee26ee9f9384e22a83e547550863093d8
-    Reviewed-on: https://code.wireshark.org/review/17133
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 13de8ab
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Aug 16 19:52:19 2016 +0200
-
-    QUIC: Fix some minor typo
-    
-    Change-Id: I541cbfd133695e4856175eb8281f30d4c2dcaea1
-    Reviewed-on: https://code.wireshark.org/review/17132
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4ae62f1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed May 25 08:22:43 2016 +0200
-
-    PAPI: Add Port (src/dest) description
-    
-    Change-Id: Iac6c550398f737200470505b4ed2dcffb24fa5fa
-    Reviewed-on: https://code.wireshark.org/review/15573
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0a609d4
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Aug 18 08:47:49 2016 +0100
-
-    pre-commit: Ignore missing pre-commit-ignore.py
-    
-    Print error message to stderr and return non-zero exit status from
-    child process.
-    
-    Change-Id: Icd433d79c5a7bf8b6ddd8e94e26695b353e34d1f
-    Reviewed-on: https://code.wireshark.org/review/17116
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit b366d6e
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Aug 12 23:12:18 2016 +0200
-
-    xbxml: restore removed line.
-    
-    This makes CID 1317251 obsolete.
-    
-    Change-Id: Id342b996268ac0734a52e93c02ae368960ee2294
-    Reviewed-on: https://code.wireshark.org/review/17027
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b6f73f2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Aug 17 13:03:27 2016 +0200
-
-    Qt: fix crash on clearing dfilter after capture restart
-    
-    Since v2.1.2rc0-1-gaf5daa6 ("Qt: Replace a QMap with a QVector."), the
-    following error could be observed:
-    
-        ASSERT failure in QVector<T>::operator[]: "index out of range", file /usr/include/qt/QtCore/qvector.h, line 433
-        Aborted (core dumped)
-    
-    It happens when a capture filter is present and a live capture is
-    restarted. Then the number_to_row_ structure would be truncated which
-    results in an invalid access.
-    
-    Fix this by always checking the length before inserting a new mapping.
-    Do it inside the loop to prevent an unlikely race condition where more
-    than 10000 packets are received before the next iteration.
-    
-    Store "row number + 1" to avoid having to initialize the new elements
-    from resize() with -1, the default value is 0 which is good now.
-    
-    Change-Id: I88ce955a3551508e773eeadddc6f89bbb583acaf
-    Reviewed-on: https://code.wireshark.org/review/17111
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3c8f657
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Aug 15 18:55:45 2016 +0200
-
-    ISAKMP: Fix Result of operation is garbage or undefined found by Clang Analyzer
-    
-    Change-Id: I47233968dfc87494b3c959896622db5cd31244a7
-    Reviewed-on: https://code.wireshark.org/review/17065
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Mirko Parthey <mirko.parthey@web.de>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 635f0a5
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Aug 11 09:10:48 2016 -0700
-
-    Update the README.
-    
-    The formatting was mostly AsciiDoc-compliant. Take it the rest of the
-    way. Update the list of supported operating sytems, along with other
-    info. Use HTTPS URLs. Remove README.tru64 while we're here.
-    
-    Change-Id: Ibd9cac5d9f3cdcc7de9c9d7052c14e851e108cbe
-    Reviewed-on: https://code.wireshark.org/review/17014
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 38a38ab
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Aug 16 19:41:24 2016 +0200
-
-    QUIC: Update error code
-    
-        Also update link to source code
-    
-    Change-Id: I9afb72e477d11e3427cb43d574b2949bb8d777f9
-    Reviewed-on: https://code.wireshark.org/review/17091
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 01d1a4a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Aug 16 19:42:08 2016 +0200
-
-    QUIC: Fix encoding arg from MIDS Tag
-    
-    Change-Id: Ia1468c5f64b41452f373800af36c4c1fb4c58dbe
-    Reviewed-on: https://code.wireshark.org/review/17092
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d0e4e52
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Aug 16 09:56:25 2016 +0200
-
-    BGP: Add no supported AFI/SAFI (Cisco) Open Message Error
-    
-    Bug:12601
-    Change-Id: I555ee8097ea81e1afa8f2f5b2aba8fce60742016
-    Reviewed-on: https://code.wireshark.org/review/17107
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 322276d
-Author: Chris Bontje <cbontje@gmail.com>
-Date:   Wed Aug 17 12:11:14 2016 -0600
-
-    SEL Protocol - Correct dissection for 'SOE Present State Response' function code
-    
-    Change-Id: I53691344f22f7313242f31e0abce9af5a5dbf8be
-    Reviewed-on: https://code.wireshark.org/review/17117
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 45a8861
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Aug 17 19:03:11 2016 -0700
-
-    Don't distinguish between PARSED_NONRECORD and PARSE_FAILED.
-    
-    If we got no bytes of data from a putative packet, the file isn't a
-    valid Ascend file, regardless of whether the parser failed or not.  Just
-    have parse_ascend() return a Boolean, TRUE if we got a packet and FALSE
-    if not, and, in the case where we got no data but the parser didn't
-    fail, provide "no data returned by parse" as the error string.
-    
-    (We weren't actually distinguishing between them when we called
-    parse_ascend() - we were treating all non-PARSED_RECORD returns as an
-    error.)
-    
-    Change-Id: I85a3e318015258f6a62c8d23ac2f906e28789982
-    Reviewed-on: https://code.wireshark.org/review/17130
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 85ebd88
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Aug 17 18:41:36 2016 -0700
-
-    Make it a little clearer what ascend_open() is doing.
-    
-    Expand comments, and merge two separate if checks.
-    
-    Change-Id: If339ce632ccc91c425ba6db4a32296c3038253ac
-    Reviewed-on: https://code.wireshark.org/review/17128
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 0480a0be81dd5c561637c8d6351191c154f72970)
+    Reviewed-on: https://code.wireshark.org/review/22061
 
-commit 3ba8a28
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Aug 17 18:34:33 2016 -0700
-
-    Just return the value of yyparse() from run_ascend_parser().
-    
-    That's what we're doing already, but get rid of the variable to which we
-    assigned the return value.
-    
-    Change-Id: I55e31664bc26bbfffe4a4ca764c917eefbb9a8f1
-    Reviewed-on: https://code.wireshark.org/review/17126
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f17ba6b
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Aug 17 19:47:42 2016 -0400
-
-    Add a script to validate the Diameter dictionary XML.
-    
-    I wrote this during Sharkfest to get the Diameter dictionary into (mostly)
-    valid XML.  There's some room for improvement in the script but it works.
-    
-    Change-Id: Ic8548c4f321831397951bf1d76779c263a832682
-    Reviewed-on: https://code.wireshark.org/review/17124
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit cdd3f45
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Aug 17 10:26:48 2016 -0400
-
-    RPM: distribute the wireshark.pc file.
-    
-    It's been installed since Idb60157a51ea1dd0afd6cfac695bfa5760485241.
-    
-    Change-Id: I2171f2a0bc9b05059b8ecf4451715f7f6d9506e3
-    Reviewed-on: https://code.wireshark.org/review/17113
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 9cbcdee
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Aug 18 00:05:05 2016 +0100
-
-    pre-commit: Make version check work with git-worktree
-    
-    By disabling it outside the main working tree this time.
-    
-    Change-Id: I2075b07370e3cc1395c6de9695e40b0a952e3eab
-    Reviewed-on: https://code.wireshark.org/review/17122
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit e3daf4a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Aug 16 16:23:30 2016 -0700
-
-    Start recommending Python 3 on Windows.
-    
-    Works fine here, including git-review.
-    
-    Change-Id: I8580a6b266fba09c711be8984a9f17e02a9f789f
-    Reviewed-on: https://code.wireshark.org/review/17097
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 72a3195
+commit 689a94b
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Aug 17 15:48:38 2016 -0700
+Date:   Fri Jun 9 17:48:46 2017 -0700
 
-    The caplen for a packet is always "number of bytes seen".
+    Fix weird comment.
     
-    Set wirelen to the length from the header, but don't set caplen; start
-    caplen out as 0 and count it up whenever we add a byte.
-    
-    Bug: 12754
-    Change-Id: Ib4e45e947df6077f97a423157c152dac9f57734a
-    Reviewed-on: https://code.wireshark.org/review/17120
+    Change-Id: I4254b37b14631929681b5642dc44911019807cb1
+    Reviewed-on: https://code.wireshark.org/review/22058
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 25777d09866015d0cfef7265aefcc341321df110)
+    Reviewed-on: https://code.wireshark.org/review/22059
 
-commit 5170580
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Aug 16 10:50:37 2016 -0400
-
-    Clean up release notes for 2.4.
-    
-    Specifically, remove all the stuff that was listed as new in the 2.2 release
-    notes.  Comment out some empty sections.
-    
-    (Note that the "Encrypted UDP based FTP with multicast" protocol is removed
-    because that dissector was backported to master-2.2.)
-    
-    Change-Id: I6663b1f4456b3d4f401696af764a275dfa39ad99
-    Reviewed-on: https://code.wireshark.org/review/17087
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 74e8b53
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Aug 16 12:25:55 2016 -0700
-
-    Fix a comparison in win-setup.ps1
-    
-    "if ($SomeVariable > 0)" is valid PowerShell syntax, but it writes
-    the value of $SomeVariable to a file named "0". Use the "-gt" operator
-    instead.
-    
-    Change-Id: I17e0f7033008ead3b24fed8c0c91869747ff81f1
-    Reviewed-on: https://code.wireshark.org/review/17093
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f92f169
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Aug 17 15:51:23 2016 +0200
-
-    [Diameter] Add a couple of AVP:s
-    
-    Change-Id: If7b6a1ba5e81ccb5395df33b7bbcb24a616727c9
-    Reviewed-on: https://code.wireshark.org/review/17112
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit dd15a6d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Aug 12 17:24:54 2016 +0200
-
-    netlink-netfilter: add partial ipset support
-    
-    Based on Linux 4.7 headers, this decodes many interesting fields like
-    the setname, IP address and more. Many attributes are not fully
-    dissected, but at least the attribute names are visible now.
-    
-    Tested with netlink-ipset.pcap, posted on the SampleCaptures wiki.
-    
-    Change-Id: Ibd430e9d0f177d5f21753ac1206541b4e50329f2
-    Reviewed-on: https://code.wireshark.org/review/17031
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 2e37b27
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Aug 16 23:52:03 2016 +0200
-
-    DCT2000: fix a buffer overflow in case of malformed packet
-    
-    Bug: 12750
-    Change-Id: Iff20efa46e000ab4ae77b2edbcb0b9af4634508c
-    Reviewed-on: https://code.wireshark.org/review/17096
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3b97fbd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Aug 16 23:40:25 2016 +0200
-
-    DCT2000: prevent a stack buffer overflow
-    
-    Bug: 12752
-    Change-Id: I2007082909cea07314ac40d6db32ee9c2804ecdf
-    Reviewed-on: https://code.wireshark.org/review/17095
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit dd1ef75
-Author: Chris Brandson <chris.brandson@gmail.com>
-Date:   Tue Aug 16 10:10:36 2016 -0700
-
-    zbee (nwk): fix typo in Rejoin IE name
-    
-    Change-Id: I80184c66928b6704365e1538cf47c6036d4b053f
-    Reviewed-on: https://code.wireshark.org/review/17090
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c92ff16
-Author: Binh Trinh <beango@gmail.com>
-Date:   Tue Aug 16 23:31:29 2016 -0400
-
-    S1AP: Initialise handovertype for procedure HOReqAck
-    
-    Change-Id: I4d90bebc94d7e3ead1f2263668c6a3344d02bc0f
-    Reviewed-on: https://code.wireshark.org/review/17098
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b23587f
+commit 98ffd27
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 16 23:59:03 2016 -0700
+Date:   Fri Jun 9 15:38:05 2017 -0700
 
-    Show millisecond values as both raw and "(N msec)".
+    Just print the string color_filters_init() provides on an error.
     
-    Do as we do with other Bluetooth fields that, when multiplied by 1.25,
-    give time amounts in milliseconds.
+    It gives all the necessary details; no need to mention the name of a
+    routine the existence of which the user is probably unaware.
     
-    Change-Id: I89c599e68f91c134b216c495dabdbf77db10def3
-    Reviewed-on: https://code.wireshark.org/review/17099
+    Change-Id: I66d372bc6650c84fbbc6be438be695eff1048413
+    Reviewed-on: https://code.wireshark.org/review/22055
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 60da2c96ddddd222994e8d25a3825fb8d7fd7ae5)
+    Reviewed-on: https://code.wireshark.org/review/22057
 
-commit 315bba7
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Aug 16 23:11:12 2016 +0200
-
-    FP: ensure that mac and rlc structures are always allocated
-    
-    Rather han checking everywhere that the RLC and MAC info are present in pinfo,
-    allocate a temporary structure that will be dropped once packet dissection is
-    over.
-    
-    Bug: 12751
-    Change-Id: I890430dd0c0b56d641777c15eedbf07fef082904
-    Reviewed-on: https://code.wireshark.org/review/17094
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 5716cc6
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Tue Aug 16 16:20:58 2016 +0100
-
-    Add licensecheck.pl to the tarball
-    
-    checklicenses.py now needs it.
-    
-    Change-Id: I1a8c6e21fb35386dcaa44c72f9c196445a378a04
-    Reviewed-on: https://code.wireshark.org/review/17088
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 858f11c
-Author: Juanjo Martin <juanjo@rti.com>
-Date:   Tue Aug 16 18:12:13 2016 +0200
-
-    RTPS: Added improvement for SHMEM locator
-    
-    Change-Id: I2d7abf3606aad939901e70f94054a49b1b15a20d
-    Reviewed-on: https://code.wireshark.org/review/17089
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 445d0f6
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Aug 16 10:40:38 2016 -0400
-
-    Document the new Windows Cluster Management API dissector.
-    
-    It was added in I86efa0c725667083cb252e5df3bfc69118df3059.
-    
-    Change-Id: Ie7a80cac232bc2f763a5526bb3049fccbdc96e22
-    Reviewed-on: https://code.wireshark.org/review/17085
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 4a2e89b
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Sep 8 19:06:30 2015 +0200
-
-    Bluetooth: ATT: Implement attribute Regulatory Certification Data List
-    
-    It is described in Personal Health Devices Transcoding White Paper v1.6
-    at Bluetooth.org. It is not detailed implementation, because
-    white paper is not specification for this, but it is really
-    "giant leap for mankind".
-    
-    Change-Id: I476b242a67c7c0b24e450ad347216c708cc12879
-    Reviewed-on: https://code.wireshark.org/review/17079
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit dfbfdc4
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Aug 16 12:42:20 2016 +0200
-
-    [H248] Fix Warn Dissector bug, protocol H248, in packet 1: tvbuff.c:532: failed assertion "tvb && tvb->initialized"
-    
-    gcp_analyze_msg() is called with a NULL tvb, remove h248_tvb and use tvb
-    instead.
-    
-    Change-Id: I2cb4c3577817bbaa4ec50b2a5ef0ef296059e683
-    Reviewed-on: https://code.wireshark.org/review/17082
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 13d0d10
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 15 21:04:54 2016 +0200
-
-    QUIC: Add MIDS (Max incoming dynamic streams) Tag
-    
-    Also update link to source code
-    
-    Change-Id: I6512920927de76226137eb7451cceceb37230aa5
-    Reviewed-on: https://code.wireshark.org/review/17070
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2665035
-Author: chrisbontje <cbontje@gmail.com>
-Date:   Mon Aug 15 15:28:48 2016 -0600
-
-    L&G 8979 Dissector - Add new function codes
-    
-    - Added in support for Analog Group Change & Assignment codes (FC 2 and 35)
-    - Modified RTU Configuration function code to support multiple chassis responses
-    
-    Change-Id: I64f14fa3c9b1bdfa3d815eb8756de80fb4c716b4
-    Reviewed-on: https://code.wireshark.org/review/17076
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5ebfbf4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 15 19:25:15 2016 +0200
-
-    extcap: Fix Dereference of null pointer
-    
-    Change-Id: I03098de9bd8684953a4fe024a3e6b604eeecf03f
-    Reviewed-on: https://code.wireshark.org/review/17066
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 4b403b0
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Aug 14 13:49:19 2016 -0700
-
-    Fix UAT escape widths.
-    
-    Pass unsigned values to the %x format specifier so that naming an IO graph
-    
-    你好 TCP Segments
-    
-    doesn't end up saving
-    
-    "\xffffffe4\xffffffbd\xffffffa0\xffffffe5\xffffffa5\xffffffbd TCP Segments"
-    
-    to io_graphs. Fixes https://ask.wireshark.org/questions/54781/statistic-io-graph-add-a-new-graph-if-graph-name-use-chinese-it-will-cause-all-graph-name-garbled
-    
-    Change-Id: I5bcae05ef9b3e17532edbb293f323586c9aeb471
-    Reviewed-on: https://code.wireshark.org/review/17053
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 777061b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 15 18:54:41 2016 +0200
-
-    LLDP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I1d98c3ae79e98349f7d759cce4b93e6a94144743
-    Reviewed-on: https://code.wireshark.org/review/17064
-    Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 7aef32a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 15 19:30:35 2016 +0200
-
-    SCTE35: Add to Makefile (for autofoo)
-    
-    Change-Id: I9eb3cde61ee3a23239211daa9a08730e4f22bade
-    Ping-Bug: 12521
-    Reviewed-on: https://code.wireshark.org/review/17067
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit fab5a74
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Aug 15 19:12:11 2016 +0200
-
-    Exported PDU: dump payload before calling sub dissector
-    
-    This way, the payload is displayed even if the sub dissector triggers an exception
-    
-    Change-Id: Ife062f59035776c4eb9e550eb202a5e40afc4b60
-    Reviewed-on: https://code.wireshark.org/review/17063
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit ede140a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Aug 15 18:36:12 2016 +0200
-
-    Exported PDU: fix a typo
-    
-    While we are at it, let's remove dead code
-    
-    Change-Id: I3a001f07b9becc885d544551a1fa578642517d08
-    Reviewed-on: https://code.wireshark.org/review/17061
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a216e6b
-Author: Binh Trinh <beango@gmail.com>
-Date:   Sun Aug 14 16:31:11 2016 -0400
-
-    GTPv2: Proper decoding of transparent containers for SRVCC PS to CS Request and Response
-    
-    Change-Id: Icc84f8e431b440ac0b0364b9f068905d7a7cbf6b
-    Reviewed-on: https://code.wireshark.org/review/17052
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3119e2f
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sun Aug 14 14:23:07 2016 +0100
-
-    pre-commit: Fix version check to work with git-worktree
-    
-    Change-Id: Ie895ca194738a022cc211ae50afbff0a561156a3
-    Reviewed-on: https://code.wireshark.org/review/17047
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 47fbdc2
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Aug 13 17:45:34 2016 +0100
-
-    Fix unit test location for out of tree autotools build
-    
-    Make it find test programs under the build tree.
-    
-    Change-Id: Ie7ff547417e8f248bb58f6c96896977ca4e710d1
-    Reviewed-on: https://code.wireshark.org/review/17048
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit ba82031
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Aug 15 11:30:56 2016 +0200
-
-    ISIS LSP: fix checksum verification
-    
-    Regression introduced in gad6fc87
-    
-    Bug: 12745
-    Change-Id: I46f8364651c5774544007d9e74ce479904a52e05
-    Reviewed-on: https://code.wireshark.org/review/17059
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0ebaffe
-Author: Ben Stewart <bst@google.com>
-Date:   Wed May 25 14:36:51 2016 -0700
-
-    Implement support for SCTE-35 switching messages.
-    
-    This module implements a dissector for the main table in a SCTE-35 message, a
-    splice_info_section. This payload is carried in a MPEG Section Table with a
-    table ID of 0xFC. PIDs carrying this sort of table are also noted in the PMT
-    with a stream type of 0x86, and a registration descriptor with fourcc 'CUEI'.
-    
-    The various splice command types are implemented in separate modules, and are
-    linked to this dissector through the field scte35.splice_command_type. Field
-    names follow the conventions documented in the SCTE35 specification.
-    
-    This dissector does not support encrypted SCTE35 messages, other than
-    indication through the scte35.encrypted_packet flag.
-    
-    The SCTE-35 protocol is described by the Society of Cable Telecommunications
-    Engineers at <https://www.scte.org/documents/pdf/Standards/Top%20Ten/ANSI_SCTE%2035%202013.pdf>.
-    
-    Bug: 12521
-    Change-Id: I3113e6e61a4e7f1a4a932a0128ca2846c7ce6e6f
-    Reviewed-on: https://code.wireshark.org/review/15562
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a5166af
-Author: Holger Pfrommer <hpfrommer@hilscher.com>
-Date:   Fri Jul 22 14:27:15 2016 +0200
-
-    netanalyzer: add dissection of new header version 2 fields
-    
-    Change-Id: I552d8be0fdf3f0949d469e66c27be37ec82c5ccf
-    Reviewed-on: https://code.wireshark.org/review/16584
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e3009b0
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Aug 8 16:48:14 2016 +0100
-
-    checklicenses: Fix a FIXME
-    
-    We do not whitelist GPLv2 only code because of the
-    incompatibility with GPLv3.
-    
-    Move the path exception to its proper place. These files are
-    dual-licensed in the sense of "choose one or the other", not
-    "both licenses are in use".
-    
-    If the exception becomes unnecessary later it can be removed,
-    but let's get rid of the FIXME until then.
-    
-    Change-Id: Ia040284b72c2ff6588b0544896cc37ae19a61613
-    Reviewed-on: https://code.wireshark.org/review/16957
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit b1cbeee
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Aug 14 08:10:25 2016 -0700
-
-    [Automatic update for 2016-08-14]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: If8420fce59c29f34d667fde83513030703600aba
-    Reviewed-on: https://code.wireshark.org/review/17049
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 94c4329
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Aug 10 23:41:37 2016 +0200
-
-    make-version.pl: make it work with git worktrees
-    
-    When using git worktrees, the .git file is a regular file pointing to
-    the original git repository. Accept this case too. Also ignore the fact
-    that the original repo could be a git-svn repo, that is very unlikely.
-    
-    Example workflow (requires git 2.5):
-    
-        # Assume work in progress in current tree. Goal is to quickly do a
-        # fix in another branch and publish the changes without interfering
-        # with the WIP and without marking all files out of date (which
-        # slows down re-compilation).
-        git worktree add /tmp/wireshark-2.2 master-2.2
-        pushd /tmp/wireshark-2.2        # go to temporary tree
-        git cherry-pick -x COMMIT       # backport the fix
-        git review                      # submit for review
-        popd                            # go back to original tree
-        rm -rf /tmp/wireshark-2.2 && git worktree prune     # cleanup
-        # now continue working where you left work
-    
-    Change-Id: Iba3c723142d9cbd8b07e76647594b5699ecafc67
-    Reviewed-on: https://code.wireshark.org/review/17002
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f1dc6cb
-Author: Priyanka Mondal <priyanka02010@gmail.com>
-Date:   Thu Aug 11 17:07:35 2016 +0530
-
-    nstrace: Modified the nstrace dissector to dissect the tcp debug2, tcp cc, httpinfo
-    and trcdbg records.
-    
-    bug: 12685
-    Change-Id: I5e224c38c52d7b6635fba1334d9e310ce1eaea23
-    Reviewed-on: https://code.wireshark.org/review/16338
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2a73658
-Author: Binh Trinh <beango@gmail.com>
-Date:   Sun Aug 14 00:16:50 2016 -0400
-
-    RANAP:  fix TargetRNC-ToSourceRNC-TransparentContainer decode
-    
-    Change-Id: Iadf712b6bad75faeade00ebd1f6bb2cb2013065b
-    Reviewed-on: https://code.wireshark.org/review/17044
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7c66a6b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Aug 13 20:41:55 2016 -0400
-
-    dcerpc: Check dissect_ndr_ucvarray_core when looping over elements that we're incrementing offset.
-    
-    Bug: 12720
-    Change-Id: Ib9c9eb2e60c35b23b4c6b4898b036bcdc442fc84
-    Reviewed-on: https://code.wireshark.org/review/17041
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c0f24bd
+commit efb35a2
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Aug 13 16:41:54 2016 -0700
-
-    Allocate all the wmem maps with epan scope.
-    
-    That doesn't seem to affect the performance negatively (or
-    positively...) to any noticeable degree with my simple "run tshark under
-    the time command with an empty file" tests, and it does appear to reduce
-    the amount of memory that valgrind thinks is leaked.
-    
-    All the other maps were already allocated with epan scope, so do that
-    with these as well.
-    
-    Change-Id: Ib5ee85c8cf025e53455564a67cd1adbf28b47f78
-    Ping-Bug: 12656
-    Reviewed-on: https://code.wireshark.org/review/17040
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 631139b
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sat Aug 13 21:53:53 2016 +0200
-
-    LLDP: Add Avaya IP Phone OUI Subtypes
-    
-    Used https://downloads.avaya.com/elmodocs2/one-X_Deskphone_Edition/R1.5/output/16_300698_4/admn0711.html
-    as reference for the subtypes.
-    
-    Bug: 12740
-    Change-Id: Ia9084bca3ab07e484c1d074a2cdf6072b8a3dfa0
-    Reviewed-on: https://code.wireshark.org/review/17039
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c7e4560
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Aug 10 22:54:58 2016 +0200
-
-    asciidoc.conf, sort-and-group: remove "and" if we have only one element
-    
-    --sort-and-group--
-    One
-    --sort-and-group--
-    
-    used to be converted into
-    
-    and One
-    
-    Remove the leading and in this case.
-    
-    Change-Id: I3332b316c4fcce164c94e36c3c7b4480947bdf68
-    Reviewed-on: https://code.wireshark.org/review/17003
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 854793d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Aug 12 12:29:28 2016 +0200
-
-    jxta: remove dead code (CID 1159018).
-    
-    Check already present in line 1226.
-    
-    Change-Id: I2b3cd15a1d35b334a690afd3ce1a9b8b1f32e188
-    Reviewed-on: https://code.wireshark.org/review/17029
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 620f572
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Aug 11 23:30:06 2016 +0200
-
-    netlink: fully dissect NLA Type, add length restriction
-    
-    NLA types consist of a type and two flags, add new fields for this.
-    
-    Add a new parameter to restrict the data consumed by the
-    dissect_netlink_attributes function, this is needed when implementing
-    nested attributes using another call to this function. This also avoids
-    adding padding to the payload and matches the comment in
-    include/uapi/linux/netlink.h (Linux 4.7).
-    
-    Change-Id: I34dbfa466081b6c6c4580941aff568bd120b4210
-    Reviewed-on: https://code.wireshark.org/review/17030
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5ae7076
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sat Aug 13 13:41:06 2016 +0200
-
-    OUI: Add 0x000142 Cisco to oui_vals
-    
-    The LLDP dissector is using oui_vals to resolve OUIs for hf_org_spc_oui.
-    Therefore it currently shows "Unknown" for OUI 0x000142.
-    
-    Change-Id: Ie5f926a183dc42a957fb05c5a38d677a2064ff28
-    Reviewed-on: https://code.wireshark.org/review/17036
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cf6aa84
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Aug 12 08:37:58 2016 +0200
-
-    IEEE 802.11: fix dissection of PLMN Information IE
-    
-    According to 3GPP 24.302 annex H, it uses little endian encoding
-    
-    Change-Id: Ia764e0bb16f8bb197214109e40b1f4c5079ec654
-    Reviewed-on: https://code.wireshark.org/review/17026
-    Reviewed-by: Adrian Granados <adrian@adriangranados.com>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f0befed
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Aug 11 17:48:57 2016 +0200
-
-    bgp: remove dead code (CID 1228878).
-    
-    afi can take only one of the 2 above values, according to the
-    check at the beginning of the function.
-    
-    Change-Id: I6652a5c64b4fbc8d2e907afb3b4f66d187ff9745
-    Reviewed-on: https://code.wireshark.org/review/17011
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 667a4fc
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Aug 12 12:08:10 2016 +0200
-
-    ssh: remove unneded check (CID 1215243).
-    
-    Change-Id: I92d5dcf0fb50324d5adfcf0759be694b4037b8e3
-    Reviewed-on: https://code.wireshark.org/review/17028
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d0fad45
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Aug 11 17:57:25 2016 +0200
-
-    btle: Improved packet header display
-    
-    Show elements in correct order.
-    Show TxAdd and RxAdd values as "Random" or "Public".
-    
-    Change-Id: Ie75716d05d2aadf3d573a9dc078f32e6f981a691
-    Reviewed-on: https://code.wireshark.org/review/17012
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 00f631f
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Aug 11 18:02:08 2016 +0200
-
-    btle: No expert info for correct CRC
-    
-    We don't usually use expert info when checksum is correct.
-    
-    Change-Id: Ifc0e020ea86d69330df8cdb625672fbc9b4269ae
-    Reviewed-on: https://code.wireshark.org/review/17013
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 259a174
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Aug 11 16:00:54 2016 +0200
-
-    [S1AP] Fix copy-paste error.
-    
-    Change-Id: Id75d95c8d9cfdc5982bccefb9d4ece77cee871e3
-    Reviewed-on: https://code.wireshark.org/review/17010
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8260ec1
-Author: Michael Tuexen <tuexen@wireshark.org>
-Date:   Thu Aug 11 15:32:21 2016 +0200
-
-    Fix sa_len detection on FreeBSD.
-    
-    FreeBSD requires socket.h to be included when testing if struct
-    sockaddr contains sa_len.
-    
-    Change-Id: Ibe18a88ce19a4e8487bb00d7fa822a380ec8c98d
-    Reviewed-on: https://code.wireshark.org/review/17008
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
-
-commit 1dfa478
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Aug 11 15:30:46 2016 +0200
-
-    [Diameter] Add two LCS AVPs
-    
-    Change-Id: Ia649a3c88116745b77ae2ffeb243730d3dd13146
-    Reviewed-on: https://code.wireshark.org/review/17007
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b7515b3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Aug 9 15:40:58 2016 +0200
-
-    androiddump: use socklen_t (32bit) instead of gssize (64bit) (CID 1293384).
-    
-    Change-Id: Ia5b7bc190eb8af509a880bb23bc0879a2dcfd39c
-    Reviewed-on: https://code.wireshark.org/review/16972
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 1d7688c
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Aug 9 15:10:38 2016 +0200
-
-    [S1AP] Update S1AP to Release 13.3.0
-    
-    Change-Id: I0992f429de7812ea82809e0b63f534b44e7b6aee
-    Reviewed-on: https://code.wireshark.org/review/17006
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 77b1e4e
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Aug 11 12:41:36 2016 +0200
-
-    [LCS-AP] Update to Release V13.2.0 (2016-03)
-    
-    Change-Id: I4f955d2d80b987d76fec48ee8722b2822e958b29
-    Reviewed-on: https://code.wireshark.org/review/17005
-    Tested-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 561a2f0
-Author: Mirko Parthey <mirko.parthey@web.de>
-Date:   Tue Jul 19 00:43:19 2016 +0200
+Date:   Fri Jun 9 15:04:32 2017 -0700
 
-    Fix IKEv1 decryption and initialization vectors
-    
-    Generate initialization vectors during Wireshark's first pass,
-    in order to improve reliability and efficiency. (bug #12699)
-    Remove a dissection shortcut in first pass to allow early analysis
-    of the transform payloads, which is needed to find out the crypto
-    algorithms.
-    
-    Introduce a hash table to store an IV per message ID. (bug #12610)
-    Fix handling of the initial phase 1 IV. (bug #12620)
-    Cache IVs as per-packet data instead of a list.
-    
-    Use the wmem allocator to avoid memory leaks.
-    Ensure libgcrypt resource cleanup on error paths.
-    
-    Rely only on IKE attributes to find the decryption algorithm,
-    do not consider the length of the user-configured secret at this point.
-    
-    Split code into small functions.
+    Handle filter open and read errors better.
     
-    Ping-Bug: 12610
-    Ping-Bug: 12620
-    Ping-Bug: 12699
-    Change-Id: I7137943da42d54816808312cd1716a7e05478cbb
-    Reviewed-on: https://code.wireshark.org/review/16846
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d13f1b0
-Author: Devin Heitmueller <dheitmueller@kernellabs.com>
-Date:   Mon Jul 25 23:41:55 2016 -0400
-
-    Add support for PMT parsing of ATSC A/52 Audio stream type and AC-3 descriptor
+    If the user's color filter file exists but can't be opened, fail and
+    return a failure indication.
     
-    The ATSC A/52 specification introduces a new PMT stream type, as
-    well as a new descriptor if the A/52 stream contains AC-3 audio.
-    
-    Add dissection for both.
-    
-    Change-Id: I859c76cc4fc6550c72711f00582e6bfa12607fa2
-    Reviewed-on: https://code.wireshark.org/review/16679
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e2b2d98
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Wed Aug 3 23:59:48 2016 +0200
-
-    UFTP: Add dissector for Encrypted UDP based FTP with multicast
-    
-    See http://uftp-multicast.sourceforge.net/ for the original publication
-    of these dissectors. Both v3 and v4 protocols are dissected.
-    
-    Bug: 12718
-    Change-Id: If691a573b9440c7cbe3b35711231b628cf3c8604
-    Reviewed-on: https://code.wireshark.org/review/16936
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ba71ac0
-Author: Piotr Pawłowski <ppiotru@gmail.com>
-Date:   Wed Aug 10 20:31:05 2016 +0200
-
-    Enhance Bluetooth LE commands parsing
-    
-    This patch adds parsing to some missing LE commands
-    Change-Id: Ia22197a7855505e96021536a333b401a45480145
-    Reviewed-on: https://code.wireshark.org/review/16995
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 91abbb3
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 10 09:53:46 2016 +0200
-
-    ethercat: fix check for SdoControl (CID 1256520).
-    
-    Change-Id: I6a24974b41f9abee32e3a170b607062bf80f3368
-    Reviewed-on: https://code.wireshark.org/review/16990
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1396f6a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Aug 8 23:43:24 2016 +0200
-
-    qnet6: fix display of MAC addresses and avoid overflow
-    
-    The MAC address is binary data, do not use tvb_get_string_enc since it
-    substituted some bytes by a Unicode replacement character. Use FT_ETHER
-    instead of FT_STRING to fix the display.
-    
-    Bug: 11850
-    Change-Id: I3f02cfa13e8fccc18a199e4e293580c183eeddd1
-    Reviewed-on: https://code.wireshark.org/review/16965
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a7685dd
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sat Aug 6 14:36:18 2016 +0200
-
-    docbook: add tip about recommended Qt version.
+    If it doesn't exist, just try reading the global color filter file.
     
-    Change-Id: I25d3e914c9210ca79313f6ea8b82bc7280d5c095
-    Reviewed-on: https://code.wireshark.org/review/16924
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 89fc02b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 9 22:11:12 2016 -0700
-
-    Remove unneeded include.
+    If *that* exists but can't be opened, fail and return a failure
+    indication; if it doesn't exist, don't treat that as an error.
     
-    Change-Id: Ica3f97d276332f7c54b192157c26995481508818
-    Reviewed-on: https://code.wireshark.org/review/16988
+    Change-Id: I5ebdc0eb1ada3cc190990be9228639304f32147e
+    Reviewed-on: https://code.wireshark.org/review/22054
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit ad4e81fcf869680b057651970fba38690e82c87d)
+    Reviewed-on: https://code.wireshark.org/review/22056
 
-commit 03214b7
+commit cc4c80d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 9 22:02:08 2016 -0700
+Date:   Fri Jun 9 13:19:09 2017 -0700
 
-    Remove unneeded include.
+    Add URL for link specifying D-Bus maximum message length.
     
-    Change-Id: I9c55152ca43cd2c25916fe0ed4e41dee9d2377a8
-    Reviewed-on: https://code.wireshark.org/review/16987
+    Change-Id: I5797407a18fda674b2c9b2cc1c192c211c91c496
+    Reviewed-on: https://code.wireshark.org/review/22052
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit ed7e9c77db9a4a7306abfc3935a84f49a9a96ee4)
+    Reviewed-on: https://code.wireshark.org/review/22053
 
-commit 02674fa
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 8 20:12:01 2016 +0200
-
-    QUIC: Fix dissection of ACK frame with Q034
-    
-    The ACK Frame is different after Q034
-    
-    Change-Id: Ib7a14ea20c37743c5af029b2bc38abc2377cc0e7
-    Ping-Bug:12590
-    Reviewed-on: https://code.wireshark.org/review/16960
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 896355d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Aug 9 15:54:58 2016 +0200
-
-    ansi_a: remove unneeded check (CID 1158564).
-    
-    Upper bits are masked, making check always true.
-    
-    Change-Id: I5860d549aedce9b2399145ebbed690178acf1446
-    Reviewed-on: https://code.wireshark.org/review/16973
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3b557f6
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Aug 9 17:16:48 2016 +0200
-
-    wccp: fix bitwise operations (CID 1312144 & 1312145).
-    
-    Change-Id: I62cdb1eb7c62ab09bd43d0e0760bdedb4b1725c8
-    Reviewed-on: https://code.wireshark.org/review/16976
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9ac3aad
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Aug 9 21:59:30 2016 +0200
-
-    nordic_ble: Add a subtree for flags
-    
-    Change-Id: Ifb829280ca02a20a4466e7059a76a5bf3cbe4107
-    Reviewed-on: https://code.wireshark.org/review/16985
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b66a85e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Aug 9 21:55:15 2016 +0200
-
-    btle: Renamed Message fragments to L2CAP fragments
-    
-    The already used terminology is L2CAP fragments.
-    
-    Change-Id: I900f5fed479e53c3a23154caa3b8a569c58dbb20
-    Reviewed-on: https://code.wireshark.org/review/16984
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c7942b4
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Aug 9 21:51:16 2016 +0200
+commit 2931ba8
+Author: Simon Barber <simon.barber@meraki.net>
+Date:   Wed Jun 7 12:06:26 2017 -0700
 
-    btl2cap: Renamed Message fragments to SDU fragments
+    ieee80211-radio: Fix calculation of frame start time
     
-    The payload in L2CAP is called SDU (Service Data Unit).
+    With captures where TSF indicates the end of the frame the
+    preamble was being counted twice in the calculation of the start.
     
-    Change-Id: Ie18c6ef4a68f44a4099db518c50f6f9774470476
-    Reviewed-on: https://code.wireshark.org/review/16983
+    Change-Id: I3d042d8ea3bc46a833438cb3d2f75e3499a7711d
+    Reviewed-on: https://code.wireshark.org/review/22020
     Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2227c26
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Aug 9 21:35:38 2016 +0200
-
-    Windows: upgrade Lua library to 5.2.4
-    
-    Change-Id: Ib0a4afc9b6143cf5ff78f72f0808f9f804549dd9
-    Reviewed-on: https://code.wireshark.org/review/16979
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e812c0e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 9 12:48:49 2016 -0700
-
-    Update to Lua 5.2.4.
-    
-    Change-Id: Icadf4001799a58c5bc686caff4ffa99289bf08a8
-    Reviewed-on: https://code.wireshark.org/review/16980
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 80af5ed
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Aug 9 18:29:00 2016 +0200
-
-    Display Lua release version in about dialog
-    
-    It allows to have more info on the version used (for ex 5.2.4 instead of 5.2)
-    
-    Change-Id: I24a5b83f0a7a72fbb131e9ddc3e735ffea689ee6
-    Reviewed-on: https://code.wireshark.org/review/16977
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e53ec24
-Author: Daniel Willmann <dwillmann@sysmocom.de>
-Date:   Tue Jul 12 20:25:34 2016 +0200
-
-    packet-rsl: Track RTP pt and codec for rsl
-    
-    Save the RTP payload type and codec and add a dynamic payload. This allows AMR
-    streams to be correctly analyzed. Together with the AMR codec support you can
-    listen to the AMR stream as well.
-    
-    Sponsored-by: On-Waves ehf
-    Change-Id: If859fd3707b5aa1c9743830f903abe8e1f12ff95
-    Reviewed-on: https://code.wireshark.org/review/16352
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 38949ed
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Aug 9 16:02:54 2016 +0200
-
-    [BTL2CAP] Reassemble LE messages.
-    
-    Change-Id: Ie11f43741086d015e52d977d4ffc31a3cd5a731a
-    Reviewed-on: https://code.wireshark.org/review/16974
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b669ca7
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Aug 7 19:09:17 2016 +0200
-
-    androiddump: fix bug in socket retry (CID 1293391).
-    
-    Change-Id: I61914d208e984d202506cdc885493e841e929990
-    Reviewed-on: https://code.wireshark.org/review/16948
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 7596268
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 8 23:11:04 2016 +0200
-
-    QUIC: Fix typo on diversification nonce display field name
-    
-    Change-Id: I11455fba1ebc981e3f3865469a6cb537b3cdc11f
-    Reviewed-on: https://code.wireshark.org/review/16964
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9f72f9e
-Author: Günther Deschner <gd@samba.org>
-Date:   Sat Aug 6 10:14:24 2016 -0400
-
-    add clusapi (Windows Cluster Management API) from Samba git tree.
-    
-    We avoid compiling clusapi_PROPERTY_LIST using pidl.
-    
-    This struct contains inline arrays and is not strictly needed by clusapi
-    therefor disable it.
-    
-    Change-Id: I86efa0c725667083cb252e5df3bfc69118df3059
-    Signed-off-by: Günther Deschner <gd@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/16719
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ba70b88
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Aug 8 22:37:55 2016 +0100
-
-    checklicenses: Remove whitelisted licenses not being used
-    
-    Removed a few licenses we shouldn't use (Apache v2, BSD 4-clause) and
-    removed many others not currently being used. (Add on a need-to basis).
-    
-    Added GPLv3+ with Bison exception to licensecheck.pl.
-    
-    Also removed some crud to work around bugs for older licensecheck.pl versions.
-    
-    The original list came from the chromium project, which has a BSD-like license,
-    and many more licenses in use, not all of them vetted for GPLv2+ compatibility.
-    
-    Change-Id: I67f334f21cd94904cf8a0e5d9beb659c82437df4
-    Reviewed-on: https://code.wireshark.org/review/16966
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 8a141fe
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Aug 8 19:13:11 2016 -0700
-
-    Use -r rather than -i for the "via stdin" tests.
-    
-    TShark, at least when running in one-pass mode, now supports reading
-    from the standard input if the file format is one that *can* be read
-    purely sequentially; both pcap and pcapng can be read purely
-    sequentially (unlike, for example, Microsoft Network Monitor format,
-    where you have to read the frame table, at the end of the file, before
-    you can read the frames, meaning you have to seek backwards, which you
-    can't do on a pipe).
-    
-    Using -r 1) tests the "read from standard input" path, which we should
-    do in versions that support it, and 2) means we can check whether, for
-    the crashes we're seeing on 32-bit Windows 8.1, it's a problem with
-    reading from the standard input in general, or just a problem with
-    *capturing* from the standard input.
-    
-    Change-Id: I67da34de43f47dd8c63fa2f2072be41148cfe5a7
-    Reviewed-on: https://code.wireshark.org/review/16968
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5cfb33f
-Author: Sander Steffann <sander@steffann.nl>
-Date:   Mon Aug 8 15:24:17 2016 +0200
-
-    DHCPv6: Update Options Codes
-    
-    From http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.txt (2016-06-16)
-    
-    Change-Id: I03fbcdea0a15e792c51aa514eca73aa68350f8ff
-    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/16953
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 81f97a9
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Aug 4 09:51:32 2016 +0200
-
-    debian-setup: add customized profiles.
-    
-    libcap-dev has also been added to optional list.
-    
-    Change-Id: I52e034603922b694391a30c20316e1a2011fc3b6
-    Reviewed-on: https://code.wireshark.org/review/16872
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-
-commit 568d6f3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Aug 8 15:55:02 2016 +0200
-
-    DHCPv6: Update Status codes
-    
-    From http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.txt (2016-06-16)
-    
-    Change-Id: I4f07ff2f3782b72a90a2ca65ff49ca87c0163c41
-    Reviewed-on: https://code.wireshark.org/review/16954
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 57fb1ab
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Aug 8 18:23:43 2016 +0200
-
-    [BTLE] Dissect LE Information frame.
-    
-    Change-Id: Id4411526eef895fc0130108457866892216d5b03
-    Reviewed-on: https://code.wireshark.org/review/16958
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ffbb822
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Aug 8 19:27:38 2016 +0200
-
-    nordic-ble: Capitalize header field names.
-    
-    Change-Id: Ib114b2bad01f768eb7eba4115441d58aadc1b34e
-    Reviewed-on: https://code.wireshark.org/review/16959
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 33456f48ac9a3842e1eda8e179ae9d8bd4c33140)
+    Reviewed-on: https://code.wireshark.org/review/22050
 
-commit b4ad8c9
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Aug 7 18:30:18 2016 +0200
-
-    Qt: remove default value from call (CID 1311959).
-    
-    Change-Id: Ibefdf91269081ab11c7dd62b1b72e0e9a41502ff
-    Reviewed-on: https://code.wireshark.org/review/16947
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f2bee8d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Aug 8 14:31:47 2016 +0200
-
-    lbmr: restore removed code.
-    
-    Code was removed in 975b02f879ca1407f40fdf5c3b446edcaa5171a2 but is still needed.
-    This fixes CID 1250810.
-    
-    Change-Id: Ic0df5043c4486417e93d431898ff1493eb027b1c
-    Reviewed-on: https://code.wireshark.org/review/16950
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 40e6017
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Aug 5 16:41:25 2016 +0200
-
-    [BTLE] Implement reassembly of BTLE messages.
-    
-    Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99
-    Reviewed-on: https://code.wireshark.org/review/16901
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d62c497
-Author: Maka0 <Maka0@yurei.net>
-Date:   Fri Aug 5 06:54:32 2016 -0400
-
-    Updated dictionary.ruckus to include additional radius attributes
-    
-    Change-Id: I36e64ba198b251dc68d40609c9fdda86ea811096
-    Reviewed-on: https://code.wireshark.org/review/16896
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a683f28
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Aug 7 23:02:44 2016 +0200
-
-    corosync-totemnet: remove dead code (CID 1223483).
-    
-    Change-Id: I83aaeca7d000a5e328e0aded38093adc45a9d315
-    Reviewed-on: https://code.wireshark.org/review/16951
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 8025b01
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Aug 7 18:17:07 2016 +0200
-
-    Qt: remove obsolete members (CID 1159364).
-    
-    Change-Id: Ic5c1e472d130a122333bfb26f1e7cde25db6ac8f
-    Reviewed-on: https://code.wireshark.org/review/16945
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 1767e08
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Aug 7 01:03:17 2016 +0200
-
-    netlink-netfilter: add NFQUEUE dissection
-    
-    Update fields to Linux 4.7, add dissection for most important NFQUEUE
-    structures and attributes. The shared Netfilter header is also dissected
-    here (except when the NFLOG subdissector is called). Based on the source
-    code of Linux and libnl, it seems that most (all?) fields are big
-    endian.
-    
-    Tested with netlink.pcap and netlink-nflog.pcap from the SampleCaptures
-    wiki page.
-    
-    Change-Id: I93bb8e528fdd2575acdae31a17b9b62aaa90fdbc
-    Reviewed-on: https://code.wireshark.org/review/16933
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f3b15ab
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Aug 7 21:44:51 2016 +0200
-
-    gtk: add assert (CID 1159169).
-    
-    Change-Id: I365bdbc49fe50b6442fd01f56cc7ffdda972585c
-    Reviewed-on: https://code.wireshark.org/review/16949
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ef8098c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Aug 6 16:42:19 2016 +0200
-
-    netlink: dissect errors and more flags, improve display and help
-    
-    Print "Protocol-specific" instead of "Unknown (0x0016)" for the type
-    since its interpretation depend on the subprotocol.
-    
-    Dissect struct nlmsgerr (refactor and reuse the header dissection code).
-    Dissect Dump interrupted and Dump filtered flags.
-    
-    Adjust field descriptions and value_string based on the netlink(7)
-    manual and linux/netlink.h. Display Flags as hex instead of decimal.
-    Expanded inline tabs, renamed netlink.hdr_flags.match_all to
-    netlink.hdr_flags.match for consistency.
-    
-    Change-Id: If2b5c8d2b68fd94e70d1d8b98e63171b42b0d65c
-    Reviewed-on: https://code.wireshark.org/review/16932
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit bad783b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Aug 7 18:27:40 2016 +0200
-
-    Qt: add initializers (CID 1328485).
-    
-    Change-Id: I9135dabc3f656ac17f6269221f795a5dda7552af
-    Reviewed-on: https://code.wireshark.org/review/16946
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3130488
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Aug 7 08:08:09 2016 -0700
-
-    [Automatic update for 2016-08-07]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: I538e387ddbd546f62fd73381fc068b09dad61822
-    Reviewed-on: https://code.wireshark.org/review/16941
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 1ea6b4f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Aug 7 12:58:59 2016 +0200
-
-    prefs: fix crash with -o column.foo:x
-    
-    The gui.column module is somehow special, it has no name since it is
-    part of the gui module. This causes a crash when trying to invoke
-    `strcmp(module->name /* NULL */, "mgcp")`.
-    
-    Always look up prefs inside gui_column_module when the given prefs
-    module is "column" instead of matching two specific names.
-    
-    Change-Id: I47e354d11b6fd01818b0627a249b506a8f9510cc
-    Reviewed-on: https://code.wireshark.org/review/16937
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 2a80b40
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Aug 6 16:08:09 2016 +0200
-
-    netlink-route: decode more items (sync with Linux 4.7)
-    
-    Based on inspection of the Linux 4.7 source code. Replaced tabs by
-    spaces in enums and value_strings for consistency.
-    
-    Change-Id: I78b5de53b53dc3f2a7c807a72d8d94880f6406d5
-    Reviewed-on: https://code.wireshark.org/review/16931
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 600eca1
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Aug 6 22:45:19 2016 -0400
-
-    Allow up to 64-bit values to use BASE_RANGE_STRING.
-    
-    Change-Id: Iea69b5ef533b9b524a624b96bf82e178fd428ce9
-    Reviewed-on: https://code.wireshark.org/review/16934
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 66711eb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Aug 6 20:07:04 2016 -0700
-
-    Avoid colliding with the (old) UNIX stime() system call.
-    
-    Rename "stime" to "sys_time", and, for consistency, do the same with
-    "utime".  This failed when I tried a build on an Ubuntu 12.04 LTS
-    machine.
-    
-    Change-Id: Ib955b723506346aa742db0de4d26dc157bcd4fc8
-    Reviewed-on: https://code.wireshark.org/review/16935
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e32890a
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Aug 6 20:09:15 2016 +0100
-
-    checklicenses.py: Remove some boilerplate from upstream
-    
-    Change-Id: If8a1537fe5ad0c5decaf2facf6fd0c43b32ffe70
-    Reviewed-on: https://code.wireshark.org/review/16930
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 57be744
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Aug 5 20:49:33 2016 +0100
-
-    Add licensecheck.pl to our /tools directory and use it
-    
-    Source: https://anonscm.debian.org/cgit/collab-maint/devscripts.git/plain/scripts/licensecheck.pl?h=v2.16.2
-    
-    Removed regex to check files without an extension.
-    
-    Change-Id: Icf98d0da2d201731da7134799ead0d2dc5c3fc39
-    Reviewed-on: https://code.wireshark.org/review/16913
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 77c41eb
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Aug 6 19:52:00 2016 +0200
-
-    ios15765: tree is used, remove the _U_
-    
-    Change-Id: Id7fb231fe820308641c09add22dde131757b9e92
-    Reviewed-on: https://code.wireshark.org/review/16929
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 6e3ebcc
-Author: Günther Deschner <gd@samba.org>
-Date:   Mon Sep 28 07:28:28 2015 +0200
-
-    tools/pidl: support HRESULT as return code in wireshark autogenerated dissectors.
-    
-    Guenther
-    
-    Change-Id: I68b7c579c5a519e429d2f4c2b3f63247e02f24e3
-    Signed-off-by: Günther Deschner <gd@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/16718
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 29cc181
-Author: Günther Deschner <gd@samba.org>
-Date:   Wed May 11 15:41:02 2016 +0200
-
-    tools/pidl: Keep case from fieldnames.
-    
-    Change-Id: I5626cfa0487cc88eb65cc349c05ae1762bc953f4
-    Signed-off-by: Guenther Deschner <gd@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/16720
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3bbbfd0
-Author: Günther Deschner <gd@samba.org>
-Date:   Mon Sep 28 07:30:07 2015 +0200
-
-    Add support for Windows HRESULT error codes for DCE/RPC
-    
-    Change-Id: I013549978743740b04b89b5592e63edae5ff3fe4
-    Signed-off-by: Günther Deschner <gd@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/16717
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0ceff86
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Aug 4 19:39:30 2016 +0100
-
-    test.sh: Don't abort on failed test
-    
-    This behavior severely limits the usefulness of the test suite. An option
-    to configure it would still be nice.
-    
-    Change-Id: I2bc96a043cc4ec76f334a3bfe48967703ef1be5e
-    Reviewed-on: https://code.wireshark.org/review/16890
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 86bf035
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Aug 4 09:49:45 2016 -0700
-
-    Remove old Qt code.
-    
-    Our minimum version has been 4.7 for a while. Remove dead
-    QT_VERSION_CHECK code.
-    
-    Change-Id: Ia003c1aa4275eefdda707975774d886643ff1538
-    Reviewed-on: https://code.wireshark.org/review/16888
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0eee62a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Aug 5 15:39:26 2016 -0700
-
-    CMake: Look for vcredist_x??.exe in more places.
-    
-    Look for the redistributable installer in the project library directory
-    before %VCINSTALLDIR%. This lets us ship a specific version of the
-    redistributable.
-    
-    Change-Id: I70e5aa90ac5addba5355d1964aeb50e277d1a8d4
-    Ping-Bug: 12712
-    Reviewed-on: https://code.wireshark.org/review/16922
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b626ad1
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Aug 5 22:20:28 2016 +0200
-
-    extcap: move defines from sshdump & ciscodump to ssh-base.
-    
-    Change-Id: I51769e2427b0119aefe57ebcc08406434ffbfead
-    Reviewed-on: https://code.wireshark.org/review/16918
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 37649c4
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Aug 5 22:00:05 2016 +0200
-
-    doc: fix typos.
-    
-    Change-Id: Id34affcb33c00e224dafbccc347b1d91b9e74c8d
-    Reviewed-on: https://code.wireshark.org/review/16914
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d1847f0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Aug 5 13:24:26 2016 -0700
-
-    Update FSF address.
-    
-    Change-Id: I2a36a833f00f4acda253e5741c96c519588aa046
-    Reviewed-on: https://code.wireshark.org/review/16919
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d1f0ffd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Aug 5 13:16:07 2016 -0700
-
-    Fix FSF address.
-    
-    Change-Id: Icf473af9487e60003813435f18551225224c6d58
-    Reviewed-on: https://code.wireshark.org/review/16915
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 704c12a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Aug 5 16:11:23 2016 +0200
-
-    docbook: fix typos.
-    
-    Change-Id: If94a1427d91a5de2f5f2308be454479e6b4d8d5a
-    Reviewed-on: https://code.wireshark.org/review/16900
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 746e049
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Aug 5 11:24:01 2016 -0700
-
-    Fix copyright.
-    
-    I'd just copied and pasted the copyright notice from test/test.sh; Ulf
-    wrote test/test.sh, but didn't write test/run_and_catch_crashes - I did,
-    but, hey, might as well give the copyright to Gerald.  Fix the date as
-    well.
-    
-    Change-Id: Id307f354289ca72931dd83f472d879d733618e3c
-    Reviewed-on: https://code.wireshark.org/review/16910
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fd00a4a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Aug 5 11:20:37 2016 -0700
-
-    Add copyright notices.
-    
-    Change-Id: I481968f154008d62c124ca6f71d6cc0114c293c1
-    Reviewed-on: https://code.wireshark.org/review/16907
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 73c7cc6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Aug 5 11:13:55 2016 -0700
-
-    Put the usual copyright notice on test/run_and_catch_crashes.
-    
-    Change-Id: I397e5483baa79b5bf043d746aabab6c54499fabc
-    Reviewed-on: https://code.wireshark.org/review/16903
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 78ef23f
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Aug 5 13:37:39 2016 +0100
-
-    checklicenses.py: Whitelist some plaintext files without license requirements
-    
-    Change-Id: I029ef1d52ac6edd44c0bac41adb86361ddd94272
-    Reviewed-on: https://code.wireshark.org/review/16898
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 917d34c
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Jul 29 15:00:56 2016 +0100
-
-    Add PI_DEPRECATED expert info group
-    
-    Change-Id: Ibc43b1976d5827e8c40252a5200852fbcd00b70c
-    Reviewed-on: https://code.wireshark.org/review/16763
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit be16ff5
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Mon Aug 1 08:34:01 2016 +0200
-
-    gsm_abis_om2000: Dissect "Reason Code" and "Result Code"
-    
-    Change-Id: Ie2495b6333b021de53c674ca8bdad0712228a7c1
-    Reviewed-on: https://code.wireshark.org/review/16820
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e6e0a90
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sun Jul 31 17:59:25 2016 +0200
-
-    gsm_abis_om2000: Decode "Attribute ID" Information Element
-    
-    The "Attribute ID" IE is used by the RBS to indicate which particular
-    setting has caused it to reject a given request by the BSC.
-    
-    Change-Id: I05621831f70fb53b5b752afceed9337f6cd0edb7
-    Reviewed-on: https://code.wireshark.org/review/16819
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c02e3e7
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Aug 5 11:16:15 2016 +0200
-
-    [Diameter] Dissect RX Feature list.
-    
-    Change-Id: I64fc582bb9330402c18aeeadea52c968032ccb2c
-    Reviewed-on: https://code.wireshark.org/review/16895
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f5af708
-Author: Yann Diorcet <yann@diorcet.fr>
-Date:   Sat Jul 16 09:54:23 2016 +0200
-
-    Add UDS dissector
-    
-    Change-Id: Icc9b6c6bcaac1f3056fa83a4ae9ef66e1537b1a5
-    Reviewed-on: https://code.wireshark.org/review/16492
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 333ba80
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Thu Aug 4 23:35:01 2016 +0200
-
-    pkix1implicit: Make sure distribution takes in all the files.
-    
-    By including ../Makefile.inc (like all other ASN1 based dissectors)
-    assure the symbols are setup correctly for all make related actions,
-    including packaging the files for distribution.
-    
-    Bug: 12703
-    Change-Id: Ia7279fcc30bb08e749f35b6d893136b053f3544c
-    Reviewed-on: https://code.wireshark.org/review/16893
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9057699
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Aug 4 14:55:59 2016 +0200
-
-    logcat-text: add cleanup function.
-    
-    Found by valgrind.
-    
-    ==23399== 209 (40 direct, 169 indirect) bytes in 1 blocks are definitely lost in loss record 2,431 of 2,696
-    ==23399==    at 0x4C2FB55: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
-    ==23399==    by 0xAAA2780: g_malloc0 (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1)
-    ==23399==    by 0xAAB0760: g_regex_new (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1)
-    ==23399==    by 0x6B03162: proto_register_logcat_text (packet-logcat-text.c:373)
-    ==23399==    by 0x71BA16D: register_all_protocols (register.c:2881)
-    ==23399==    by 0x7296E67: proto_init (proto.c:529)
-    ==23399==    by 0x7272A76: epan_init (epan.c:128)
-    ==23399==    by 0x1160F2: main (tshark.c:804)
-    
-    Change-Id: Ia47a4371a62eaadcdc8613d35030792d57e7f9dc
-    Reviewed-on: https://code.wireshark.org/review/16881
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6b4e970
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Aug 4 14:15:35 2016 +0200
-
-    kafka: remove unused assignment.
-    
-    Found by valgrind:
-    
-    ==21035== 12 bytes in 1 blocks are definitely lost in loss record 279 of 2,696
-    ==21035==    at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
-    ==21035==    by 0xAAA2728: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1)
-    ==21035==    by 0x72A361F: range_convert_str_work.part.0 (range.c:109)
-    ==21035==    by 0x6AACBEC: proto_register_kafka (packet-kafka.c:1459)
-    ==21035==    by 0x71BA055: register_all_protocols (register.c:2769)
-    ==21035==    by 0x7296E67: proto_init (proto.c:529)
-    ==21035==    by 0x7272A76: epan_init (epan.c:128)
-    ==21035==    by 0x1160F2: main (tshark.c:804)
-    ==21035==
-    
-    Change-Id: I3249925acd3ed26d40be992fd228447d1b381b66
-    Reviewed-on: https://code.wireshark.org/review/16880
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 5661420
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Aug 4 17:47:58 2016 +0200
-
-    asn2wrs: put back parsetab.py file in ASN.1 source folder
-    
-    Otherwise it breaks multi threaded compilation.
-    Follow-up of gd04be01
-    
-    Bug: 12621
-    Change-Id: I2f6b7d6ca85a1cf5a6713c2b36c823a520d3bf3d
-    Reviewed-on: https://code.wireshark.org/review/16886
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d217ac4
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Aug 4 18:06:28 2016 +0100
-
-    Remove missed header
-    
-    Follow up to d21295f9a6da65420254afba0bb8a64cb4155947.
-    
-    Change-Id: I971e2bb44d8d1b2977b6fcf6e4e492e45038b85e
-    Reviewed-on: https://code.wireshark.org/review/16889
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 6168d8b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Aug 4 17:01:45 2016 +0200
-
-    Qt: fix a NULL pointer dereference in extcap_argument_multiselect.cpp
-    
-    Guard treeView dereference by a cehck on viewModel (as it is done elsewhere in
-    the file, both are allocated at the same time).
-    This can happen for example when USBPcap lists a USB Hub with no devices connected.
-    
-    Change-Id: Iee412b8c95539e9e3d65706c14f62194cafcaffc
-    Reviewed-on: https://code.wireshark.org/review/16885
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit d21295f
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Aug 4 12:11:09 2016 +0100
-
-    Bump GLib minimum required version to 2.22.0
-    
-    Change-Id: I0ab85be8090f234f9ca10914063f97f13c894413
-    Reviewed-on: https://code.wireshark.org/review/16879
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 47e2849
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Aug 4 16:10:50 2016 +0200
-
-    openSAFETY: Remove SCM UDID check
-    
-    This leads to too many false-negatives in certain traces
-    
-    Change-Id: Ia081dc802b6f55926beec2383a864173cae6eb51
-    Reviewed-on: https://code.wireshark.org/review/16883
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-
-commit a671bab
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Aug 2 15:13:13 2016 +0200
-
-    extcap: restyle the help function.
-    
-    Change-Id: Ia742dffb1fd4cd5780b8ba44f7064d1874e473da
-    Reviewed-on: https://code.wireshark.org/review/16842
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 7e08f15
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Aug 4 15:56:19 2016 +0200
-
-    [BTLE-Nordic] Set pinfo->p2p_dir as seen from "Master".
-    
-    Change-Id: I12ad3a9b092e35a3418a11ec4d17cce157f320b6
-    Reviewed-on: https://code.wireshark.org/review/16882
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 41e659d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Aug 3 16:59:56 2016 +0200
-
-    extcap: prevent registration of wrong version.
-    
-    This prevents the user to run
-    
-    extcap_base_set_util_info(extcap, "1", NULL, "0", NULL);
-    
-    that would result in version = 1.0.
-    
-    Change-Id: I67532459c852bdceb16693553e90da88a1043435
-    Reviewed-on: https://code.wireshark.org/review/16858
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 0bf1288
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Aug 4 08:15:08 2016 +0200
-
-    extcap: preference name must only contain lower case ASCII, numbers, dots or underscores
-    
-    This chage set restores the normalization that was done before g485bc45.
-    Without it, USBPcap extacp utility triggers a crash.
-    
-    Change-Id: Id960db186888452ec3d04df1ee48dcc3899e8951
-    Reviewed-on: https://code.wireshark.org/review/16871
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 5adde36
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Aug 2 22:39:28 2016 +0200
-
-    extcap: restyle the output subsystem.
-    
-    Change-Id: I3e0674751eb97bf30ae6d70c4e51f347d63b1697
-    Reviewed-on: https://code.wireshark.org/review/16849
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 06464b7
-Author: Yurii Lysyi <yurii.lysyi@ericsson.com>
-Date:   Thu Aug 4 10:09:42 2016 +0200
-
-    [GSM A RR] Some updates from rel 13,
-    
-    Change-Id: Ib847ec3d019b3a8ba0f8e5502fcbe80aa47c266b
-    Reviewed-on: https://code.wireshark.org/review/16873
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d04be01
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Wed Aug 3 23:28:28 2016 +0200
-
-    Ply parser updated to 3.8 from http://www.dabeaz.com/ply/
-    
-    The Ubuntu packaged Ply 3.7 with Ubuntu 16.04's Python makes
-    ASN.1 based dissector generation fail.
-    
-    Ply's API changed after 3.5 and the small change to asn2wrs.py
-    adapts to that.
-    The commit breaking the API in Ply's repository is the following:
-    
-     commit af651673ba6117a0a5405055a92170fffd028106
-     Author: David Beazley <dave@dabeaz.com>
-     Date:   Tue Apr 21 16:31:32 2015 -0500
-    
-        Added optional support for defaulted states
-    
-    Change-Id: I1db33fdcccf7c39ecdb0e435a5ea9183362471ad
-    Bug: 12621
-    Reviewed-on: https://code.wireshark.org/review/16864
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Tested-by: João Valverde <j@v6e.pt>
-
-commit 92eecfd
-Author: Yann Diorcet <yann@diorcet.fr>
-Date:   Sat Jul 16 09:53:37 2016 +0200
-
-    Add ISO15765 dissector
-    
-    Bug: 12657
-    Change-Id: Ib0d9e18b31c1252f63025b10f7a67de6a5e4462c
-    Reviewed-on: https://code.wireshark.org/review/16491
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d430ba3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Aug 3 18:05:21 2016 -0700
-
-    Report the pathname of the color filter file in "Could not compile" messages.
-    
-    This also fixes some cases where we wouldn't report the path in a read
-    error message, as we'd already freed the path up and set the path string
-    pointer to null.
-    
-    Change-Id: Ia0e1ca0bf4880075bfa1957b0778a177de1a824f
-    Reviewed-on: https://code.wireshark.org/review/16868
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9affd26
-Author: Jaap Keuter <jaap.keuter@xs4all.nl>
-Date:   Thu Aug 4 00:14:56 2016 +0200
-
-    SSL utils: Add proper check while getting bag type
-    
-    Implementing proper return value check, as done for other gnutls function
-    calls, catches (unlikely) errors and allows C++ compatible build.
-    
-    Change-Id: Idf5bd3fe6e68d006a469fe72663dea1c7e2d17f7
-    Reviewed-on: https://code.wireshark.org/review/16865
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 86cf94f
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Wed Aug 3 17:00:31 2016 +0100
-
-    Text2Pcap doc update
-    
-    Minor docs update
-    
-    Change-Id: Iea44e4963aab75db1d875d27af41e4f38ff74e2d
-    Reviewed-on: https://code.wireshark.org/review/16859
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a723a30
+commit 2ea72fa
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Aug 3 22:35:44 2016 +0200
+Date:   Thu Jun 8 14:44:49 2017 +0200
 
-    Update USBPcap installer packaged in our Windows installer
-    
-    This new version contains kernel drivers with an EV certificate that is cross-signed
-    by Microsoft as it will become mandatory.
-    See https://blogs.msdn.microsoft.com/windows_hardware_certification/2016/07/26/driver-signing-changes-in-windows-10-version-1607/
-    for details.
+    IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE
     
-    Change-Id: I76bb1005ea540f39dca8874abb88d71a3ad53625
-    Reviewed-on: https://code.wireshark.org/review/16862
+    Bug: 13778
+    Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f
+    Reviewed-on: https://code.wireshark.org/review/22038
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit 49a55b9666329971e2c17d69179c331160fa7b40)
+    Reviewed-on: https://code.wireshark.org/review/22047
 
-commit 4be341b
-Author: Yurii Lysyi <yurii.lysyi@ericsson.com>
-Date:   Wed Aug 3 15:28:25 2016 +0200
-
-    [BSSGP] Update messages and IEs.
-    
-    Change-Id: Ida8c59b19213f2a2ab3448d1cbeddd98f06ba4b9
-    Reviewed-on: https://code.wireshark.org/review/16857
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 472f789
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Wed Aug 3 13:32:05 2016 +0100
-
-    Text2Pcap docs update
-    
-    Minor update to docs
-    
-    Change-Id: If9464f00d69bb9a8bb5638f3bb0d0f73a56aad50
-    Reviewed-on: https://code.wireshark.org/review/16856
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 0d5cf54
-Author: Irene Ruengeler <ruengeler@wireshark.org>
-Date:   Wed Aug 3 11:40:35 2016 +0200
-
-    Set correct length for Req_Seq_Nr field
-    
-    Change-Id: Iec228708423743e0268305da6ed606d464d1e1ea
-    Reviewed-on: https://code.wireshark.org/review/16854
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e631e11
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Tue Aug 2 17:04:56 2016 +0200
-
-    openSAFETY: Add two checks for scm udid validity
-    
-    This is being done, to prevent false-positives which can
-    not be filtered out using the heuristics, but have to be
-    caught using additional check measurements
-    
-    Change-Id: I2ff2c97decf8a93d43f8f5b54e4d147552970b3f
-    Reviewed-on: https://code.wireshark.org/review/16843
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 6d82619
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Aug 2 20:28:41 2016 -0700
-
-    Don't snprintf() into a string with one of the arguments being the same string.
-    
-    That doesn't work - you could be writing into the string from which
-    you're reading.
-    
-    Bug: 12700
-    Change-Id: I70f3ce6048dea582ec5e08c24c99e9a553b352df
-    Reviewed-on: https://code.wireshark.org/review/16850
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 64ec47e
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Aug 1 23:01:13 2016 +0200
-
-    Qt: remove dead code.
-    
-    Fix CID: 1362828, 1362829, 1362889.
-    Change-Id: I15045c32e96896323ae4d788b7891b2608a0c102
-    Reviewed-on: https://code.wireshark.org/review/16833
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-
-commit 3c1db69
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Aug 2 17:07:14 2016 +0200
-
-    [BTLE] Change address from unknown_0x... to master or slave.
-    
-    Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad
-    Reviewed-on: https://code.wireshark.org/review/16844
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b6e0335
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Aug 2 13:54:46 2016 +0200
-
-    [BLE] Make the Nordic BLE dissector fill in the btle_context_t struct.
-    
-    Change-Id: I14e62126d022dde10dcce2d7e974def0dc664b20
-    Reviewed-on: https://code.wireshark.org/review/16840
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 18f775a
-Author: Michael Tuexen <tuexen@wireshark.org>
-Date:   Tue Aug 2 14:31:37 2016 +0200
-
-    Fix compilation on FreeBSD.
-    
-    Includes are needed for using macros like WIFEXITED.
-    
-    Change-Id: Ia09ca58eeab2d151a756d285b0aeb55141c4d24a
-    Reviewed-on: https://code.wireshark.org/review/16841
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
-
-commit 6343e1d
-Author: David McKay <mckay.david@gmail.com>
-Date:   Mon Aug 1 22:56:45 2016 -0400
-
-    Bugfix endian issues with 802.11 FCS
-    
-    Rather than trying to swap fields to be big-endian, just make everything
-    little-endian.
-    
-    Bug: 12697
-    Change-Id: I07e7fd651c4a32dba764d111b34acdf32958c195
-    Reviewed-on: https://code.wireshark.org/review/16836
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit cec2946
-Author: Adrien Aubry <adraub@gmail.com>
-Date:   Mon Aug 1 11:28:21 2016 +0200
-
-    CANopen: Added some improvements to CANopen emergency dissector
-    
-    -Added description to Emergency error code
-    -Added bitmask dissector to Emergency register
-    -Added descriptions to object dictionary SDO related index
-    All these changes were found inside the CiA CANopen norm, and were useful
-    in my work while debugging CANopen frames
-    
-    Change-Id: I76bc1eab9f75fc242eaf3200af81593f65570658
-    Reviewed-on: https://code.wireshark.org/review/16823
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d62ad9d
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Mon Aug 1 16:57:51 2016 +0200
-
-    extcap: Remove g_spawn_check_exit_status
-    
-    This function is not supported in the min GLIB version, therefore
-    the code is to be removed
-    
-    Change-Id: Ie39170bfc0662e5a477cbc45d7eadebcf2c70d4e
-    Reviewed-on: https://code.wireshark.org/review/16827
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit c84af8d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Aug 1 08:46:12 2016 -0700
-
-    RPM: Download from https://www.wireshark.org/.
-    
-    Download from https://www.wireshark.org/ instead of
-    https://wireshark.org/. This conforms to README.packaging and avoids a
-    redirect.
-    
-    Change-Id: I0ed63f446bc16cbd501444c8743809672c4a084b
-    Reviewed-on: https://code.wireshark.org/review/16829
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 867d7ca
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Aug 1 22:01:27 2016 +0200
-
-    extcap: add null check (CID 1364683).
-    
-    Change-Id: I1d81d6f043fa695ed507cf733fffa832922a708c
-    Reviewed-on: https://code.wireshark.org/review/16832
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit abe8e51
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Aug 1 21:37:07 2016 +0200
-
-    extcap: extend buffer (CID 1364684).
-    
-    Change-Id: I4ed6965fa1173b69d9e325bc814e382b5368d40c
-    Reviewed-on: https://code.wireshark.org/review/16831
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0dcda99
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Aug 1 14:20:08 2016 +0100
-
-    autotools: Fix make dist without Qt
-    
-    Change-Id: I62b1d73eede471535b4ccc7ca68c9f94f25b7417
-    Reviewed-on: https://code.wireshark.org/review/16826
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5731719
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Aug 1 20:34:18 2016 -0400
-
-    Fix checkAPI warning for printf.
-    
-    Another legitimate use, so use ws_debug_printf.
-    
-    Change-Id: I9bebe01e80987caf8e18a59b93a48f9a2d6ee397
-    Reviewed-on: https://code.wireshark.org/review/16835
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a52793a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Aug 1 17:35:19 2016 -0700
-
-    Remove trailing "." from OID strings.
-    
-    The previous change removed code that did that.
-    
-    Change-Id: If297018f5902af7a2d9cacb0cc9a5f1ffe1e1d00
-    Reviewed-on: https://code.wireshark.org/review/16834
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a98b55f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Aug 1 17:33:05 2016 +0200
-
-    Fix compilation without extcap.
-    
-    Change-Id: I627dd6c514066ba67cd501925ff95e9cf819c0e9
-    Reviewed-on: https://code.wireshark.org/review/16828
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit edcc2f0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 23 21:25:05 2016 -0400
-
-    Add OSI Layer 4 to exported PDU to handle TCP and UDP payloads.
-    
-    This allows for much easier anonymized captures for protocols running
-    atop TCP/UDP.
-    
-    Added support for "TCP dissector data" tag within export PDU (34) so that
-    the tcpinfo struct that TCP dissector normally passes to its subdissectors
-    can be saved.
-    
-    Change-Id: Icd63c049162332e5bcb2720159e5cf8aac893788
-    Reviewed-on: https://code.wireshark.org/review/16285
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c992edc
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Aug 1 09:11:30 2016 -0400
-
-    Reorder ns_dir_vals into numerical order
-    
-    Change-Id: I21a50015dd382c62aa2dc84d90bbb4b86ea8b1dc
-    Reviewed-on: https://code.wireshark.org/review/16825
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8166ab7
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Aug 1 11:09:16 2016 +0200
-
-    Make dumpcap build without extcap
-    
-    Change-Id: I70c7bc270946d104218afc4d9c8ac888471f6524
-    Reviewed-on: https://code.wireshark.org/review/16821
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 50b56c8
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Aug 1 10:12:59 2016 +0100
-
-    IPv6: Display reassembly information under root_tree
-    
-    Change-Id: Ibfa934dba59f96b8820d2616d4d3d3990af00918
-    Reviewed-on: https://code.wireshark.org/review/16822
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit e302d9f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 31 09:37:36 2016 -0400
-
-    Remove checkAPI warnings from wmem.
-    
-    printf and g_warning are not allowed in epan or its subdirectories
-    
-    Change-Id: I4c07a7258f4c9566384bef93af35c350b5c88758
-    Reviewed-on: https://code.wireshark.org/review/16801
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 09efa5f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 31 12:39:58 2016 -0400
-
-    Remove proto_help.[ch]
-    
-    The functionality hasn't been used for awhile and was deprecated with GTK 2.4 (while our minimum support is at least 2.14).  It's also causing unnecessary checkAPI warnings.
-    
-    Change-Id: Ib8da8300a50e2129a46ad188b4ed4d7b2d44b1ca
-    Reviewed-on: https://code.wireshark.org/review/16813
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3096063
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sun Jul 31 19:30:10 2016 +0100
-
-    IPv6: Expand blurb for IPv4 embedded addresses
-    
-    Change-Id: I540e80517092ab1e475532d8e20a54be24858c5d
-    Reviewed-on: https://code.wireshark.org/review/16816
-    Reviewed-by: Binh Trinh <beango@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7bb2e26
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Jul 31 23:01:15 2016 +0200
-
-    Qt: remove unused constructors.
-    
-    Fix CID 1356297 and 1356300.
-    
-    Change-Id: I17e882addc2fb4a12630940cc1ae3ad62f0b793c
-    Reviewed-on: https://code.wireshark.org/review/16818
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit dd215f2
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Jul 31 22:51:01 2016 +0200
-
-    Qt: add initializer (CID 1159352).
-    
-    Change-Id: I2603b1873acb82bd9840ea4deddcbbb422c018e8
-    Reviewed-on: https://code.wireshark.org/review/16817
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2674c83
-Author: Günther Deschner <gd@samba.org>
-Date:   Tue Sep 29 19:56:14 2015 +0200
-
-    wireshark: update WERR definitions from Samba's werror.h.
-    
-    Guenther
-    
-    Change-Id: I457f50dcf86f6e7c74afd9ff773aaf8bfdb52426
-    Signed-off-by: Günther Deschner <gd@samba.org>
-    Reviewed-on: https://code.wireshark.org/review/16722
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit bf123ef
-Author: Vasil Velichckov <vvvelichkov@gmail.com>
-Date:   Sun Jul 31 16:59:01 2016 +0300
-
-    BER: Fix segmentation fault when configuring new OIDs
-    
-     Program terminated with signal 11, Segmentation fault.
-     #0  0x00007f573e5bdecf in uat_fld_chk_oid (u1=0x2eb1830, strptr=0x7f573c8431e4 "", len=0, u2=0x0, u3=0x0, err=0x7ffee1668748) at uat.c:494
-     494        if(strptr[len-1] == '.') {
-     (gdb)
-     (gdb) bt
-     #0  0x00007f573e5bdecf in uat_fld_chk_oid (u1=0x2eb1830, strptr=0x7f573c8431e4 "", len=0, u2=0x0, u3=0x0, err=0x7ffee1668748) at uat.c:494
-     #1  0x0000000000485dfc in uat_dlg_cb (win=0x3844290, user_data=0x3632bc0) at uat_gui.c:364
-     #2  0x00007f573b2f19a7 in _g_closure_invoke_va (closure=0x3367130, return_value=0x0, instance=0x3844290, args=0x7ffee1668a78, n_params=0,
-    
-    Change-Id: Ic61480f8c1f2cd833c58de0b2acc24dcb831578f
-    Reviewed-on: https://code.wireshark.org/review/16800
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 3c47d97
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sun Jul 31 16:56:01 2016 +0100
-
-    IPv6: Remove an unused #define and two macros
-    
-    Change-Id: I0866e4b28b660063ab351022ac943bb5717b5a23
-    Reviewed-on: https://code.wireshark.org/review/16811
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 289d14b
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Sun Jul 31 16:51:18 2016 +0200
-
-    extcap: fix indentation in extcap-base.
-    
-    Change-Id: Ic8e9634c9568d32fdeca8cc84a9c2f5b9757a5ae
-    Reviewed-on: https://code.wireshark.org/review/16806
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9489c80
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 31 12:25:29 2016 -0400
-
-    packet-erf.c: Pacify OS X buildbot.
-    
-    Change-Id: I6ec30e77eac91d1b02eaddada75741b2063426f2
-    Reviewed-on: https://code.wireshark.org/review/16812
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 078ba23
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 31 09:54:32 2016 -0400
-
-    oids.c: Use wmem_strbuf instead of trying to accommodate snprintf.
-    
-    Change-Id: I5222fbd07b7d1301386f7a206fef688793dd6be7
-    Reviewed-on: https://code.wireshark.org/review/16802
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7855160
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 31 10:19:05 2016 -0400
-
-    lbm_uimflow_dlg.c: Pacify another GTK checkAPIs.pl warning.
-    
-    Add another "Wireshark" macros to old-gtk-compat.h for GTK API that has been deprecated.
-    
-    Change-Id: Icae4ebae365329fad076324c23d5cee4c89893b5
-    Reviewed-on: https://code.wireshark.org/review/16803
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9f4a294
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 31 10:20:50 2016 -0400
-
-    Cleanup the final checkAPI g_warning complaints.
-    
-    Change-Id: I7606ee55be4428909e255496c0344fffe5847f02
-    Reviewed-on: https://code.wireshark.org/review/16804
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e811e82
-Author: Binh Trinh <beango@gmail.com>
-Date:   Sun Jul 31 10:31:11 2016 -0400
-
-    IPv6: Fix typo in comment from gd2cd779
-    
-    Change-Id: Id1a053c189fdd374da2447123e5e47d80000b802
-    Reviewed-on: https://code.wireshark.org/review/16805
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 196b8a3
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jul 31 08:09:38 2016 -0700
-
-    [Automatic update for 2016-07-31]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
-    
-    Change-Id: Ia414edeaf04efafd0b5eb2e899dbc69d5b42f07d
-    Reviewed-on: https://code.wireshark.org/review/16807
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 63c5216
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jul 31 15:03:43 2016 +0200
-
-    extcap: fix a compile error with Qt4
-    
-    declare ExtcapArgument * as a metatype so it can be used by QVariant
-    
-      CXX    extcap_argument.moc.o
-    In file included from /usr/include/qt4/QtCore/qvariant.h:48:0,
-                     from /usr/include/qt4/QtCore/qabstractitemmodel.h:45,
-                     from /usr/include/qt4/QtGui/qabstractitemview.h:46,
-                     from /usr/include/qt4/QtGui/qtreeview.h:45,
-                     from /usr/include/qt4/QtGui/qtreewidget.h:45,
-                     from /usr/include/qt4/QtGui/QTreeWidget:1,
-                     from ./interface_tree.h:38,
-                     from ./extcap_options_dialog.h:35,
-                     from extcap_options_dialog.cpp:26:
-    /usr/include/qt4/QtCore/qmetatype.h: In instantiation of ‘static int QMetaTypeId2<T>::qt_metatype_id() [with T = ExtcapArgument*]’:
-    /usr/include/qt4/QtCore/qmetatype.h:230:44:   required from ‘int qMetaTypeId(T*) [with T = ExtcapArgument*]’
-    /usr/include/qt4/QtCore/qvariant.h:341:47:   required from ‘bool QVariant::canConvert() const [with T = ExtcapArgument*]’
-    extcap_options_dialog.cpp:378:74:   required from here /usr/include/qt4/QtCore/qmetatype.h:169:80: error: ‘qt_metatype_id’ is not a member of ‘QMetaTypeId<ExtcapArgument*>’
-    make[2]: *** [extcap_options_dialog.o] Error 1
-    
-    Change-Id: Ib7d052a5cb550ab2595b8d9580d35ffeb62093da
-    Reviewed-on: https://code.wireshark.org/review/16799
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 94cb86a
-Author: Anthony Coddington <anthony.coddington@endace.com>
-Date:   Mon Jul 25 17:55:13 2016 +1200
-
-    ERF: Add ERF_TYPE_META clock tags
-    
-    Adds various clock configuration related tags.
-    Uses ptp_v2 value strings exported from packet-ptp.
-    
-    Refactor out common ERF_TYPE_META bitfield code.
-    Also clean up field registration a bit.
-    Add flow_hash_mode enum, other minor wording cleanup.
-    Manually display relative timestamps as nanoseconds for <1ms.
-    Fix ns_host_* tag subtree summary field name duplication.
-    
-    Ping-Bug: 12303
-    Change-Id: I76264d141f1c4a3590627637daa5dcd4fdfd2e93
-    Reviewed-on: https://code.wireshark.org/review/16782
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e03574d
-Author: Hiroshi Ioka <hirochachacha@gmail.com>
-Date:   Sun Jul 31 19:59:30 2016 +0900
-
-    packet-smb2: fix field type of hf_smb2_ea_data_len
-    
-    Change-Id: I85f1ab8777f178dd710564eb0cb15f19383677a7
-    Reviewed-on: https://code.wireshark.org/review/16798
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d2cd779
-Author: Binh Trinh <beango@gmail.com>
-Date:   Sat Jul 30 00:44:21 2016 -0400
-
-    IPv6: Add support for embedded IPv4 addressess (RFC 6052)
-    
-    For Well-Known Prefix 64:ff9b::/96.
-    
-    Change-Id: Ib2d7b42b9c7e6bbe388dca46d6a5eb516242c881
-    Reviewed-on: https://code.wireshark.org/review/16780
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 63f9ecb
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Jul 30 08:43:23 2016 +0100
-
-    Fix indentation
-    
-    Change-Id: I6b0c7cda7130f1912b9a83991b43f234ff9d9cec
-    Reviewed-on: https://code.wireshark.org/review/16797
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 52ff3ae
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Jul 30 17:19:48 2016 +0100
-
-    IPv6: Move a declaration
-    
-    Change-Id: I94ace6b1837e1f3398a2784945322cde91d4d232
-    Reviewed-on: https://code.wireshark.org/review/16796
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 665738d
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Jul 30 17:45:37 2016 +0100
-
-    IPv6: Capitalize some field names
-    
-    Change-Id: Ie1d95b521a354df69b4a70b0a8fb209eb97a07fd
-    Reviewed-on: https://code.wireshark.org/review/16795
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit ec66a8c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 30 19:04:27 2016 -0400
-
-    packet-nstrace.c: General cleanup
-    
-    Motivation was to clean up the use of offsetof() as the structure definitions
-    aren't necessary for Wireshark.
-    
-    Change-Id: I6fadce0d4823842270be89bbed6081d37254ff2b
-    Reviewed-on: https://code.wireshark.org/review/16791
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 30dbb85
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 30 21:39:19 2016 -0400
-
-    Properly mask Modbus function code
-    
-    Bug: 12693
-    Change-Id: Ic0b226d2ba9518f9a1efe85527678daa5302cc3f
-    Reviewed-on: https://code.wireshark.org/review/16792
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c611ede
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Mon Jan 4 18:32:39 2016 +0100
-
-    extcap: Use stderr to print error message
-    
-    This patch reads out the stderr messages from an extcap
-    utility and displays it to an user. It was tested on Qt
-    but not on GTK, but should work their as well.
-    
-    On Mac OS/X and Windows the child_watch does not behave
-    as it was intended. Therefore in extcap_cleanup, the callbacks
-    are called manually, if and only if, they have not been
-    called already.
-    
-    The reason why it displays two error messages is, that
-    by the time the first one is being displayed, glib has not
-    returned from the spawned process on Linux yet. So there
-    is no way to add the stderr correctly, and putting a handler
-    to stderr into interface_opts will lead to memory errors,
-    cause then the code tries to access memory outside of its
-    protection.
-    
-    Bug: 11892
-    Change-Id: I2db60dd480fed3e01428b91a705057e4f088bd15
-    Reviewed-on: https://code.wireshark.org/review/12954
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c2ac9c5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 30 13:50:04 2016 -0700
-
-    Use correct relative path.
-    
-    The build is done in epan/wmem, so libwsutil.la is in ../../wsutil.
-    
-    Change-Id: I053f6b925829e9c5e9ded014fbc716abc527b46a
-    Reviewed-on: https://code.wireshark.org/review/16790
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f6322a4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 30 13:37:03 2016 -0700
-
-    ifdef out a variable used only on Windows.
-    
-    Also, fix identation - tab stops are set every 8 spaces, not every 4
-    spaces, in UN*X, which is why the mode lines specify that.
-    
-    Change-Id: If7cfc2cdae26feb2d5c13e31a32ed950354fb15b
-    Reviewed-on: https://code.wireshark.org/review/16789
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4c9f7b5
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sat Jul 23 22:10:07 2016 +0200
-
-    RSVP: Wrong order of Attribute Flags TLV
-    
-    According to RFC 5420 Section 3.1 the MSB is bit zero.
-    Reported by Alexander Okonnikov.
-    
-    Bug: 12652
-    Change-Id: I9b414464b05ab0724a6560aa441c3f5324130fdb
-    Reviewed-on: https://code.wireshark.org/review/16611
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 765f3b5
-Author: Anthony Coddington <anthony.coddington@endace.com>
-Date:   Tue Jun 14 13:27:25 2016 +1200
-
-    PTP: Expose ptp_v2 value strings for use by other dissectors
-    
-    Also rename ptp_v2 value strings in packet-ptp for better consistency.
-    TODO: could also be used and combined with definitions in packet-cip.
-    
-    Change-Id: I84a9ae566ae6abdd95910cb5709bb63c2b7c26b8
-    Reviewed-on: https://code.wireshark.org/review/16781
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 183d7f3
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Apr 7 15:31:21 2016 -0700
-
-    Add string function times to wmem_test.
-    
-    The system, GLib, and wmem string functions can perform differently,
-    particularly on Windows. Start adding performance tests to wmem_test so
-    that we can see the differences.
-    
-    With this change applied "wmem_test --verbose" prints out the following
-    on a Windows 7 x64 VM here. wmem_test is linked against GLib 2.4.20.
-    
-    (MINPERF:g_printf_string_upper_bound (via g_snprintf) 1 string: u 327.602 ms s 0
-    .000 ms)
-    (MINPERF:g_printf_string_upper_bound (via g_snprintf) 5 strings: u 1419.609 ms s
-     0.000 ms)
-    (MINPERF:g_printf_string_upper_bound (via g_snprintf) mixed args: u 1606.810 ms
-    s 0.000 ms)
-    (MINPERF:_snprintf_s upper bound 1 string: u 124.801 ms s 0.000 ms)
-    (MINPERF:_snprintf_s upper bound 5 strings: u 140.401 ms s 0.000 ms)
-    (MINPERF:_snprintf_s upper bound mixed args: u 124.801 ms s 0.000 ms)
-    (MINPERF:g_strdup_printf 2 strings: u 702.005 ms s 0.156 ms)
-    (MINPERF:g_strconcat 2 strings: u 78.000 ms s 0.000 ms)
-    (MINPERF:g_strdup_printf 5 strings: u 1419.609 ms s 0.156 ms)
-    (MINPERF:g_strconcat 5 strings: u 93.601 ms s 0.156 ms)
-    (MINPERF:wmem_strdup_printf 2 strings: u 343.202 ms s 0.312 ms)
-    (MINPERF:wmem_strconcat 2 strings: u 93.601 ms s 0.468 ms)
-    (MINPERF:wmem_strdup_printf 5 strings: u 327.602 ms s 8.268 ms)
-    (MINPERF:wmem_strconcat 5 strings: u 62.400 ms s 3.432 ms)
-    
-    Change-Id: Id9b23918829db1719d141e7f830b9eba6245a25b
-    Reviewed-on: https://code.wireshark.org/review/14857
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 852a561
-Author: Peter Ross <peter.ross@rmit.edu.au>
-Date:   Sat Jul 30 12:41:57 2016 +1000
-
-    packet-simple: also dissect SIMPLE over TCP
-    
-    Change-Id: I9310a6fa0b50e54a9e7febb955cdfdab560c4ba9
-    Reviewed-on: https://code.wireshark.org/review/16779
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 62ea237
-Author: Uli Heilmeier <uh@heilmeier.eu>
-Date:   Sat Jul 30 11:36:15 2016 +0200
-
-    README.dissector: Add proto_tree_add_bitmask_with_flags()
-    
-    Extend README with proto_tree_add_bitmask_with_flags() function.
-    
-    Change-Id: Ia984080eda77ab93b063771d625bc45b5b0fc6d2
-    Reviewed-on: https://code.wireshark.org/review/16785
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e3d78be
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Jul 29 21:35:03 2016 +0100
-
-    Move IPv6 inet definitions to wsutil/inet_ipv6.h
-    
-    Change-Id: I880adf7fc1e131639f318cdecf7d8e59262d89fb
-    Reviewed-on: https://code.wireshark.org/review/16784
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 9e747b9
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Jul 29 18:29:00 2016 +0100
-
-    Add GeoIP database UN*X system path
-    
-    Most distros provide GeoIP database packages that install to /usr/share/GeoIP.
-    Use this as a system default.
-    
-    Change-Id: I2b4ddf7e2467263491b18a97e908a247db0ac9a3
-    Reviewed-on: https://code.wireshark.org/review/16767
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit fd84add
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Jul 29 15:12:01 2016 +0100
-
-    IPv6: Add deprecation expert infos
-    
-    Change-Id: I111fd8f74388e9e4b7a9d7fd1b582d2fff86cf59
-    Reviewed-on: https://code.wireshark.org/review/16764
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit a637026
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Jul 30 05:08:45 2016 +0100
-
-    IPv6: Add experimental routing header types
-    
-    Change-Id: I22dfa604abd8ade21d240104bf84af815aa2bc24
-    Reviewed-on: https://code.wireshark.org/review/16783
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 98e8b26
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jul 29 15:11:03 2016 +0200
-
-    ieee80211: PMKID is incorrectly decoded under RSN Vendor specific IE in EAPOL packet 1
-    
-    Issue reported by Padmaja Reddy
-    
-    Bug:12675
-    Change-Id: I17323a70fdbe6f52c350a875c467c233877f4505
-    Reviewed-on: https://code.wireshark.org/review/16761
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3e48148
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 29 13:21:13 2016 -0700
-
-    Upgrade to libtool 2.4.6.
-    
-    As per bug 12689, earlier versions of libtool had a bug wherein they
-    assumed a 1-digit second component of the OS version number, and thought
-    OS X 10.10 was OS X 10.1 and used the wrong linker flags.  A build from
-    Git would succeed, but a build from the source tarball wouldn't.
-    
-    Change-Id: I412d1e0b02976f44c573f9ff1b62465f5eeaeb05
-    Ping-Bug: 12689
-    Reviewed-on: https://code.wireshark.org/review/16773
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2df5bf3
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jul 29 11:01:38 2016 -0700
-
-    WiX: Set the "Programs and Features" icon.
-    
-    Use our normal application icon in "Programs and Features".
-    
-    Change-Id: I480fcd16b9de1b58852ee8fb5226062da8ed7419
-    Reviewed-on: https://code.wireshark.org/review/16768
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4d4a7a6
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Jul 29 02:38:13 2016 +0100
-
-    IPv6: Use some macros to set/allocate addresses
-    
-    Change-Id: I30430841ff6f3b89cb778aed9e109a885b412a01
-    Reviewed-on: https://code.wireshark.org/review/16766
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 65b9d56
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jul 29 21:05:25 2016 +0200
-
-    GTPv2: fix test for flags in TWAN Identifier IE (CID 1364616)
-    
-    Change-Id: I7b87624bd60f514f2f5e9aafe19bcebf7799bcd1
-    Reviewed-on: https://code.wireshark.org/review/16772
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit fe7dd4e
+commit 61fa008
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jul 29 20:26:19 2016 +0200
-
-    GTP: fix dissection of NSAPI
-    
-    Bug: 12686
-    Change-Id: Icdf1fd0f24a2f667b27bb957fd932bd9c17ef0f4
-    Reviewed-on: https://code.wireshark.org/review/16769
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3da56e4
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Jul 29 14:54:06 2016 +0100
-
-    IPv6: Dissect unknown routing header types as data
-    
-    Change-Id: I1fa840d24d56643515c6fc8d73967307bf1951d6
-    Reviewed-on: https://code.wireshark.org/review/16762
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit b6d13ef
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Tue Jul 26 00:18:38 2016 +0100
-
-    Register IPv6 extension header dissectors to "ip.proto" table
-    
-    We may want to add expert infos for IPv6 extension headers over IPv4 (TODO).
-    Any side-effects that don't make sense (e.g: IPv6 Routing over IPv4) are
-    ignored.
-    
-    The IPv6 Next Header decode as is replaced by IP Proto decode as. It
-    didn't fit a conceptual model well and it also was not working very well
-    in practice (for multiple extension headers).
-    
-    We now support decoding any IP Protocol number as an extension header.
-    
-    Bug: 12673
-    Change-Id: Icbde019aba8990cc556ef2bd832f64cba76c24b6
-    Reviewed-on: https://code.wireshark.org/review/16681
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 042b49a
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Jul 29 14:07:09 2016 +0200
+Date:   Thu Jun 8 22:16:36 2017 +0200
 
-    editcap: fix typos
+    sharkd: fix a shadow warning when compiling on RHEL/CentOS 6.x
     
-    Change-Id: I24c455afc51749a665e452312332d167831f19d2
-    Reviewed-on: https://code.wireshark.org/review/16760
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f5dff39
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 27 15:31:06 2016 -0700
-
-    Use xz to compress the source tarball.
-    
-    Compress the source tarball using xz instead of bzip2. Other open source
-    projects (including many of our dependencies) have been using xz for a
-    while so hopefully this won't be too much of a shock.
-    
-    Remove the patch-bzip2 Autotools target while we're here.
-    
-    Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d
-    Reviewed-on: https://code.wireshark.org/review/16735
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit e727ecf
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jul 25 10:49:30 2016 -0700
-
-    Don't discard unknown coloring rules.
-    
-    When processing the colorfilters file, keep and disable unknown coloring
-    rules instead of skipping over and discarding them. This should
-    hopefully keep people from losing the standard "Checksum Errors" rule
-    (and it's less rude in general).
-    
-    Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f
-    Reviewed-on: https://code.wireshark.org/review/16673
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Bug: 13424
+    Change-Id: I20e474180545d89599c346ad2c5994949d213cb0
+    Reviewed-on: https://code.wireshark.org/review/22045
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 485bc45
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Tue Dec 29 07:57:36 2015 +0100
-
-    extcap: Restore functionality for options
-    
-    Allow stored options to be restored to their default values. This
-    adds a global cleanup method for extcap and globally defined
-    preference values, which fixes the parameter problem with windows
-    
-    Change-Id: I48e0cf846ef81f4732d652c6a2ad0020db5df08e
-    Reviewed-on: https://code.wireshark.org/review/13741
-    Petri-Dish: Roland Knall <rknall@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-
-commit 191f9bd
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 28 16:51:36 2016 -0700
-
-    Give the WiX installer a full name.
-    
-    Append the platform and version to the WiX installer name similar to
-    our other installers.
-    
-    Change-Id: Idb3e7917dda3a8e831062538d3e7d1b1c8b78d42
-    Reviewed-on: https://code.wireshark.org/review/16757
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 0b9f2fc
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 28 12:26:19 2016 -0700
-
-    Enable airpdcap debugging explicitly.
-    
-    Enable airpdcap debugging with explicitly with AIRPDCAP_DEBUG instead
-    of _DEBUG. _DEBUG might be defined automatically by Visual C++ depending
-    on your build type and the extra output breaks the decryption tests.
-    
-    Change-Id: If6d918beb4d91233b07a3bc7b6f2f7e1849171f0
-    Reviewed-on: https://code.wireshark.org/review/16755
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 3aedb1e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 27 14:48:18 2016 -0700
-
-    Add an ESP decryption test.
-    
-    Add an ESP decryption test using the capture+keys from bug 12671.
-    
-    Change-Id: I5f7ce477ec74d59c1043345728a1444842912b96
-    Ping-Bug: 12671
-    Reviewed-on: https://code.wireshark.org/review/16733
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Gerald Combs <gerald@wireshark.org>
-
-commit 12b859f
-Author: Thomas Klausner <tk@giga.or.at>
-Date:   Thu Jul 28 16:31:44 2016 +0200
-
-    Fix build on NetBSD.
-    
-    sys/siginfo.h (which is included by this file) defines si_code.
-    
-    Change-Id: I59cfe1ea3ec01345965028db4bba3223752459e3
-    Reviewed-on: https://code.wireshark.org/review/16750
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit dcb7b71
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Jul 28 11:38:45 2016 +0100
-
-    IPv6: Fix Decode As to distinguish a null from a hop-by-hop next header.
-    
-    Both display as zero in the UI. We shouldn't have null values for
-    decode as, but we do for IPv6, and the user (also the developer) can't
-    tell them apart from an IPv6 Hop-by-hop Option extension header.
-    
-    NULL values are represented as IP Protocol 255 (Reserved) in the UI,
-    intead of IP Protocol 0 (Hop-By-Hop extension header).
-    
-    Change-Id: I840db99df212a3bee03027b91fdec9c01886004d
-    Reviewed-on: https://code.wireshark.org/review/16746
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 7c20448
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Jul 28 06:12:31 2016 +0100
-
-    IPv6: Reduce some expert info PI_PROTOCOL severities
-    
-    Change-Id: I87bcc47eeee05ea22c646f7ecce9374c070b1ea6
-    Reviewed-on: https://code.wireshark.org/review/16743
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 6ea3dd6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 28 14:44:11 2016 +0200
-
-    CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions
-    
-    Bug: 12676
-    Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a
-    Reviewed-on: https://code.wireshark.org/review/16748
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7ff0761
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Jul 28 12:54:40 2016 +0100
-
-    IPv6: Fix an incorrect bitmask
-    
-    Change-Id: I81dfcb4fb4b10a9d951247460783f81f464c50b7
-    Reviewed-on: https://code.wireshark.org/review/16747
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 19cdb19
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jul 28 11:13:15 2016 +0200
-
-    [BTLE] Add Version 4.2 to ll_version_number_vals
-    
-    Change-Id: I88e988e11e1cae6f2f6f6d190890b62f2beb1e92
-    Reviewed-on: https://code.wireshark.org/review/16745
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7a9ab60
-Author: Kim Kempf <kim.kempf@apcon.com>
-Date:   Wed Jul 27 19:34:51 2016 -0700
-
-    Fixed compile error in packet-ssl-utils.c when HAVE_LIBCRYPT not defined
-    
-    Bug: 12680
-    Change-Id: I7219e38be48d1115e7e80b41337423be64776e5a
-    Reviewed-on: https://code.wireshark.org/review/16742
-    Reviewed-by: João Valverde <j@v6e.pt>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 4d925d3
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Wed Jul 27 00:04:58 2016 +0100
-
-    IPv6: Add expert info for option extension header type mismatch
-    
-    Change-Id: If9c4e609528a1b72e6d5a002292734e21650e1eb
-    Reviewed-on: https://code.wireshark.org/review/16713
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit d8f67ef
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Wed Jul 27 01:51:54 2016 +0100
-
-    IPv6: Add support for SMF_DPD option (RFC 6621)
-    
-    Change-Id: I61a1246a3f68aa03e12949e8271dd4cac055b9db
-    Reviewed-on: https://code.wireshark.org/review/16712
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 62eb424
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 27 16:21:46 2016 -0700
-
-    Copy over change from Samba repository:
-    
-      commit ed11ce8f12d567a3e0edc1d24aab1784a171ac33
-      Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-      Date:   Wed May 4 16:51:37 2016 +1200
-    
-        Python pidl: avoid segfault with "del obj->attr"
-    
-        Deleting an attribute in Python (using the "del" statement) is (at
-        some stages along a winding path, for C objects) converted into
-        setting the attribute to NULL. Not None, actual NULL. The way we
-        handled this NULL was to dereference it. This changes the behaviour to
-        raising an AttributeError, which is more or less what Python does in
-        similar situations with builtin objects.
-    
-        Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-        Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-    
-    Shouldn't affect us, but it makes diffing cleaner.
-    
-    Change-Id: I8e681dc79c8f4e62b74e2aa5ac2b4924134735c4
-    Reviewed-on: https://code.wireshark.org/review/16741
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f0ed91f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 27 16:19:52 2016 -0700
-
-    Copy over change from Samba repository:
-    
-      commit f6c79072ca50e05a68b73a80a0ebd635a9bac068
-      Author: Andrew Bartlett <abartlet@samba.org>
-      Date:   Thu Apr 21 21:44:56 2016 +1200
-    
-        pidl: Correct string handling to use talloc and be in common
-    
-        The previous string handling assumed the python variables referenced
-        by PyString_AS_STRING had infinite life.  When they were re-used
-        the C structure started to point at unexpected things.
-    
-        We now check correctly for Unicode in every case, and we always
-        duplicate the string with talloc_strdup()
-    
-        Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-        Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-    
-    Shouldn't affect us, but it makes diffing cleaner.
-    
-    Change-Id: Ib54b62f5630df46cff6fb0582acd109b263142d2
-    Reviewed-on: https://code.wireshark.org/review/16740
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5623b79
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 27 16:17:44 2016 -0700
-
-    Copy over change from Samba repository:
-    
-      commit 90bf114f6370ee837d97e36eb25f38f8234dcd39
-      Author: Andrew Bartlett <abartlet@samba.org>
-      Date:   Thu Feb 25 13:57:37 2016 +1300
-    
-        pidl: Use a tmp_ctx helper variable
-    
-        This is so we free the ndr_push_struct_blob() return value after
-        we make it into a string
-    
-        Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-        Reviewed-by: Garming Sam <garming@catalyst.net.nz>
-    
-    Shouldn't affect us, but it makes diffing cleaner.
-    
-    Change-Id: I52ee911f89813e6f5a90445be4eb52494e3f69d3
-    Reviewed-on: https://code.wireshark.org/review/16739
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 692f014
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 27 16:15:35 2016 -0700
-
-    Copy change from Samba repository:
-    
-      commit dffa2dbfabca14f07af12663fc93c8dc3bc837cf
-      Author: Andrew Bartlett <abartlet@samba.org>
-      Date:   Thu Feb 25 13:57:00 2016 +1300
-    
-        pidl: Use the $mem_ctx helper variable
-    
-        This is already set to pytalloc_get_mem_ctx(py_obj)
-    
-        Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-        Reviewed-by: Garming Sam <garming@catalyst.net.nz>
-    
-    Shouldn't affect us, but it makes diffing cleaner.
-    
-    Change-Id: I60fddc0a1055095ecad51180c9e1fc2223d2c017
-    Reviewed-on: https://code.wireshark.org/review/16738
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d47f174
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 27 16:13:55 2016 -0700
-
-    Copy over change from Samba repository:
-    
-      commit 9e07f3a13b41be1f019887581b2a2bd049039a3d
-      Author: Andrew Bartlett <abartlet@samba.org>
-      Date:   Tue Feb 16 14:06:28 2016 +1300
-    
-        pidl: Fix our python reference handling
-    
-        The new talloc.BaseObject allow us to hold a talloc context per
-        python object (there may be many referring to the same C object)
-        and the talloc context that the actual object pointer is under.
-    
-        Another advantage is that talloc.BaseObject(), has less of
-        an ABI surface.
-    
-        Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-        Reviewed-by: Garming Sam <garming@catalyst.net.nz>
-    
-    Shouldn't affect us, but it makes diffing cleaner.
-    
-    Change-Id: If4a7d9d3f5eb0acf9f94b10af870a0e01fa52b5c
-    Reviewed-on: https://code.wireshark.org/review/16737
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bd0280e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 27 15:53:21 2016 -0700
-
-    Pick up changes from the Samba repository:
-    
-      commit 59d530c0b692dae41ea271bfdb473f212615041b
-      Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-      Date:   Tue Mar 1 14:18:52 2016 +1300
-    
-        ndr: Use ndr_steal to avoid long lists
-    
-        When pulling complex structures like nt-acls, a long list of tokens may
-        be produced. By removing tokens along the way with ndr_token_steal,
-        future calls to retrieve from the token list are not as expensive.
-    
-        Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-        Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-        Reviewed-by: Garming Sam <garming@catalyst.net.nz>
-    
-      commit 9af628a488d2b628e6c33917be7030602eeb5fde
-      Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-      Date:   Fri Feb 26 17:01:37 2016 +1300
-    
-        ndr: avoid unnecessary searches of token list
-    
-        When pulling complex structures like nt-acls, a long list of tokens
-        may be produced. This change means the token list won't be walked in the
-        buffers case if the switch value is not needed.
-    
-        Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-        Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-        Reviewed-by: Garming Sam <garming@catalyst.net.nz>
-    
-    Change-Id: I0e0ce345e5184e0cd180b0079dd693a7ed3f31ef
-    Reviewed-on: https://code.wireshark.org/review/16736
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9fa5617
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Wed Jul 27 22:36:23 2016 +0100
-
-    Add IPv6 to the randpkt manpage
-    
-    Change-Id: Ie8a46f727861319ec51b8390c53da8a0f36ab9ef
-    Reviewed-on: https://code.wireshark.org/review/16732
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 157c2fc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 27 15:06:23 2016 -0700
-
-    Fix from the Samba repository:
-    
-      Author: Aurelien Aptel <aaptel@suse.com>
-      Date:   Wed May 18 14:23:56 2016 +0200
-    
-        pidl/ws: fix failing tests
-    
-        This commit fixes 2 test failures in Pidl test suite.
-    
-        - commit 02cd7808 changed the error the test was expecting
-          => update expected output in the test
-        - commit c76b65e changed whitespaces in the output
-          => revert to the old output in the generator
-    
-        Signed-off-by: Aurelien Aptel <aaptel@suse.com>
-        Reviewed-by: Stefan Metzmacher <metze@samba.org>
-        Reviewed-by: David Disseldorp <ddiss@samba.org>
-    
-    Change-Id: I142d4ae405edfff760c00b95e0475502a1eac2f0
-    Reviewed-on: https://code.wireshark.org/review/16734
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 93d5df4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 27 14:31:21 2016 -0700
-
-    If we don't get any OS information, remove the old OS information.
-    
-    The old information is copied over from one of the input files; if we
-    don't have information about the OS on the machine writing the *output*
-    file, just throw the old information away.
-    
-    (We need a better way to preserve information from the input files;
-    perhaps this:
-    
-       http://www.winpcap.org/pipermail/pcap-ng-format/2016-June/000362.html
-    
-    might work.)
-    
-    Change-Id: Ia25771736d267173f2b6949a91e81e217ee7d16f
-    Reviewed-on: https://code.wireshark.org/review/16730
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e8f4fea
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Tue Jul 26 22:21:23 2016 +0100
-
-    Make randpkt generate the correct IP version for IPv6
-    
-    IP version is always 6 and as a consequence of setting the
-    first byte to 0x60 the 4 high-order bits for the
-    traffic class field are set to zero.
-    
-    Otherwise the IPv6 dissector does not look past the first TVB
-    byte, making randpkt useless to exercise the dissector code.
-    
-    Change-Id: I372ab7f71e6c972106f9dd46edec642ca53b9557
-    Reviewed-on: https://code.wireshark.org/review/16708
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit f66228c
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Jul 27 14:48:00 2016 +0200
-
-    [BTLE] Add new Link layer Feature flags.
-    
-    Change-Id: Ib646d90c6e44075e7ae67f2022dc633fe6423c20
-    Reviewed-on: https://code.wireshark.org/review/16724
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8e60500
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 27 09:14:43 2016 +0200
-
-    IPSec: fix decryption broken in g8cd167a
-    
-    Having no matching in sscanf is a valid use case as the object is already initialized
-    
-    Bug: 12671
-    Change-Id: Iee7185290ea72968437159c344a376defe464dd4
-    Reviewed-on: https://code.wireshark.org/review/16711
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit b347ce62c95c76b840fbb1740912718fde746176)
+    Reviewed-on: https://code.wireshark.org/review/22046
 
-commit ae0f130
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jul 26 00:14:40 2016 +0200
+commit bd59918
+Author: Pavel Strnad <pavel_strnad@hotmail.com>
+Date:   Thu Jun 8 15:23:53 2017 +0200
 
-    ssl-utils: ensure that the cipher suite matches decoder
+    LTE RRC: fix filtering of q-RxLevMin parameter
     
-    When the cipher suite for the current decryption session is changed via
-    a Server Hello, it should not change the cipher suite field of the
-    decoder. Otherwise there is a mismatch between the cipher suite and the
-    capabilities of the decoder.
+    Ensure that filter as a different abbreviation depending on the
+    technology used.
     
-    Fix this issue by making the decoder hold a pointer to the (constant)
-    SslCipherSuite structure rather than making a copy (and have the decoder
-    point to that data).
-    
-    I also considered resetting the decoder once the cipher suite changes in
-    the Server Hello, but that breaks renegotiation.
-    
-    Bug: 12665
-    Change-Id: Ieff38a535cd111d95933ec383378643b6fbab7bf
-    Reviewed-on: https://code.wireshark.org/review/16674
+    Bug: 13481
+    Change-Id: I14782dffcf70bdb015fd705d2184ae8c42f232c5
+    Reviewed-on: https://code.wireshark.org/review/22039
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit fc6c9e4
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Wed Jul 27 06:14:35 2016 +0100
-
-    IPv6: Fix dissection with IPv6 No Next Header
-    
-    Change-Id: I250e1a7ee236ab50b6da1a9b5d846adc9c970e7e
-    Reviewed-on: https://code.wireshark.org/review/16710
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 147cac3
-Author: William Tu <u9012063@gmail.com>
-Date:   Tue Jul 26 08:16:33 2016 -0700
-
-    ERSPAN: support platform specific sub-header.
-    
-    The patch adds support for parsing the 4 types of ERSPAN III platform
-    specific sub-header, if presented.
-    
-    Change-Id: I1719fceb71ed40918e6b16f25a6355d78840f6c6
-    Signed-off-by: William Tu <u9012063@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/16702
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8b0e9c6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 21 10:21:25 2016 -0400
-
-    Follow up for proto_tree_add_checksum.
-    
-    Fill in the "gaps" so that all dissectors that verify checksums have both a
-    status and expert info field.
-    
-    Also address comments from original proto_tree_add_checksum patch that didn't make it.
-    
-    Ping-Bug: 8859
-    Change-Id: I2e6640108fd6bb218cb959fe9e4ba98a13e43a2f
-    Reviewed-on: https://code.wireshark.org/review/16590
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b7f1e99
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Jul 26 16:36:58 2016 +0200
-
-    [BTLE] Use the correct struct.
-    
-    Change-Id: I5b26e97a6b1a0724f4290084418cdd43661ff8d0
-    Reviewed-on: https://code.wireshark.org/review/16701
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 18ae0c8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jul 26 16:21:15 2016 -0700
-
-    IPv6: Remove an unused function and unused macros.
-    
-    Remove _ipv6_hdr_tcls, IPv6_HDR_VERS, IPv6_HDR_TCLS, and IPv6_HDR_FLOW.
-    
-    Change-Id: Idd18c101db6aa6d523a236e81086ff7ef25e6923
-    Reviewed-on: https://code.wireshark.org/review/16709
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit fed443e
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Tue Jul 26 22:15:25 2016 +0100
-
-    randpkt: Add support to generate IPv6
-    
-    Change-Id: I23e68ef204486f6e3e388172cfa8701a595fcedc
-    Reviewed-on: https://code.wireshark.org/review/16707
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Petri-Dish: Dario Lombardo <lomato@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 9a73978
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jul 26 09:27:07 2016 -0400
-
-    Move airpdcap's print_debug_line() to airpdcap_debug.h
-    
-    It saves a little on file pollution and the g_warning call isn't
-    bothered in the header file.
-    
-    Change-Id: Ia9bdd96d9d93bbba6811769c4e6e1ed9124c2e5a
-    Reviewed-on: https://code.wireshark.org/review/16698
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 407c0d0
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Tue Jul 26 18:52:02 2016 +0100
-
-    CLI/GTK: Fix compare_stat checksum to include IPv4 offset again
-    
-    BYTES was not changed to account for the change of ip_len from 16 to 32 bits.
-    
-    Change-Id: I37b472971fe42a05eb612f88bd38c753f5cf0a08
-    Reviewed-on: https://code.wireshark.org/review/16706
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit a5a7c27
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Jul 25 04:25:05 2016 +0100
-
-    IPv6: Add "ipv6_ws" tap providing a ws_ip structure
-    
-    Also remove code dependency on ip6_hdr pointer. It is used solely for the
-    "ipv6" tap now.
-    
-    Change-Id: I07150bfae8bf94bf3c585f20c27b60db78688a7b
-    Reviewed-on: https://code.wireshark.org/review/16655
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 916b26e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jul 26 12:06:57 2016 -0400
-
-    Cleanup some checkAPI warnings that were missed in previous patches.
-    
-    Some search/replace of printf, g_warning and GTK APIs were changed to use a
-    ws_ prefix
-    
-    Change-Id: I9beb763a975530a4006d1afbcad079a7d8d4ebf9
-    Reviewed-on: https://code.wireshark.org/review/16704
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9bfbffa
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jul 26 09:54:46 2016 -0400
-
-    Use ws_g_warning in wslua.
-    
-    The g_warning calls seem legitimate, so "hide" them from checkAPIs.pl.
-    
-    Change-Id: I6d25b08e22aeeb0244e07836385f2b67d6261546
-    Reviewed-on: https://code.wireshark.org/review/16703
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4713ce4
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 26 13:58:55 2016 +0200
-
-    Ensure to have a valid string pointer when writing OS SHB option
-    
-    Change-Id: Ib0b6dcdf1700e88383d30bf43739312fce10e1c7
-    Reviewed-on: https://code.wireshark.org/review/16696
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3a3bf89
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Jul 26 11:56:28 2016 +0200
-
-    editcap: fix typos
-    
-    Change-Id: Ibdd81d8dbc779a8741a83d1269ccfb5ea156dd5a
-    Reviewed-on: https://code.wireshark.org/review/16691
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 3453a0b888a0e188c03012023a4e93d03764602c)
+    Reviewed-on: https://code.wireshark.org/review/22041
 
-commit 84f4a22
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jul 26 12:07:24 2016 +0200
+commit a24bcc5
+Author: linzhao115 <zlbinghamton@gmail.com>
+Date:   Wed Jun 7 19:52:53 2017 -0700
 
-    Update .mailmap
+    export-smb2-objects: Make sure tap be called for named pipe
     
-    Change-Id: Id725f28977282b289a2de26cac2fb92713babe6a
-    Reviewed-on: https://code.wireshark.org/review/16692
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7b75871
-Author: Hiroshi Ioka <hirochachacha@gmail.com>
-Date:   Tue Jul 26 19:38:44 2016 +0900
-
-    packet-smb2: fix data type of share_type
-    
-    According to spec,
+    smb2_eo_tap is not called when smb2 packets are dissected as
+    named pipe then exit. Basically, for the following code snippet,
     
-    https://msdn.microsoft.com/en-us/library/cc246499.aspx
-    
-    share_type uses 1 byte.
-    But, current implementation allocates 2 bytes for it.
-    
-    Change-Id: Ibf55c49168a417c16bde57aad368a1265040afae
-    Reviewed-on: https://code.wireshark.org/review/16695
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d860d5a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jul 26 10:59:30 2016 +0200
-
-    BGP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
+    if (length) {
+            int old_offset = offset;
+            ...
+            offset = dissect_file_data_smb2_pipe(...);
+            if (offset != oldoffset) {
+                    /* managed to dissect pipe data */
+                    return offset;
+            ...
     
-    Change-Id: Iaec85cbe8fbced461a56f55f8813506054356369
-    Reviewed-on: https://code.wireshark.org/review/16688
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 761d555
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jul 26 12:08:20 2016 +0200
-
-    s1ap: fix indent (use 2 spaces) and modelines info
+    dissect_file_data_smb2_pipe() always returns a different offset,
+    thus it will never hit the smb2_eo_tap related code below that
+    are needed for exporting smb2 objects.
     
-    Change-Id: I450f252d22b21438e55285b2af950f6a1c9f6d10
-    Reviewed-on: https://code.wireshark.org/review/16693
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 4d5cf21
-Author: bartolootrit <bartolootrit@code.wireshark.org>
-Date:   Tue Jul 19 16:38:49 2016 +0000
-
-    DNP dissector. Typo in comments
+    As a quick fix, call the tap related code before returning.
     
-    Change-Id: Ie77c7bba0e97cca87b443552c8efe9aaed45734d
-    Reviewed-on: https://code.wireshark.org/review/16545
+    Bug: 13214
+    Change-Id: I7a99177947c384f53424b209f7e5c1f9963b5da8
+    Reviewed-on: https://code.wireshark.org/review/22031
     Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 03bc58d
-Author: William Tu <u9012063@gmail.com>
-Date:   Mon Jul 25 17:52:45 2016 -0700
-
-    ERSPAN: add link to protocol spec and refactoring.
-    
-    Add link to ERSPAN protocol spec, remove obsolete comments, and
-    remove unnecessary 'if(tree)' check.
-    
-    Change-Id: I1b4950777c84d62301c322afdfc876949db0d4ed
-    Signed-off-by: William Tu <u9012063@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/16675
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bcec078
-Author: Marius Paliga <mareko.paliga@gmail.com>
-Date:   Mon Jul 25 09:54:37 2016 +0200
-
-    Fix decoding of MS Info Change Reporting Action
-    
-    Bug: 12642
-    Change-Id: I69b339ff4785a2fe3fb0e2111264616815339c1b
-    Reviewed-on: https://code.wireshark.org/review/16644
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 907d494
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jul 25 22:58:09 2016 -0400
-
-    Fix some of the checkAPIs.pl warnings for g_warning.
-    
-    1. Create ws_g_warning for legitimate uses of g_warning
-    2. Use proto_tree_add_debug_text
-    3. Comment some out
-    
-    Change-Id: Ida044bf40286b955fdd529c4f9907c8e09b3d7c5
-    Reviewed-on: https://code.wireshark.org/review/16678
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6fbaf9b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jul 21 23:27:05 2016 +0200
-
-    GVSP: enforce heuristic (get some false positive with STUN)
-    
-    Change-Id: Ic1da51a71ee4fa60267751d7bb3f46225ad2f084
-    Reviewed-on: https://code.wireshark.org/review/16573
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d3ce757
-Author: Matt Texier <matthieu@texier.tv>
-Date:   Fri Jul 22 02:10:54 2016 +0200
-
-    MP-BGP dissector: Fix EVPN route type 5 decoding
-    
-    Route type 5 do have optional fields that was not properly decoded (MPLS labels)
-    
-    Bug: 12631
-    Change-Id: I12d61ef170d4e0f6e6d2c7bf25f149db84c186d7
-    Reviewed-on: https://code.wireshark.org/review/16576
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 34a0c4d
-Author: Hiroshi Ioka <hirochachacha@gmail.com>
-Date:   Mon Jul 18 16:59:31 2016 +0900
-
-    packet-smb2: add a dissector for STATUS_STOPPED_ON_SYMLINK
-    
-    Bug: 12628
-    Change-Id: I666416d1a6facdbf8f4fa6230d6b061cad23dc7a
-    Reviewed-on: https://code.wireshark.org/review/16524
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f587b1b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jul 25 12:04:25 2016 +0200
-
-    SMB2: Always display reserved field
-    
-    Change-Id: I2f4878d7b730d626d75ac5ed57a00acc8ec34990
-    Reviewed-on: https://code.wireshark.org/review/16658
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 347f071
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 25 17:39:10 2016 +0200
-
-    WBXML: limit the recursion level
-    
-    Bug: 12663
-    Change-Id: Ibbab2f20f4eda9f42ea0ea5e88dcf553cce1b55c
-    Reviewed-on: https://code.wireshark.org/review/16670
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2193bea
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 25 17:08:26 2016 +0200
-
-    WAP: check that tvb_get_guintvar does not overflow
-    
-    Bug: 12661
-    Change-Id: I2ef857d6be6595fd89f3dbb8d41c1c70d550ad93
-    Reviewed-on: https://code.wireshark.org/review/16665
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5670642
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 25 11:19:05 2016 +0200
-
-    proto.c: add bounds check to proto_tree_add_text(_valist)_internal
-    
-    Bug: 12659
-    Change-Id: I44cb3ce8e647ae2816d5ffa95435068c435a1e5c
-    Reviewed-on: https://code.wireshark.org/review/16648
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 896751e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jul 25 10:15:46 2016 -0700
-
-    Use a variable consistently.
-    
-    We test against "field" in ServiceResponseTimeDialog::filterExpression.
-    Make sure we use it within the test as well.
-    
-    Bug: 12627
-    Change-Id: If11ab9fcdb8394f4366569185808ec1ddfc34dfe
-    Reviewed-on: https://code.wireshark.org/review/16672
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2bec34a
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Tue Jul 26 00:18:09 2016 +0100
-
-    IPv6: Add fragment header size #define
-    
-    Change-Id: I536324da9ec761279cc3d3d5df681a4217d5b5fc
-    Reviewed-on: https://code.wireshark.org/review/16676
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 3ebb2cf
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Jul 25 17:12:30 2016 +0200
-
-    editcap: fix typos
-    
-    Change-Id: Ic5eb5daca1ab7463723ee2b299482929f3e8be56
-    Reviewed-on: https://code.wireshark.org/review/16666
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e14dde0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jul 25 16:03:23 2016 +0200
-
-    vxlan(.h): fix no newline at end of file [-Wnewline-eof]
-    
-    Change-Id: Ib53a0234eb8b6a24470e1e6beabe26515b6ef421
-    Reviewed-on: https://code.wireshark.org/review/16664
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 187469e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jul 25 12:27:43 2016 +0200
-
-    SMB2: (Re)indent hf_register_info hf (use tab)
-    
-    Change-Id: I872baa7bf44cc6c675366206e749c50001cee067
-    Reviewed-on: https://code.wireshark.org/review/16659
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e2f36ef
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jul 25 11:51:38 2016 +0200
-
-    vsock: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-    
-    Change-Id: I266b0542597eec755b7998d9d5abbae8e804b192
-    Reviewed-on: https://code.wireshark.org/review/16651
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 5a469dd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 25 13:32:45 2016 +0200
-
-    LDSS: check if a conversation already exists before recreating it
-    
-    Bug: 12662
-    Change-Id: I81d91d54544e5865336dc08ffda9fe109fc643ed
-    Reviewed-on: https://code.wireshark.org/review/16660
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3c93b67d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jul 25 11:26:08 2016 +0200
-
-    SHIM6: rename p variable by offset
-    
-    Change-Id: I3f7e3291e119eb51c85381d1141bd79b2d61ec18
-    Reviewed-on: https://code.wireshark.org/review/16649
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 10bcfa5
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Jul 25 11:34:22 2016 +0200
-
-    [S1AP] Add dissection of the content of UERadioCapabilityForPaging.
-    
-    Change-Id: I7f6686a9324fdd364653404ed4b3315d6ca36716
-    Reviewed-on: https://code.wireshark.org/review/16650
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b814ae2
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Jul 22 14:35:56 2016 +0200
-
-    [GTPv2] Dissect TWAN Identifier and other minor updates.
-    
-    Bug:12638
-    Change-Id: I13446727a46b4df4fe3e667723aa43d83efe1159
-    Reviewed-on: https://code.wireshark.org/review/16585
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 095a3c8
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Jul 25 04:55:06 2016 +0100
-
-    IPv6: Use wmem_packet_scope for ws_ip address allocation
-    
-    Change-Id: I7e386fe0f8cb3a19a91a16c1152ce500367c13fd
-    Reviewed-on: https://code.wireshark.org/review/16654
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 00e74ac
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Jul 25 04:21:21 2016 +0100
-
-    IPv6: Use pinfo->pool scope for ipv6_pinfo
-    
-    Change-Id: I415103eaba23b1a616667cf7c72af3b391a9e5ab
-    Reviewed-on: https://code.wireshark.org/review/16653
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 80f7d9c
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Mon Jul 25 04:07:31 2016 +0100
-
-    IPv6: Say "unknown" for unknown ip protocol column info
-    
-    Change-Id: I99424f9382dd602d3f29251cdbf7d32666409d90
-    Reviewed-on: https://code.wireshark.org/review/16652
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 7791505
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sun Jul 24 19:11:01 2016 +0100
-
-    IPv6: Use ipv6_pinfo_t instead of ws_ip to keep some state
-    
-    To perform IPv6 defragmentation we need to compute the IPv6 fragment header
-    payload length by subtracting the length of intermediate extension headers
-    from the IPv6 payload length.
-    
-    Add a new frag_plen field to ipv6_pinfo_t to do that instead of (ab)using
-    struct ws_ip.
-    
-    Note: The RFC 2460 rules for fragment header order are stricter than the code
-    suggests but that shouldn't be a problem here.
-    
-    Change-Id: I76f3cb3a1a29d96b080d3d53c0f493f9d0b2786c
-    Reviewed-on: https://code.wireshark.org/review/16637
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 6cf9616
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 25 09:37:25 2016 +0200
-
-    RLC: fix a variable overflow in rlc_decode_li function
-    
-    Bug: 12660
-    Change-Id: I20a423eb9aa72383ac28d176bc60751ed36be9bd
-    Reviewed-on: https://code.wireshark.org/review/16639
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 47a5fa8
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 25 09:54:06 2016 +0200
-
-    RLC: fix a stack overflow in rlc_decode_li function
-    
-    The test to check whether the array was full or not was off by 1
-    
-    Bug: 12664
-    Change-Id: If2057b71d92c7f03e05b0f4676abc62d5a03ae73
-    Reviewed-on: https://code.wireshark.org/review/16640
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 55069da
-Author: Gerard Garcia <ggarcia@deic.uab.cat>
-Date:   Sun Jul 24 21:33:41 2016 -0400
-
-    Add vSocket dissector
-    
-    Header definition:
-    https://github.com/GerardGarcia/linux/blob/vsockmon/include/uapi/linux/vsockmon.h
-    
-    Bug: 12623
-    Change-Id: I9af4b5069f69b847779a8b25abb3939e672dc9c3
-    Reviewed-on: https://code.wireshark.org/review/16308
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1da1f94
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 24 08:53:39 2016 -0400
-
-    Fix checkAPI.pl warnings about printf
-    
-    Many of the complaints from checkAPI.pl for use of printf are when its embedded
-    in an #ifdef and checkAPI isn't smart enough to figure that out.
-    The other (non-ifdef) use is dumping internal structures (which is a type of
-    debug functionality)
-    Add a "ws_debug_printf" macro for printf to pacify the warnings.
-    
-    Change-Id: I63610e1adbbaf2feffb4ec9d4f817247d833f7fd
-    Reviewed-on: https://code.wireshark.org/review/16623
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ee7f9c3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 24 14:16:19 2016 -0400
-
-    Pacify GTK checkAPIs.pl warnings.
-    
-    Add "Wireshark" macros to old-gtk-compat.h for GTK APIs that have been deprecated.
-    The macros are setup by version number to limit their proliferation (not that I
-    suspect much development will really be done there since GTK is deprecated).
-    Just want to make buildbots happy for the time being.
-    
-    Change-Id: I095f850065166a0bc2e2456fb2e886ab64fdd97d
-    Reviewed-on: https://code.wireshark.org/review/16635
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    (cherry picked from commit 411a5342c5d9f12651ed7c8d268597bdc3db9f4a)
+    Reviewed-on: https://code.wireshark.org/review/22034
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 688d055
+commit 4f4258e
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jul 24 18:43:14 2016 +0200
+Date:   Wed Jun 7 23:26:33 2017 +0200
 
-    zvt: use a hash table for the bitmaps
-    
-    table entries contain the length (if known and constant) and a function
-    to dissect the payload
+    wsmp: read the message length as big endian
     
-    this should clean up the code for bitmap dissection and make it easier
-    to add new entries
+    We add the message length to the tree as big endian but we interpret it
+    as little endian for our further calculations. This causes parsing
+    errors. Use big endian for both cases.
     
-    Change-Id: Id0ef5ff9e53c82171789c8a3352e56d3997d82b9
-    Reviewed-on: https://code.wireshark.org/review/16632
+    Bug: 13766
+    Change-Id: I4e6cdb7d4267be96ea78eb664e88c532a9a90b52
+    Reviewed-on: https://code.wireshark.org/review/22024
     Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 363617f
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sun Jul 24 19:10:56 2016 +0100
-
-    Use 'nxt' argument in ipv6_dissect_next()
-    
-    Change-Id: I7190aa5301ba54be4c179dc7815c4be82987c949
-    Reviewed-on: https://code.wireshark.org/review/16636
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 3e6df07
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jul 24 19:23:48 2016 +0200
-
-    zvt: rename dissect_zvt_bitmap_apdu() to dissect_zvt_bitmap_seq()
-    
-    the sequence of bitmaps can either be the complete APDU payload or a
-    part of it
-    
-    Change-Id: I3e3d176f29a5c2a0ad2c7fb61102c46255f436da
-    Reviewed-on: https://code.wireshark.org/review/16631
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 20f3a9a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jul 24 18:24:08 2016 +0200
-
-    zvt: rename bitmap to bmp
-    
-    It looks like the specs call the first byte BMP and the whole record
-    (BMP + content) is called the bitmap.
-    
-    Change-Id: I60ce75b131b3cddc59f614b8ca156ceacc890cf8
-    Reviewed-on: https://code.wireshark.org/review/16630
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit d508a9b
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Jul 16 20:36:11 2016 +0200
-
-    Add Ericsson A-bis P-GSL dissector
-    
-    Ericsson uses a vendor-specific packetized PCU-CCU interface on their
-    packetized A-bis, which can be encapsulated in their own variant of HDLC
-    on top of L2TP.
-    
-    The new P-GSL dissector is called from packet-ehdlc.c, which in turn
-    integrates with packet-l2tp.c.
-    
-    Change-Id: Ifca190577b1c9691209221d79e3ef034dc3ca650
-    Reviewed-on: https://code.wireshark.org/review/16510
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit bd130766438546ab64f7540597a2e3b82cbf8a3c)
+    Reviewed-on: https://code.wireshark.org/review/22028
 
-commit c2ada3d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 24 10:04:52 2016 -0400
-
-    Replace strlen with NULL checks to pacify checkAPIs.pl
-    
-    Change-Id: I5db39cbd531c228da73447bf8899599f82e1889d
-    Reviewed-on: https://code.wireshark.org/review/16624
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8505fb0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 24 10:14:48 2016 -0400
-
-    Fix shadow variable warnings.
-    
-    Change-Id: I1e6bd722b3f04f171b462fc680ca080bb7ec03c7
-    Reviewed-on: https://code.wireshark.org/review/16625
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a06042d
+commit d3bf38c
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jul 24 08:07:54 2016 -0700
+Date:   Wed Jun 7 18:07:16 2017 -0700
 
-    [Automatic update for 2016-07-24]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
+    2.4.0rc1 → 2.4.0rc2.
     
-    Change-Id: I9a88b1d2ac3fd54cd2b7bfbb652ba504db81df65
-    Reviewed-on: https://code.wireshark.org/review/16626
+    Change-Id: Ie37f6e639b7fc2a16459b37283af28beeff15d45
+    Reviewed-on: https://code.wireshark.org/review/22027
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit e878525
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Jul 16 18:34:34 2016 +0200
-
-    Add basic dissector for Ericsson Packet A-bis TFP Protocol
-    
-    This dissector currently onl dissects the TFP header, treating the
-    payload (TRAU) as opaque data.  Still, it is an improvement to see the
-    header information like timeslot, sequence number, delay and frame type.
-    
-    The new TFP dissector is called from packet-ehdlc.c, which in turn is
-    used inside Ericsson-specific L2TP.
-    
-    Change-Id: I8835c07e259ec9a324ec92aac39abbef2c902af3
-    Reviewed-on: https://code.wireshark.org/review/16509
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 051f5cb
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Mon Jul 18 16:09:56 2016 +0200
-
-    L2TP: Add some more Ericsson-specific AVPs
-    
-    Change-Id: I3d0eb7f9b5641c388493c7188c128bfb14dfbf60
-    Reviewed-on: https://code.wireshark.org/review/16622
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fff6019
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 24 01:47:15 2016 -0700
-
-    Fix indentation (no tabs).
-    
-    Change-Id: Ic45c0aa526e90bd51c0c501cdd349255ce0b43f5
-    Reviewed-on: https://code.wireshark.org/review/16621
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2101af4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 24 01:44:58 2016 -0700
-
-    More null "IP information" pointer checks.
-    
-    Bug: 12645
-    
-    Change-Id: I356b6570f9a33fd495523a5e1fa6ada56047dc45
-    Reviewed-on: https://code.wireshark.org/review/16620
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2a3612f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 24 01:32:34 2016 -0700
-
-    Don't even *mention* the TTL/hop limit if we don't have it.
-    
-    That's cleaner than reporting it as 0.
-    
-    Change-Id: I862130c98131ba83f9689201d852e2f1aab34770
-    Reviewed-on: https://code.wireshark.org/review/16619
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 284aed2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 24 01:21:26 2016 -0700
-
-    More null "IP information" pointer checks.
-    
-    Bug: 12645
-    Change-Id: Iac662bec3c23b0b3d228766ad7a094f615770072
-    Reviewed-on: https://code.wireshark.org/review/16618
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 00961a0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 24 01:05:23 2016 -0700
-
-    Pass the next protocol value to ip_try_dissect() as an argument.
-    
-    That way, we don't rely on the ws_ip pointer being non-null.
-    
-    Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac.
-    
-    Change-Id: If8c437572c725481ac4148c8095a1a479b4fb0f8
-    Reviewed-on: https://code.wireshark.org/review/16617
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 523e8c3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 24 00:59:06 2016 -0700
-
-    Pass the next header value to ipv6_dissect_next() as an argument.
-    
-    That way, we don't rely on the ws_ip pointer being non-null.
-    
-    Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac.
-    
-    Bug: 12645
-    Change-Id: I8c74ba57637b6a125593c4711d7c21b9693c2c85
-    Reviewed-on: https://code.wireshark.org/review/16616
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d109a8d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 24 00:48:41 2016 -0700
-
-    More null pointer checks.
-    
-    Taken from Ib73410fd8575ad6c836311bbda87a0580e5640ac.
-    
-    Bug: 12645
-    Change-Id: Ie08c113b6193da40ce0e438faefd78ad36b4d475
-    Reviewed-on: https://code.wireshark.org/review/16615
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 696011f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 24 00:26:45 2016 -0700
-
-    Don't assume we've been passed a non-null data pointer.
-    
-    There is no guarantee of that.
-    
-    Bug: 12645
-    Change-Id: Icb3310e5df37acfd113a9e2b1fee34e59ef28962
-    Reviewed-on: https://code.wireshark.org/review/16614
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f930da8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 23 19:16:36 2016 -0700
-
-    Enable "Save As..." iff cf_can_save_as() returns TRUE.
-    
-    Currently, cf_can_save() really means "*there's something to save* and
-    we can write it out"; "Save As..." should be enabled even if there are
-    no changes to save, in case the user just wants to write the existing
-    file contents out to a new file and have the new file be the current
-    file.  That matches the behavior of the GTK+ version.
-    
-    (We might want to enable "Save" even if there are no changes to save;
-    some other programs do that, such as the TextEdit, WordPad, KWrite, and
-    gedit simple text editors.  If so, however, we should make "Save" write
-    stuff out even if there are no changes to save.
-    
-    Note, however, that we're a bit different from most "editors", in that
-    we don't read the entire file into memory - we keep the file open and
-    read packet data from it, because we want to be able to read files that
-    won't fit into memory.  That *might* change what we ultimately want to
-    do with "Save".)
-    
-    Bug: 12630
-    Change-Id: I8a2327b5d6ddab7c4f0367f132460b507da38577
-    Reviewed-on: https://code.wireshark.org/review/16612
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5488581
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Jul 23 02:28:51 2016 +0100
-
-    Replace an #ifdef with g_path_is_absolute()
-    
-    Change-Id: I0df8ea363502bb5e313192b6a10f6df032031699
-    Reviewed-on: https://code.wireshark.org/review/16601
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0590a4f
-Author: Harald Welte <laforge@gnumonks.org>
-Date:   Sat Jul 16 18:33:55 2016 +0200
-
-    packet-ehdlc: Update with results from better understanding the protocol
-    
-    The Ericsson HDLC format inside L2TP is not publicly documented, so when
-    I originally wrote the code, I was basically just looking at hex-dumps
-    of protocol traces and trying to ge an initial understanding. By now,
-    that understanding has significantly matured, so let's update the
-    dissector accordingly.
-    
-    The major changes are regarding the understanding that there is not a
-    message type, but in fact a compressed SAPI and compressed TEI field.
-    
-    Based on this, we can discriminate on whether there will be a HDLC/LAPD
-    header to follow, or whether there's actual user data (TRAU frame
-    replacement) following.
-    
-    Change-Id: Ic29d2d295678c4dc5f93cd8404b2e832f4532daf
-    Reviewed-on: https://code.wireshark.org/review/16508
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit baf8f9c
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Fri Jul 22 13:30:52 2016 -0700
-
-    Add support for USB3-specific Hub Class Feature Selectors
-    
-    Add Hub Class Feature Selectors (defined in USB3.1 spec, table 10-9) to USBHUB dissector.
-    
-    Change-Id: I53f73b5d689b8921907514e0fcd74a152abc2b49
-    Signed-off-by: Sean O. Stalley <sean.stalley@intel.com>
-    Reviewed-on: https://code.wireshark.org/review/16593
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c07bf81
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 23 14:03:32 2016 -0400
-
-    packet-socketcan.c - Add subdissector name to layer list.
-    
-    This allows GTK Decode As to function properly if CAN subdissector
-    has a dissector table.
-    
-    Change-Id: I5eb3642c34642302939d27e844fe93f626ba039c
-    Reviewed-on: https://code.wireshark.org/review/16606
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a02e90d
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Jul 23 03:52:10 2016 +0100
-
-    filesystem.c: Don't constify mallocated pointer
-    
-    Change-Id: I8991682bda256c5e1c09a303b0243e240b276101
-    Reviewed-on: https://code.wireshark.org/review/16602
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c9329ff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 23 01:56:12 2016 -0700
-
-    Suggest using a task dialog, so we can label the buttons.
-    
-    Change-Id: I2827ab8b5d4a9c17e6c178d9397fcf897a356c9f
-    Reviewed-on: https://code.wireshark.org/review/16603
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0aaff39
-Author: dsrsupport <eugene.exarevsky@dsr-company.com>
-Date:   Thu Jul 21 17:35:24 2016 +0300
-
-    ZigBee: implement dissector for Parent_Annce_rsp; minor fixes
-    
-    Implement dissector for User Descriptor Response.
-    Fix Number OfChild foield or Parent_Annce.
-    Fix name of User Descriptor Response cluster.
-    
-    Change-Id: Ia48277a76bc7742021a407a45ca18e2c51a35046
-    Reviewed-on: https://code.wireshark.org/review/16570
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ba0b0b1
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Sun Jul 17 22:42:32 2016 -0400
-
-    Qt follow stream: don't clear the text widget when doing Save-As.
-    
-    ... Otherwise the user will see an empty stream after the Save-As operation.
-    
-    Change-Id: Ibafcb4e4b670807702a8d8a5756544471f2eccc3
-    Reviewed-on: https://code.wireshark.org/review/16521
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 904d9fc
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Tue Jul 19 22:06:31 2016 +0100
-
-    Update struct ws_ip with flow label and comments
-    
-    Change field ip_v_hl to version.
-    
-    Change-Id: Ic7ce8d6d083f6413284a7b9ba91a2387b11b29fb
-    Reviewed-on: https://code.wireshark.org/review/16555
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit c11cdd6
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sat Jul 23 01:10:33 2016 +0100
-
-    Use wmem_new0() to allocate struct ws_ip
-    
-    Change-Id: I0e76ffc2dc0c3e3d7bd081ff433c95741b9aa906
-    Reviewed-on: https://code.wireshark.org/review/16598
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit ea055d5
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jul 22 19:30:34 2016 -0400
-
-    packet-diameter_3gpp.c: Convert many fields to use proto_tree_add_bitmask_with_flags
-    
-    Change-Id: I1936ec4ca6003d3268674079b79da0b009a62f10
-    Reviewed-on: https://code.wireshark.org/review/16597
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 752b5de
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Fri Jul 22 23:24:13 2016 +0100
-
-    IPv6: Another get_jumbo_plen cleanup
-    
-    Change-Id: I81e618cd889aa1425e03b7dcb6e0af3d995b1d54
-    Reviewed-on: https://code.wireshark.org/review/16595
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 4a60897
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Fri Jul 22 13:31:07 2016 +0200
-
-    sshdump: Change ws_close to closesocket
-    
-    ws_close just calls _close(); that doesn't close sockets.  closesocket()
-    is the API to close a socket on Windows, and is defined as close()
-    on UN*X, so using closesocket() will close sockets on Windows and UN*X.
-    
-    This way, we close the pipe socket correctly on Windows.
-    
-    Change-Id: I6d50e26bfabac5618c74a180cbe94d444b591bd4
-    Reviewed-on: https://code.wireshark.org/review/16582
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cf4fc7b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jul 22 10:15:07 2016 -0700
-
-    Use ws_printf routines everywhere in column-utils.c.
-    
-    Change-Id: I8764b67b5ab320323c96fe21e5ebaa03815905fd
-    Reviewed-on: https://code.wireshark.org/review/16591
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 0482b0b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jul 22 10:01:03 2016 -0700
-
-    Qt: Don't force a repaint in update_progress_dlg.
-    
-    Remove a call to update() in order to force a repaint for large capture
-    files. Doing so incurs a small-but-nonzero delay on Windows and it should
-    no longer be needed since we switched to timer-based updates in gb5a585c.
-    
-    Change-Id: I01ff2eed165d15dd1d3218550baa664f43dd442a
-    Reviewed-on: https://code.wireshark.org/review/16589
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 24aa839
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 22 12:13:06 2016 -0700
-
-    Get rid of all references to new_create_dissector_handle().
-    
-    It went away a long time ago; use create_dissector_handle().
-    
-    Change-Id: I28e90821033621bc7a5572243ff5871b4e67d60d
-    Reviewed-on: https://code.wireshark.org/review/16592
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ba607a1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jul 22 13:48:58 2016 +0200
-
-    MPTCP: fix offset used for AddrID field in MP_JOIN and MP_PRIO messages
-    
-    Bug: 12641
-    Change-Id: I7ba5cbf795eef3e77a7161b8dc8752d9c10610f8
-    Reviewed-on: https://code.wireshark.org/review/16583
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 52ed7d3
-Author: Marius Paliga <mareko.paliga@gmail.com>
-Date:   Fri Jul 22 13:26:12 2016 +0200
-
-    Add support for new AVPs defined in 29.273
-    
-    Bug: 12643
-    Change-Id: Ic9c26dc864b2b016ba722620098caf44a800f0f4
-    Reviewed-on: https://code.wireshark.org/review/16581
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 12dd012
-Author: Marius Paliga <mareko.paliga@gmail.com>
-Date:   Fri Jul 22 09:34:35 2016 +0200
-
-    Added decoding of MS Info Change Reporting Action IE
-    
-    Bug: 12642
-    Change-Id: I845687763a261566036c7d38c310656d38b06fa5
-    Reviewed-on: https://code.wireshark.org/review/16579
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2c38a05
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Thu Jul 21 00:37:15 2016 +0100
-
-    Qt: Add hovered byte lock on left-click
-    
-    Allows marking/unmarking a single byte in the bytes view pane.
-    
-    Ping-Bug: 11547
-    Change-Id: I574ad7c6218eb08018094ea92ba79b69dbe4b45d
-    Reviewed-on: https://code.wireshark.org/review/16563
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 0903568
-Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
-Date:   Sun Jul 17 05:02:29 2016 +0100
-
-    Decouple extension headers from the IPv6 dissector loop
-    
-    Register MIPv6 too in "ipv6.nxt". Fixes bug 10705.
-    
-    Bug: 10705
-    Change-Id: I297d8983d65ee7585e1201a81d10396001e0d167
-    Reviewed-on: https://code.wireshark.org/review/16561
-    Petri-Dish: João Valverde <j@v6e.pt>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: João Valverde <j@v6e.pt>
-
-commit 7844a11
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jul 21 09:55:03 2016 +0200
-
-    Add Nordic semiconductors dissector to read files produced by their BTLE
-    sniffer.
-    Code downloaded from
-    https://www.nordicsemi.com/eng/Products/Bluetooth-low-energy/nRF-Sniffer
-    and cleaned up and modified to comple with current Wireshark version.
-    
-    Bug 12637
-    Change-Id: Ic73122f35039b4245d6219b825a28c10f22f36ad
-    Reviewed-on: https://code.wireshark.org/review/16569
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 53de2c2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 20 23:54:35 2016 +0200
-
-    Convert more glib memory to wmem pinfo pool
-    
-    Change-Id: I4cc23bc19a6bd8c6a8e0389eaf939dbb60fe0ca3
-    Reviewed-on: https://code.wireshark.org/review/16562
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b2e4a7e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 21 17:34:56 2016 -0700
-
-    Minimize allocations for frame tvbuffs and Buffers.
-    
-    Try to minimize the number of times we allocate memory for Buffers and
-    Buffer data.
-    
-    Change-Id: I738fdc64e571772ef4ba6335d49087277dd7b430
-    Reviewed-on: https://code.wireshark.org/review/16577
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e3a15cf
-Author: William Tu <u9012063@gmail.com>
-Date:   Wed Jul 20 21:38:47 2016 -0700
-
-    Fix ERSPAN type II and type III offset.
-    
-    For ERSPAN type II (version == 1), the offset is shifted by 4 at the
-    end. As a result, the 'offset+=2' at the end of ERSPAN type III should
-    be in its own 'else' scope.
-    
-    Change-Id: I64a55d5722e3f4f5672ca2a4228583b3b51559e1
-    Reviewed-on: https://code.wireshark.org/review/16568
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
diff --git a/NEWS b/NEWS
index efee6ad561..14f9dea7b1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-                        Wireshark 2.4.0rc1 Release Notes
+                        Wireshark 2.4.0rc2 Release Notes
 
    This is the first release candidate for Wireshark 2.4.0.
      __________________________________________________________________
@@ -47,20 +47,22 @@ What's New
 
   New Protocol Support
 
-   (Facebook) Zero, Bluetooth HCI Vendor Intel, CAN FD, DirectPlay 8
-   protocol, Ericsson A-bis P-GSL, Ericsson A-bis TFP (Traffic Forwarding
-   Protocol), Fc00/cjdns Protocol, Generic Netlink (genl), GSM Osmux,
+   Bluetooth HCI Vendor Intel, CAN FD, Citrix NetScaler Metric Exchange
+   Protocol, Citrix NetScaler RPC Protocol, DirectPlay 8 protocol,
+   Ericsson A-bis P-GSL, Ericsson A-bis TFP (Traffic Forwarding Protocol),
+   Facebook Zero, Fc00/cjdns Protocol, Generic Netlink (genl), GSM Osmux,
    GSMTAP based logging, Health Level 7 (HL7), High-speed SECS message
    service (HSMS), HomePNA, IndigoCare iCall protocol, IndigoCare Netrix
    protocol, iPerf2, ISO 15765, Linux 802.11 Netlink (nl80211), Local
    Service Discovery (LSD), M2 Application Protocol, Mesh Link
-   Establishment (MLE), Netgear Ensemble Protocol, NetScaler HA Protocol,
-   NetScaler Metric Exchange Protocol, NetScaler RPC Protocol, NM
-   protocol, Nordic BLE Sniffer, NVMe, NVMe Fabrics RDMA, OBD-II PIDs,
+   Establishment (MLE), MUDURL, Netgear Ensemble Protocol, NetScaler HA
+   Protocol, NetScaler Metric Exchange Protocol, NetScaler RPC Protocol,
+   NM protocol, Nordic BLE Sniffer, NVMe, NVMe Fabrics RDMA, OBD-II PIDs,
    OpenThread simulator, RFTap Protocol, SCTE-35 Digital Program Insertion
-   Messages, Snort Post-dissector, Thread CoAP, Unified Diagnostic
-   Services (UDS), vSocket, Windows Cluster Management API (clusapi), and
-   X-Rite i1 Display Pro (and derivatives) USB protocol
+   Messages, Snort Post-dissector, Thread CoAP, UDP based FTP w/ multicast
+   (UFTP and UFTP4), Unified Diagnostic Services (UDS), vSocket, Windows
+   Cluster Management API (clusapi), and X-Rite i1 Display Pro (and
+   derivatives) USB protocol
 
   Updated Protocol Support
 
@@ -68,11 +70,7 @@ What's New
 
   New and Updated Capture File Support
 
-   Non-empty section placeholder.
-
-  New and Updated Capture Interfaces support
-
-   Non-empty section placeholder.
+   ERF, IxVeriWave, Libpcap, and Pcap-ng
 
    IEEE802.11: wlan_mgt display filter element got renamed to wlan.
    Libgcrypt is now a required dependency.
@@ -138,7 +136,7 @@ Frequently Asked Questions
    A complete FAQ is available on the [14]Wireshark web site.
      __________________________________________________________________
 
-   Last updated 2017-06-07 21:59:45 UTC
+   Last updated 2017-06-28 17:23:59 UTC
 
 References
 
diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc
index 5d10294027..cf7c26a5b5 100644
--- a/docbook/attributes.asciidoc
+++ b/docbook/attributes.asciidoc
@@ -1,6 +1,6 @@
 // Common attributes
 
-:wireshark-version: 2.4.0rc1
+:wireshark-version: 2.4.0rc2
 
 //
 // URLs
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 3553aa0259..6752d9d0ee 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -99,7 +99,11 @@ DirectPlay 8 protocol
 NM protocol
 Netgear Ensemble Protocol
 OBD-II PIDs
-(Facebook) Zero
+Facebook Zero
+Citrix NetScaler Metric Exchange Protocol
+Citrix NetScaler RPC Protocol
+MUDURL
+UDP based FTP w/ multicast (UFTP and UFTP4)
 --sort-and-group--
 
 === Updated Protocol Support
@@ -108,16 +112,20 @@ Too many protocols have been updated to list here.
 
 === New and Updated Capture File Support
 
-_Non-empty section placeholder._
+//_Non-empty section placeholder._
 // Add one file type per line between the --sort-and-group-- delimiters.
 --sort-and-group--
+Libpcap
+Pcap-ng
+ERF
+IxVeriWave
 --sort-and-group--
 
-=== New and Updated Capture Interfaces support
+//=== New and Updated Capture Interfaces support
 
-_Non-empty section placeholder._
---sort-and-group--
---sort-and-group--
+//_Non-empty section placeholder._
+//--sort-and-group--
+//--sort-and-group--
 
 //=== Major API Changes
 IEEE802.11: wlan_mgt display filter element got renamed to wlan.
diff --git a/version.conf b/version.conf
index 0dfba2bb4c..f40363f4cf 100644
--- a/version.conf
+++ b/version.conf
@@ -1,13 +1,13 @@
 # Interim releases: Enable packaging, add an "rc" to the version.
-enable: 1
-pkg_format: rc1-%#
-pkg_enable: 1
-
-# Release candidates
 #enable: 1
-#pkg_format: rc1
+#pkg_format: rc1-%#
 #pkg_enable: 1
 
+# Release candidates
+enable: 1
+pkg_format: rc2
+pkg_enable: 1
+
 # Final release: Disable package version stamps.
 #enable: 1
 #pkg_format:
author	Gerald Combs <gerald@wireshark.org>	2017-06-28 10:34:58 -0700
committer	Gerald Combs <gerald@wireshark.org>	2017-06-28 17:36:07 +0000
commit	739ff7576460e3cb98bee6858a6cbf3e0ca18e89 (patch)
tree	754aeea47ae1037f5c49aee06acd810a56295662
parent	f975c1712ed36be1eca5d99130d82c0a65353b08 (diff)
download	wireshark-739ff7576460e3cb98bee6858a6cbf3e0ca18e89.tar.gz