TCP: fix no previous prototype for 'exp_pdu_tcp_dissector_data_size/exp_pdu_tcp_disse...
[metze/wireshark/wip.git] / ChangeLog
index a1bfdcf073de912808872a38ff0d299f5aad701a..b96eaeee944505300a5610b1a38c76a628abeec8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
-commit a971768
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Dec 8 21:40:24 2014 -0500
+commit d5f84c0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jul 14 11:05:17 2016 -0700
 
-    Refactor "color" conversation filters
+    Build 2.1.1.
     
-    Have dissectors register their desire to be part of "color" conversation filters and have the GUI use that registered list.  GUI actually using API will come in a separate commit.
+    Change-Id: I2895d29415bb191bf2d7fc0a4468f085085bd4d9
+
+commit 530e7f0
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jul 14 18:12:16 2016 +0100
+
+    IPv6: Fix jumbo payload length offset
     
-    Change-Id: I5ffe922d97894fe7bf3182056b76ab5839a9461a
-    Reviewed-on: https://code.wireshark.org/review/5658
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I52fb082782674cc851b246d3b6afa7b4f14bbe34
+    Reviewed-on: https://code.wireshark.org/review/16434
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit e050ad2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 6 15:39:26 2014 -0500
+commit 43f7d22
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jul 14 17:55:31 2016 +0100
 
-    Eliminate some proto_tree_add_text in packet-bgp.c
+    IPv6: Fix Jumbogram hop-by-hop expert info
     
-    Change-Id: I05fabe9786125e2167fe4010733f61000d0e7914
-    Reviewed-on: https://code.wireshark.org/review/5670
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Matthieu Texier <matthieu@texier.tv>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I751acad2fad501b700c01a37bafa96d2add8fb36
+    Reviewed-on: https://code.wireshark.org/review/16433
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit d4476b1
+commit 75b0e29
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 10 00:39:13 2014 -0800
+Date:   Thu Jul 14 10:08:26 2016 -0700
 
-    Expose find_heur_dissector_list().
+    Update URLs.
     
-    We already have find_dissector_table(); expose
-    find_heur_dissector_list() as well, so that heuristic dissector lists
-    can be shared.
+    (Gotta ensure that there's always at least one commit here that's less
+    than a year old. :-))
     
-    Change-Id: I3f50413b8b10fd3129fcdc2344cb1447f0946ce9
-    Reviewed-on: https://code.wireshark.org/review/5701
+    Change-Id: I297920f1b68dd49550ce07544797a9f2cb854cf5
+    Reviewed-on: https://code.wireshark.org/review/16432
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit bd8d2f5
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Wed Dec 10 04:19:55 2014 +0300
+commit 6c0972b
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jul 14 15:07:59 2016 +0200
 
-    packet-couchbase.c: dissect more DCP commands
+    MBIM: add dissection of AT&T proprietary UUID
     
-    Change-Id: I0e06c89cdda3c1f8e98412fd20737ff6afd26666
-    Reviewed-on: https://code.wireshark.org/review/5694
-    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Based on AT&T Windows 8 Extended API Requirements version 1.8.0
+    
+    Change-Id: Iaf54173812a02023581c530f2340ea21e9e220d9
+    Reviewed-on: https://code.wireshark.org/review/16431
+    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 c46fa33
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Thu Dec 4 13:22:22 2014 +0300
+commit d5e435e
+Author: Daniele Lacamera <daniele.lacamera@technicolor.com>
+Date:   Thu Jul 14 14:08:56 2016 +0200
 
-    Riemann protocol dissector
+    DHCP: correctly parse PXE options (209-210)
     
-    Homepage: http://riemann.io/
+    option 209 was marked as opaque, now it's  as PXELINUX config file (text)
+    --> Fix: decorate as non-null terminated string
+    --> CfR: IETF RFC5071 section 4.2. "Packet Format"
     
-    Sample capture:
-    http://files.avsej.net/riemann-sample.pcapng
+    option 210 was marked as special, and erroneously decorated as Authentication
+    (option 90)
+    --> Fix: decorate as non-null terminated string
+    --> CfR: IETF RFC5071 section 5.2. "Packet Format"
     
-    Protocol definition:
-    https://github.com/aphyr/riemann-java-client/blob/master/src/main/proto/riemann/proto.proto
-    
-    Implementor's guide:
-    http://riemann.io/howto.html#write-a-client
+    Bug: 12618
+    Change-Id: I4220c137ef4b8b7f0827496c165b0ca35b70f675
+    Reviewed-on: https://code.wireshark.org/review/16430
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 644c009
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jul 14 14:33:01 2016 +0200
+
+    ETAG: add explicit casts to please OSX buildbot
     
-    Bug: 10758
-    Change-Id: I28634453423127fe647eb92e48072a90a7f5d232
-    Reviewed-on: https://code.wireshark.org/review/5620
+    Change-Id: I057ffc6eb5e6c16e05b0ddc1c069159980678b85
+    Reviewed-on: https://code.wireshark.org/review/16429
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit 4eecdff
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jul 14 07:46:13 2016 -0400
+
+    packet-beep.c: Pacify OS X buildbot with cast
+    
+    Change-Id: I0149546cdd2aac8335dcb1046d31ed857ed674f3
+    Reviewed-on: https://code.wireshark.org/review/16428
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 81beae9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 19:48:22 2016 -0400
+
+    proto.c: Unsigned fields should use %u within printf.
+    
+    Found by VS Code Analysis
+    
+    Change-Id: I76ea860cd86b41ef33c47dcc8f6b1c122f8bb668
+    Reviewed-on: https://code.wireshark.org/review/16424
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 1f8b16e
+commit 1565910
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 10 07:41:23 2014 +0100
+Date:   Thu Jul 14 10:59:48 2016 +0200
 
-    ICQ: fix icq.meta_user.found_authorization field registration
+    MBIM: add a missing break
     
-    Change-Id: I8c39073b8d1237f8af7f7061f331b3d59ae81142
-    Reviewed-on: https://code.wireshark.org/review/5699
+    Change-Id: I3a4483861b1d97ff5e43041b3ecca64c3077b284
+    Reviewed-on: https://code.wireshark.org/review/16427
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit f64f7c6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 10 07:37:23 2014 +0100
+commit 67457e9
+Author: William Tu <u9012063@gmail.com>
+Date:   Tue Jul 12 11:09:31 2016 -0700
 
-    NFS: do not duplicate field name in blurb
+    Add ERSPAN II support for field EN and Index.
     
-    Change-Id: I565823e2ba3c712506710f911e118cd48c895523
-    Reviewed-on: https://code.wireshark.org/review/5698
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Current ERSPAN II dissector does not support parsing EN field and Index.
+    The patch follows the field description in draft:
+    https://tools.ietf.org/html/draft-foschiano-erspan-01
+    
+    Change-Id: I92ce56264be0fb2560c4d1a5da35738cf45a8c96
+    Reviewed-on: https://code.wireshark.org/review/16400
+    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 4af7482
+commit 18e4e3c
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 6 12:57:33 2014 -0500
+Date:   Tue Jul 12 13:18:05 2016 -0400
 
-    Eliminate proto_tree_add_text from packet-icq.c
+    packet-beep.c: Use strtol over scanf to prevent analysis warnings.
     
-    Change-Id: I2f4bcd8c4a6cf534bb5b6b5c5aa7e21075968ee3
-    Reviewed-on: https://code.wireshark.org/review/5696
+    Change-Id: I9244edc537d2eb49d73e097a4cb34bf2cde868e4
+    Reviewed-on: https://code.wireshark.org/review/16395
     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>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c449b43
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Dec 9 23:48:46 2014 -0500
+commit efc6e50
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jul 13 23:50:31 2016 +0200
 
-    nfs: expert...() shouldn't be called under 'if(tree)'
+    LTE RRC: add dissection of schedulingInfoSIB1-r13 field
     
-    Change-Id: I4f8c55ea4194d1246ea19368e0f5890ad1248f47
-    Reviewed-on: https://code.wireshark.org/review/5697
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I226ae82a2d75a9b658a0e9122b4ef1925b003279
+    Reviewed-on: https://code.wireshark.org/review/16417
+    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 dff05c9
-Author: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
-Date:   Sun Nov 9 10:58:43 2014 +0100
+commit 0d73ae3
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 13 14:51:56 2016 -0700
 
-    nfs: decode dCache NFS file handle
+    Qt: Allocate packet list records using wmem.
     
-    add support for dCache NFS/pNFS
-    project page: http://www.dcache.org
+    Add PacketListRecord::operator new, which uses wmem_alloc. Roughly
+    matches the GTK+ UI behavior. Add ColumnTextList which also uses
+    wmem_alloc.
     
-    Bug: 10765
-    Change-Id: I24a88419ec070305e609d1b49b44994a464eb098
-    Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
-    Reviewed-on: https://code.wireshark.org/review/5236
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Lazily allocate our column text.
+    
+    Change-Id: I86a63cd8ace7764eaab1561bf71b4358af72fe03
+    Reviewed-on: https://code.wireshark.org/review/16418
+    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 8375a66
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Thu Oct 30 14:53:07 2014 -0400
+commit ed27ad4
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 18:18:03 2016 -0400
 
-    nfs: fix failure to parse EXCHANGE_ID arguments
+    androiddump.c: Use preprocessor directive to distinguish E_AGAIN and E_WOULDBLOCK.
     
-    The exchange_id spo_must_enforce/spo_must_allow bitmaps are exceeding
-    this arbitrary MAX_BITMAPS constant, causing EXCHANGE_ID parsing to
-    fail.
+    VS Code analysis considers them hardcoded values so the if statement is either
+    always true or always false.
+    
+    Change-Id: Iad04add9391c515873e2e00d2c6cbd682fbf5b3f
+    Reviewed-on: https://code.wireshark.org/review/16419
+    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: Anders Broman <a.broman58@gmail.com>
+
+commit 2c0d117
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jul 13 20:13:22 2016 -0700
+
+    Fix VHT valid checks.
     
-    Even in the case of attributes we may need more than 4 words soon, even
-    if we don't I'm not sure if it's actually illegal to zero-pad them out
-    to something longer, and even if that is illegal I don't think it's
-    really helpful of wireshark to stop parsing.
+    The valid array in a struct mcs_vht_valid is indexed by the bandwidth
+    and the NSS-1; use the NSS-1, not the NSS, as the index.
     
-    Keep the constant just as a sanity check but make it really large.
+    The maximum possible value of the NSS is MAX_VHT_NSS, so allow a value
+    of MAX_VHT_NSS.
     
-    Ping-Bug: 10649
-    Change-Id: I3dff3ebde2d7f74f8cbe60a92c853463da66ae6a
-    Reviewed-on: https://code.wireshark.org/review/5144
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I49585f217f3e70356c1dd1ba32b6c714ce202236
+    Reviewed-on: https://code.wireshark.org/review/16426
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e4b0141
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 9 16:54:17 2014 -0800
+commit 335b2c0
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 19:42:15 2016 -0400
 
-    Qt: Obey main toolbar icon preferences.
+    vwr.c Dynamically allocate large buffers
     
-    Remove the preferences for the filter toolbar and mark them GTK+-only.
+    VS Code Analysis claims the arrays are too large and should be moved to help
     
-    Change-Id: Ie48b19aee29a1cfcea4c41ca6c08ddbba3102377
-    Reviewed-on: https://code.wireshark.org/review/5693
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I741ebe8cc73a108cb6e6d9ecbda37e2a4b6e1b4b
+    Reviewed-on: https://code.wireshark.org/review/16423
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     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 c1d4a08
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 9 15:14:22 2014 -0800
+commit fb07249
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 19:26:16 2016 -0400
 
-    Add media playback icons.
+    pcapng.c: Use preprocessor directive to compare G_BYTE_ORDER with G_LITTLE_ENDIAN.
     
-    Change-Id: I5a9ba1314b0c93098e7b802618f73c7fca608b04
-    Reviewed-on: https://code.wireshark.org/review/5692
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    VS Code analysis considers them hardcoded values so the if statement is either
+    always true or always false.
+    
+    Change-Id: Iabb8462b66f728195bf378ae26c79a783feddb03
+    Reviewed-on: https://code.wireshark.org/review/16422
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 34cd063
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 9 23:46:05 2014 +0100
+commit 90e97df
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 18:42:14 2016 -0400
 
-    LTE RRC: upgrade dissector to v12.3.0
+    packet-ieee80211-radio.c: Prevent array overflow.
     
-    Change-Id: Iac974bf505bed270fc1f9409a7d61c80ebca17a5
-    Reviewed-on: https://code.wireshark.org/review/5691
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Found by VS Code Analysis.
+    
+    Change-Id: Idab6cb5496749ebff47466b20a9a665b1574565d
+    Reviewed-on: https://code.wireshark.org/review/16421
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 4921e55
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 18 16:21:42 2014 -0800
+commit b20fa86
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jul 13 18:23:03 2016 -0400
 
-    Qt: Initial VoIP Calls dialog.
+    packet-gsm_a_common.c: Create typedef declaration for elem_func signature.
+    
+    This should keep VS Code Analysis happy.
     
-    Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at
-    the top, since that seems to be the primary item.
+    Change-Id: I99ebdc644ba353d5986d6509da784eeaa37dcc8f
+    Reviewed-on: https://code.wireshark.org/review/16420
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit b849d3c
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Dec 29 19:30:58 2015 +0000
+
+    IPv6: Add support for more option types
     
-    Add configure-time checks for QtMultimediaWidgets in anticipation of
-    adding a VoIP playback dialog.
+    Change-Id: I1027e6e2481774953216ade6da4785e1a3c5ca63
+    Reviewed-on: https://code.wireshark.org/review/16357
+    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 76c0325
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Dec 29 12:15:44 2015 +0000
+
+    IPv6: Refactor dissect_opts() into type-specific dissectors
     
-    Add an icon for the playback button. (Yes, I've been avoiding
-    GNOME-level gratuitous icons so far but this is one of the rare
-    occiasions where it makes sense.)
+    Change-Id: Ife8a7da3bd9bfea347321413bf05ea454186bc6d
+    Reviewed-on: https://code.wireshark.org/review/16356
+    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 b7cdff0
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Wed Jul 13 14:33:55 2016 +0300
+
+    ZigBee: fix column description for APS ACK to T2 packet
     
-    Add a help link define for the VoIP calls dialog.
+    If this is APS ACK, do not overwrite its column description by Test Profile command description.
     
-    Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050
-    Reviewed-on: https://code.wireshark.org/review/5674
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ibd4ae978776ad9e9924e6933ede90bc2ad8855de
+    Reviewed-on: https://code.wireshark.org/review/16414
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     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 3147087
+commit 998ab7f
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 9 13:22:20 2014 -0800
+Date:   Wed Jul 13 11:06:52 2016 -0700
 
-    Fix ranlib "has no symbols" errors in the codecs directory.
+    Speed up col_append_ports on Windows.
     
-    Don't build the G.722 or G.726 codecs for now. Each are wrapped in
-    "#ifdef HAVE_SPANDSP", which we don't define.
+    Fill in our port information using StringCchPrintf on Windows instead
+    of g_snprintf. Loading a large-ish test capture here under the VS 2013
+    profiler showed that we spent 620 samples in col_append_ports. Switching
+    from g_snprintf to StringCchPrintf reduced that to six samples.
     
-    Conditionally compile the SBC codec.
+    Inline col_snprint_port while we're here.
     
-    Change-Id: I5f09ff66514f967d4f0611c943b4e6a975b8994b
-    Reviewed-on: https://code.wireshark.org/review/5690
+    Change-Id: I955e5baa66ebb9cc950fc0eb1682d3c015c7a55a
+    Reviewed-on: https://code.wireshark.org/review/16416
+    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 f66de3a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 9 11:24:59 2014 -0800
+commit 1bd438b
+Author: Kim Kempf <kim.kempf@apcon.com>
+Date:   Tue Jul 12 10:28:38 2016 -0700
 
-    Fix filename matching.
+    Adding 802.1BR E-Tag dissector
     
-    Change-Id: I2bdfd3ad2798ed1443d06c42b05c9962b8e8041d
-    Reviewed-on: https://code.wireshark.org/review/5689
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Based on IEEE Std 802.1BR-2012
+    
+    Bug: 12613
+    Change-Id: Ic5198471f67a1af728df40a09443a1cab2621169
+    Reviewed-on: https://code.wireshark.org/review/16402
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit bcaa5d8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Nov 12 14:24:16 2014 -0800
+commit 6223327
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 22:53:39 2016 -0400
+
+    Support Juniper VN over UDP.
+    
+    Change-Id: I40dab9d392ddea1f895b88f8f19c1194e56563a2
+    Reviewed-on: https://code.wireshark.org/review/16408
+    Reviewed-by: Amitoj Setia <amitoj_setia@yahoo.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>
 
-    Qt: Update and rename the summary dialog.
+commit 0b00097
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Wed Jul 13 12:40:54 2016 +0300
+
+    ZigBee MAC parse: fix Association request parse in case of FCS absence.
     
-    Go back to a single view similar to the GTK+ UI. Apply layouts using Qt
-    Designer.
+    If it is ok to parse packets with bas FSC, FCS may be even absent. Parse MAC command even if remaining buffer length is less that FCS size in such case.
     
-    Rename the menu item and class to "Capture File Properties". It's not
-    really a summary if it contains details such as "marked average bits
-    per second". We might want to move this to a "Properties" item under
-    the "File" menu similar to other applications.
+    Change-Id: Ibbc9fed7ab87d0511f8c97db8e0e3bdf562cd15c
+    Reviewed-on: https://code.wireshark.org/review/16412
+    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 3ecbe50
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jul 13 10:07:16 2016 -0400
+
+    Restore setting data.edt in write_specified_fields().
     
-    Add the GTK+ summary icon (for now) to the toolbar and open the
-    properties dialog on clicking.
+    This prevents tshark from crashing when run with "-T fields -e data".
     
-    Singleton dialogs delenda est[1]. Let the user open as many summaries on
-    as many capture files as he or she wishes. Also, global cfile delenda
-    est[2].
+    I5778b08c52119b5be1ec482be9417b3c4ba8ed62 mistakenly removed this line (this
+    'data' is a write_field_data_t rather than the print_data structure that
+    change was cleaning up).
     
-    Don't blindly include QtGui. Add specific components instead.
+    Bug: 12616
+    Change-Id: I773e47f12f852e19a20ec29a43eb3a0953923173
+    Reviewed-on: https://code.wireshark.org/review/16415
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit abd287f
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jul 13 12:22:37 2016 +0200
+
+    MBIM: add dissection of Intel proprietary UUIDs
     
-    Use consistent method names, variable names, and patterns. Try to
-    document what "consistent" means.
+    Based on http://www.telit.com/fileadmin/user_upload/products/Downloads/4G/Telit_xN930_MBIM_Command_Functional_Specification_r2.pdf
     
-    Adjust the way we display some statistics to match the summary bar, e.g.
-    displayed = captured if we don't have a filter applied.
+    While we are at it, add placeholder for AT&T proprietary UUID (no dissection of the buffers).
     
-    [1] Not really.
-    [2] Yes, really.
+    Change-Id: I4f9825d1f9fde474853f9b86a4302742c078d8cd
+    Reviewed-on: https://code.wireshark.org/review/16413
+    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 5e9e48b
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jul 13 09:28:15 2016 +0200
+
+    TCP: fix indent (use 4 spaces)
     
-    Change-Id: I11793b1d79dd0c3f70414ac8592b86181da59916
-    Reviewed-on: https://code.wireshark.org/review/5274
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Id08427246f5b481c004e861719b9b213796438c1
+    Reviewed-on: https://code.wireshark.org/review/16409
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 9681bdd
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 5 19:41:12 2014 -0500
+commit 3124cf8
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Jun 13 04:56:57 2016 +0100
 
-    Eliminate proto_tree_add_text from packet-ppp.c.
+    IPv6: Simplify RPL routing header dissector
     
-    Some of the conversions to proto_tree_add_xxx calls involved using explicit sizes instead of the "option length", so there is skipping of the "byte highlighting" of the type + length bytes.
+    Use a wmem_array to perform strict checking.
     
-    Change-Id: Ibfe09a089fb33ba43121de079aca81742d48db4c
-    Reviewed-on: https://code.wireshark.org/review/5636
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Fold cmprI/cmprE dissection into a single loop.
+    
+    Change-Id: I67443a604b47cd9cbca32c7f7276a7e2229580f1
+    Reviewed-on: https://code.wireshark.org/review/16348
+    Petri-Dish: João Valverde <j@v6e.pt>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 74172ae
+commit e46be62
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Dec 7 20:54:05 2014 +0100
+Date:   Tue Jul 12 19:04:12 2016 +0200
 
-    LTE: Update MAC and RLC dissectors to Release 12
+    LTE RRC: upgrade dissector to v13.2.0
     
-    Change-Id: I036a0d1180b6481e8cc27210ed44eda4ba078a27
-    Reviewed-on: https://code.wireshark.org/review/5659
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: If2e15f429e3e35b3deef8afc23e57c8ef3974a22
+    Reviewed-on: https://code.wireshark.org/review/16410
+    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 58fc89a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 9 00:54:34 2014 -0800
+commit 33fa58c
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jul 13 10:19:43 2016 +0200
 
-    Fix copy-and-pasteo.
+    RLC LTE: fix a typo
     
-    Change-Id: I181129595c7259f5c0af5308f0ca0190dce67eb7
-    Reviewed-on: https://code.wireshark.org/review/5687
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I6d429da6e36e9609c1b7a539cf75e0c2c484bf00
+    Reviewed-on: https://code.wireshark.org/review/16411
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit e5757d1
-Author: Irene Ruengeler <ruengeler@wireshark.org>
-Date:   Fri Dec 5 10:04:29 2014 +0100
+commit fbb47de
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 13:28:10 2016 -0400
 
-    Fix GTK warning in EXTCAP parts
+    packet-cql.c: Bugfix bitwise operation with parenthesis.
     
-    Change-Id: I3a4d9baf3592db1394d1177a19014cbef9140759
-    Reviewed-on: https://code.wireshark.org/review/5628
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I93e1c64597f309db5341c6ccadfdb3b23c056182
+    Reviewed-on: https://code.wireshark.org/review/16397
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Irene Ruengeler <iruengeler@googlemail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 301a5b7c
+commit 0600865
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 27 23:18:32 2014 -0500
+Date:   Tue Jul 12 12:31:33 2016 -0400
 
-    Eliminate proto_tree_add_text from some dissectors.
+    file-pcapng.c:  Apply parenthesis to fix build warnings
     
-    Change-Id: I44cc6b70ec4dfc565934da499f46fca60a4ded93
-    Reviewed-on: https://code.wireshark.org/review/5524
+    Change-Id: I35d180e7aa040c94ca80a49e7d2132dd76e46aaf
+    Reviewed-on: https://code.wireshark.org/review/16393
     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 1952fef
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 5 07:42:34 2014 +0100
+commit 8682f4b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 12:32:06 2016 -0400
 
-    SCTP: Missing break in switch (CID 1135556)
+    packet-6lowpan.c: fix uninitialized variable (ipv6_ext) warning
     
-    Change-Id: I00939bb9699493fe7af21497d9e9c013cc3d2e62
-    Reviewed-on: https://code.wireshark.org/review/5650
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I8182bc9452cbd1201c81407041b6b522434f5ec0
+    Reviewed-on: https://code.wireshark.org/review/16394
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 283e5c1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 3 16:46:46 2014 +0100
+commit 2f3b25c
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 13:23:29 2016 -0400
 
-    GVSP: Missing break in switch (CID 1247683 & 1247684)
+    packet-btrfcomm.c: Add NULL check to pacify VS Code Analysis
     
-    Change-Id: Ibd3aef4101126f02453bab10cd5ca31e716334de
-    Reviewed-on: https://code.wireshark.org/review/5617
-    Reviewed-by: W Moxam <warrenm@ptgrey.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Some if checks are confusing the analysis, but it does add some
+    future-proofing.
+    
+    Change-Id: Ic4fe16a87646a7055f7639af050d53ff004eda5f
+    Reviewed-on: https://code.wireshark.org/review/16396
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit fbf08cf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 20:04:23 2014 -0800
+commit e063924
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 08:21:35 2016 -0400
 
-    Nothing to free there.
+    Remove T.30 FCF mask.
     
-    pcapng_read_block() never sets *err_info if it returns
-    PCAPNG_BLOCK_NOT_SHB - that happens on an EOF, a short read, or on a
-    successful read of something that doesn't look like an SHB.
+    Found by VS Code Analysis, verified with spec that mask isn't needed.
+    Also included link to current spec.
     
-    Change-Id: I23ad6aa1c95d800b068a798a4aad1d70d07ac281
-    Reviewed-on: https://code.wireshark.org/review/5686
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 1918
+    Change-Id: Ic3e8ee599501c7c12717649579ffd70581622178
+    Reviewed-on: https://code.wireshark.org/review/16392
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7b1c3ab
+commit fea50cc
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 19:57:21 2014 -0800
+Date:   Tue Jul 12 11:25:49 2016 -0700
 
-    Manually fix a pidl bug - that field should be an FT_STRING.
+    Handle dissectors that don't have names.
     
-    No, I don't know why it's making it FT_NONE; it's a bit of a weird data
-    type, with a string inside a structure.
+    Dissector handles created with create_dissector_handle() don't have a
+    name; report them as "(anonymous)" (there's no guarantee that the printf
+    family of routines don't crash when a null pointer is provided to %s -
+    the printf routines in at least some versions of Solaris *do* crash in
+    that case).
     
-    Change-Id: I27a6d7577ef4a9f4da8ddad2cad97ad097135e90
-    Reviewed-on: https://code.wireshark.org/review/5685
+    Change-Id: I561ff855a46eeb442299011d567f20751c5c6869
+    Reviewed-on: https://code.wireshark.org/review/16399
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5c29704
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 19:24:33 2014 -0800
+commit 719c018
+Author: Thomas PORTASSAU <thomas.portassau@hotmail.fr>
+Date:   Tue Jul 12 08:36:25 2016 +0200
 
-    LDAP's DirSyncFlags are a bitfield, so show it as an unsigned integer in hex.
+    USB CCID added Interrupt IN and PC2RDR_params
     
-    Change-Id: I2a06b13528ad7dfc587bfb9c1333d4f7a497614e
-    Reviewed-on: https://code.wireshark.org/review/5684
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I77a88b910fa51e09f9d5bdb541170de76ffb3708
+    Reviewed-on: https://code.wireshark.org/review/16386
+    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 3d95c62
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 17:30:04 2014 -0800
+commit 45679d2
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Tue Jul 12 12:21:23 2016 +0300
 
-    Don't try to look in a non-existent hash table.
+    ZigBee Test Profile #2 enchancement.
     
-    We only create hash tables if somebody puts a handler in one, so we need
-    to check whether the hash table exists first, to avoid run-time warnings.
+    If profile id is ZigBee Test Profile #2, do not try to parse packet contents as other protocol above APS: ZCL or whatever else.
     
-    Change-Id: I739d2d808935e651b11bd44b258f168a42ca4b7c
-    Reviewed-on: https://code.wireshark.org/review/5683
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I0f1446aea9b270c226c7c472fe794e29240defc9
+    Reviewed-on: https://code.wireshark.org/review/16387
+    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 f34bcb7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 16:13:39 2014 -0800
+commit 479caf1
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jul 11 15:40:03 2016 -0700
 
-    Don't put bitmasks under an FT_NONE.
+    Add resource usage logging.
     
-    Change-Id: I172c68d233e3887a94c0835234613dfd483ee5af
-    Reviewed-on: https://code.wireshark.org/review/5682
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 260af59
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 16:06:11 2014 -0800
-
-    Values in a value_string_ext *must* be sorted.
+    Add log_resource_usage, which prints the current and elapsed user and
+    system times. Add a usage example in packet_list_model.cpp.
     
-    Change-Id: I0c2bcd81955375abf3af24e42c70bea0bb960083
-    Reviewed-on: https://code.wireshark.org/review/5681
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I747161c754a3731e540821715cc9bb10b3dc821d
+    Reviewed-on: https://code.wireshark.org/review/16383
+    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 32e1ff9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 15:36:26 2014 -0800
+commit 3fe92ff
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jul 12 09:09:57 2016 -0400
 
-    Don't put bitmasks under an FT_NONE.
-    
-    proto_tree_add_bitmask() requires that the field under which it's
-    putting the bitmasks be an FT_INTn or FT_UINTn, so that it can determine
-    the length of the field.
+    Create stub VXLAN (GPE) protocol for Decode As.
     
-    Arguably, proto_tree_add_bitmask() should, instead, take a length
-    argument, just as other proto_tree_add_ routines do, and, arguably, we
-    should perhaps not even have FT_UINTn and FT_INTn, just FT_UINT and
-    FT_INT, with the display width for hex and octal (leading zeroes)
-    determined by the actual length of the field or something such as that,
-    or as part of the field that also contains the base.
+    Also remove dissector_add_for_decode_as calls as dissector_add_uint
+    already handles that.
     
-    But, even with that, we might want to require an FT_UINTn or FT_INTn
-    anyway, at least in cases where the value of the field as a whole is
-    interesting.
-    
-    Change-Id: I4dff8fb1686a30b7d145c089dd1be7f96ecf23e0
-    Reviewed-on: https://code.wireshark.org/review/5680
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I87202d49765ffb1a2e6c922cb02b692fb16c0693
+    Reviewed-on: https://code.wireshark.org/review/16388
+    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 ffcacae
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 15:25:50 2014 -0800
+commit 25ba3db
+Author: D. Ulis <daulis0@gmail.com>
+Date:   Mon Jul 11 21:14:36 2016 -0400
 
-    Have different MTP2 dissectors for different metadata and CRC.
+    HTTP: Add request/response arrows
     
-    Have separate MTP2 dissectors for:
+    HTTP has multiple related packets, so seeing which are the actual request/response (related to the current selected packet) is helpful.
     
-       MTP2 frames with no pseudo-header and no CRC;
+    Change-Id: I833f4f620cfe8bfe9b1d7518c4e28fbd41b64e29
+    Reviewed-on: https://code.wireshark.org/review/16385
+    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 f4ab3f4
+Author: Jeff Layton <jlayton@redhat.com>
+Date:   Mon Jun 20 15:10:32 2016 -0400
+
+    ceph: distingush between client and server by checking for a second entity_addr_t
     
-       MTP2 frames with a pseudo-header and no CRC;
+    The current ceph dissector assumes that the server will always send its
+    initial connection negotiation first, but that's not necessarily the
+    case, especially with the kernel client which sends its banner as soon
+    as the socket is created.
     
-       MTP2 frames with no pseudo-header and a CRC;
+    So, we need a better mechanism to determine which end is client and
+    which is the server. The server sends its own address and then the
+    address of the client, but the client only sends its own address. We
+    can determine whether the initial negotiation message is from the client
+    or server by looking at the data after the first entity addr and seeing
+    whether it also looks like an entity addr.
     
-    and call the appropriate dissector in the appropriate places.
+    This patch takes that approach. It just grabs the address family from
+    the second address and sees whether it's IPv4 or IPv6. If it's not one
+    of those, then it assumes that it's not an entity_addr_t at all and is
+    therefore a request from the client.
     
-    While we're at it, get rid of a global variable - pass the "use extended
-    sequence numbers" flag down through the dissection code path, rather
-    than having it as a global.
+    We could go farther and try to verify the port and address as well, but
+    that's probably overkill. The address family is at the same offset as
+    the host_type field in the client's Connect request, but it's big endian
+    and the host_type is little endian. As long as we don't end up with
+    host_types that are 0x200 or 0xA00, this scheme should be OK.
     
-    Change-Id: Id8da1fbe3529e3ffadd5c30646cbc922f506a01f
-    Reviewed-on: https://code.wireshark.org/review/5679
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I161d02da86d978272eff95497c6df66766b02ebc
+    Signed-off-by: Jeff Layton <jlayton@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16043
+    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 8a446e9
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Sat Nov 15 09:44:22 2014 +0100
+commit 2e879e2
+Author: sjha3 <sjha3@ncsu.edu>
+Date:   Sat Jul 2 15:34:37 2016 -0400
 
-    Add missing build-dependencies for the Debian package
+    Generic Protocol Extension support for VxLAN
     
-    They are libparse-yapp-perl and libsbc-dev.
-    
-    Change-Id: I474179bb805acb87f8bf316730d63eb294e10a69
-    Reviewed-on: https://code.wireshark.org/review/5322
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Bug: 12323
+    Change-Id: I53bfedf50ad09cda52320b0e6eb81e92ed73efc8
+    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/16250
 
-commit d87a952
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 8 14:09:33 2014 -0800
+commit cfcc6fd
+Author: Jesse Gross <jesse@kernel.org>
+Date:   Fri Jun 24 15:28:55 2016 -0700
 
-    It's a reasonable expectation that we will have C++ style comments in
-    ui/qt.
+    Geneve: Update list of option classes.
     
-    Change-Id: Iedbf2a2d3cbfee00912e6e883928836932dea566
-    Reviewed-on: https://code.wireshark.org/review/5678
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 08e624f
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 8 13:41:02 2014 -0800
-
-    Remove an unnecessary include.
+    Newer versions of the Geneve protocol draft have defined additional
+    option classes. This updates the list so we can show the class name
+    instead of unknown.
     
-    Change-Id: I55332c21ea66ee7d564c2b338cba524ea774b19c
-    Reviewed-on: https://code.wireshark.org/review/5677
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I19f2024704abe2bc0692c73be783858d74323c0e
+    Reviewed-on: https://code.wireshark.org/review/16382
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit d5f771c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 11:40:35 2014 -0800
+commit 4b67b0b
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 11 15:35:29 2016 +0200
 
-    Use correct expression in a "length too short" message.
+    osx-app: small improvement in packaging script.
     
-    Doesn't change the behavior of the code, but makes it more consistent.
-    
-    Change-Id: I6f07fbbb4c7d14d8a46ecfd1c419d951c356fd77
-    Reviewed-on: https://code.wireshark.org/review/5672
+    Change-Id: I484ab1b001f7fd578e734b4e006137f590a750a9
+    Reviewed-on: https://code.wireshark.org/review/16379
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0bd79c5
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Mon Dec 8 11:20:16 2014 +0100
+commit ee28324
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Mon Jul 11 18:59:13 2016 +0200
+
+    Fix up *some* of the coding style inconsistencies
+    
+    - return type of a function definition is always on a seperate line
+    - reformat single line expert items into multiline format
+    - no space between functionname and (
+    - reformat some hf_ elements that looked different from most others
+    - space after , where appropriate
+    - Fix the following warnings and errors from checkhf.pl
+      Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi
+      Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi_aid
+      Error: hf_ieee80211_ff_dsss_ofdm: FT_BOOLEAN with non-null 'convert' field missing TFS in epan/dissectors/packet-ieee80211.c
+      Error: non-null hf_ieee80211_ff_dsss_ofdm 'convert' field missing 'VALS|VALS64|RVALS|TFS|CF_FUNC|FRAMENUM_TYPE|&' in epan/dissectors/packet-ieee80211.c ?
+      Error: hf_ieee80211_operat_mode_field_channel_width is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c
+      Error: hf_ieee80211_operat_mode_field_rxnss is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c
+    
+    Change-Id: Ide51d1871755199721e65c0f62b3f6a62ef1159e
+    Reviewed-on: https://code.wireshark.org/review/16381
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+
+commit 7083839
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jul 9 02:22:03 2016 +0100
 
-    Fix full name of NodeId namespace index field, was a copy&pase error
+    IPv6: refactor dissect_routing6() into type-specific dissectors
     
-    Change-Id: I7b1eea9965880e35c65f04406ff756d245b568d4
-    Reviewed-on: https://code.wireshark.org/review/5668
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I153c39bb76dc30cecede9dbf5fe4abf234fcd719
+    Reviewed-on: https://code.wireshark.org/review/16347
+    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 52df6ef
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Dec 3 12:36:18 2014 +0100
+commit 0002f25
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jul 11 10:49:53 2016 +0200
 
-    Try to improve reassembly when SIP PDU starts in the middle of a segment
-    and continues trough the next segment(s).
+    hdcp2: don't throw an exception during heuristic check
     
-    Change-Id: I8efe69361fda0c60ec6544cc6bbe28c91f07207c
-    Reviewed-on: https://code.wireshark.org/review/5583
+    Change-Id: I24895950464e1845c468f9fa9b6e5aa3ab8c75de
+    Reviewed-on: https://code.wireshark.org/review/16378
+    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 f16376e
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Thu Nov 27 15:09:52 2014 +0100
+commit deaac11
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jul 11 10:29:26 2016 +0200
 
-    Fix showing error dialog when calling vsimple_error_message_box()
-    
-    SimpleDialog requires a parent, when none is provided (as there is no parent available during startup), the error message is queued and displayed after MainWindow is available.
-    Calling SimpleDialog::exec() directly returns if no parent is set (hence the dialog is not shown)
+    iso7816: check for minimum atr len
     
-    This resulted in silently ignoring error messages that were shown using vsimple_error_message_box(), as this function did not provide a parent (and the queue messages were not dequeued anymore as the MainWindow was already available)
-    
-    Change-Id: I2f4c1b4926c196ab40b035161cec530105396537
-    Reviewed-on: https://code.wireshark.org/review/5519
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e172ebb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 29 15:58:56 2014 -0500
-
-    Add proto_tree_add_bitmask_with_flags.
+    and reject the packet if it is shorter
     
-    It's proto_tree_add_bitmask with the ability to control the data appended to header.
+    make sure that we don't throw an exception when we read the first byte
+    and haven't yet decided if the packet contains an iso7816 atr
     
-    Change-Id: Icce97437ba7cfc9158ec204a837da8db8138424a
-    Reviewed-on: https://code.wireshark.org/review/5533
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I7b4c93cc7c55489467b46241f07a1bb5ddfd927a
+    Reviewed-on: https://code.wireshark.org/review/16377
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 75cdf92
+commit f2584b2
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 5 09:02:37 2014 +0100
+Date:   Sun Jul 10 19:27:47 2016 +0200
 
-    802.11: fix indent (use 2 spaces) and modelines for 802.11 h file
+    BGP: Add support of Vendor Capability 131 (Multisession Cisco)
+    
+    Issue reported by Garri Djavadyan
     
-    Change-Id: If886809d9eeb900bb94c045413ff1295519b8311
-    Reviewed-on: https://code.wireshark.org/review/5641
+    Change-Id: I6dd4bd20d82a3f2cb8aa45f740f72d33e33053da
+    Ping-Bug:12604
+    Reviewed-on: https://code.wireshark.org/review/16374
+    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 f47bc26
+commit 3932075
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 25 12:23:52 2014 +0100
+Date:   Sun Jul 10 12:17:04 2016 +0200
 
-    CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)
+    BGP: Add (Cisco) for "Vendor" Cisco capability
     
-    * IEEE 802.11 Antenna (1025)
-    * IEEE 802.11 Direct Sequence Control (1028)
-    * IEEE 802.11 MAC Operation (1030)
-    * IEEE 802.11 MIC Countermeasures (1031)
-    * IEEE 802.11 Multi-Domain Capability (1032)
-    * IEEE 802.11 Station (1036)
-    * IEEE 802.11 Supported Rates (1040)
-    * IEEE 802.11 Tx Power (1041)
-    * IEEE 802.11 Tx Power Level (1042)
-    * IEEE 802.11 WTP Radio Configuration (1046)
+    * Route Refresh Cisco capability (128)
+    * ORF Cisco capability (130)
     
-    Enhance 802.11 Rate Set (1034)
+    Issue reported by Garri Djavadyan
     
-    Change-Id: Ib37bc4081e75af051d80d023ddba689ecd9bf9ff
-    Reviewed-on: https://code.wireshark.org/review/5481
+    Bug: 12605
+    Change-Id: Icb19cd6a75315e5af4772dd7833a5b762bdd7ff4
+    Reviewed-on: https://code.wireshark.org/review/16373
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 58b7277
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 5 09:00:13 2014 +0100
+commit b0a32c6
+Author: Binh Trinh <beango@gmail.com>
+Date:   Sun Jul 10 01:57:15 2016 -0400
 
-    802.11: Add ieee80211_supported_rates_vals_ext to be exported
-    
-    It will be reused by CAPWAP dissector (* Rates Message Element)
+    NAS-EPS:  Add preference to bypass a heuristic decode of a ciphered NAS.
     
-    Change-Id: I60ce12f382a35cdc2747baf23e2e3c30a305a8bd
-    Reviewed-on: https://code.wireshark.org/review/5640
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ifedb82bbcb29ab978ffb9ce2f485ac9ff0712fc2
+    Reviewed-on: https://code.wireshark.org/review/16363
+    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>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 212ba58
+commit ed69bf3
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 7 12:17:48 2014 -0800
+Date:   Sun Jul 10 10:23:40 2016 -0700
 
-    Add checks for non-null-terminated strings.
+    Remove a compiler warning some platforms give.
     
-    Change-Id: Iaad2d2f76e5d554800ba2c79d5c01f4b9da6fa0b
-    Reviewed-on: https://code.wireshark.org/review/5660
+    Some UN*Xes declare an index() function, that being the name strchr()
+    originally had in V7 UNIX.  This causes warnings from compilers if you
+    have a variable named "index", so rename the variable.
+    
+    Change-Id: Ibb046005d1ef911ce0739ce70a0a55c13310cdf0
+    Reviewed-on: https://code.wireshark.org/review/16372
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5f79940
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 5 07:56:36 2014 +0100
+commit fac8f1f
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 10 18:41:23 2016 +0200
 
-    Endpoint: wrong filter when select a SCTP endpoint (INVALID == a.x.y.z ...)
+    pvfs2: clean up dissect_pvfs_distribution()
     
-    Change-Id: I396e9af7971ee8be6fc9548162ff37fe704f0289
-    Reviewed-on: https://code.wireshark.org/review/5651
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    remove unnecessary variable initializers
+    remove an unnecessary if (tree) check
+    
+    Change-Id: I4c5326c11efe4fe38fb606a45ca7674484e9421c
+    Reviewed-on: https://code.wireshark.org/review/16371
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 42cdc2b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 7 19:51:16 2014 +0100
+commit 4b83805
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 10 13:32:33 2016 +0200
 
-    dcerpc: Missing break in switch (CID 280449 & 280450 & 284051)
+    mp2t: use tvb_new_subset_remaining() instead of tvb_new_proxy()
     
-    Change-Id: I68fa9650c234c0f1fb8464b464a781b54f2c728c
-    Reviewed-on: https://code.wireshark.org/review/5657
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    the latter is internal to the tvb code and not meant to
+    be called from a dissector
+    
+    Change-Id: Iee5af3d59329aeef8156f0bbbd5c765cac4e314d
+    Reviewed-on: https://code.wireshark.org/review/16364
+    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 9d8cb74
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 7 19:48:17 2014 +0100
+commit de796aa
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jul 10 08:07:47 2016 -0700
 
-    iec104: Missing break in switch (CID 280459)
+    [Automatic update for 2016-07-10]
     
-    Change-Id: I6abc157368a78e1abfde672728b88a36ba6e76cc
-    Reviewed-on: https://code.wireshark.org/review/5656
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: I9d1c7b06a449a3b0dc02dd99f33c4e7634e2d1c0
+    Reviewed-on: https://code.wireshark.org/review/16368
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit fd087fb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 7 19:46:53 2014 +0100
+commit 35255d9
+Author: Bruno Verstuyft <bruno.verstuyft@excentis.com>
+Date:   Wed Jun 29 14:25:34 2016 +0200
+
+    DOCSIS: Added dissector for Downstream Profile Descriptor (DPD)
+    
+    Change-Id: I97e6e07be45a5c4de6c8c467e0c782b35036bd98
+    Reviewed-on: https://code.wireshark.org/review/16202
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit aa9f560
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jul 5 20:15:09 2016 -0400
 
-    AFS: Missing break in switch (CID 280434 & 280435)
+    Cleanup and extend the regex for matching expert info entries.
+    
+    Match each entity in the structure explicitly rather than skipping a bunch at
+    the end.  This makes it possible to easily (and clearly) specify where we
+    allow white space.
+    
+    Don't capture the event group and severity: we don't use them anyway.
+    
+    Don't put single character matches in []: that makes it hard to read (for
+    me anyway).
+    
+    There's no need for both the "m"(ultiline) and "s"(ingle line) options.  Nor
+    the "o"optimize (make buggy) option.
+    
+    These same changes should/will be applied to the hf regex later.
     
-    Change-Id: Ia0a39f7e4670d74325ddc40b34cd56ca018c0bde
-    Reviewed-on: https://code.wireshark.org/review/5655
+    Change-Id: I3bf307dcd6432eb1a0c2b9aceea201f8403e08c0
+    Reviewed-on: https://code.wireshark.org/review/16313
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a68a3da
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Dec 7 19:36:32 2014 +0100
+commit 448c89e
+Author: David Morsberger <dave@morsberger.com>
+Date:   Sun Jul 3 19:36:12 2016 -0400
 
-    make our counting a bit clearer
+    Remember query after closing Follow Stream
     
-    Change-Id: Ie64573f5a0b6e921a5011e487eea8e55f72b9a0b
-    Reviewed-on: https://code.wireshark.org/review/5653
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Update main filter after follow stream dialog is closed - Use:
+       previous_filter if new 'Back' button (passed in follow() method)
+       filter_out_filter_ if 'Filter Out This Stream' button (built by appending !current_stream to previous_filter)
+       leave filter alone if window closed using Close button or window close. (current stream)
+    
+    Change-Id: Ic02edeaffdc65ff0f33cac4cb9afb8cde28963c7
+    Reviewed-on: https://code.wireshark.org/review/16277
+    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 ea0b2e0
+Author: Michal Privoznik <mprivozn@redhat.com>
+Date:   Mon Jul 4 10:36:20 2016 +0200
+
+    Makefile: Install wireshark.pc too
+    
+    In my previous patches (8454f2a20e2 and ea16a84ef51) I've tried
+    to make the pkg-config file more robust. But what I had
+    completely forgot about is that the file was never installed by
+    our Makefile rather than we relied on distribution maintainers to
+    be smart and make the package install the file instead. I've
+    realized this as soon as I've tried to update wireshark in my
+    system.
+    
+    Change-Id: Idb60157a51ea1dd0afd6cfac695bfa5760485241
+    Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16279
+    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 dec3e2e
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 10 15:12:05 2016 +0100
+
+    randpkt_core: Use g_random_* for randpkt_parse_type().
+    
+    randpkt_parse_type() can (and most likely will) be called before
+    randpkt_example_init(), therefore g_rand_int_range is called with a NULL
+    GRand argument. This produces non-random output.
+    
+    Change-Id: Id420edc15a5f9dec427c5f1a1dd9a1f18a225319
+    Reviewed-on: https://code.wireshark.org/review/16367
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit e456dec
+commit 3ea8ccf
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Dec 7 19:27:57 2014 +0100
+Date:   Sun Jul 10 13:51:14 2016 +0200
 
-    don't initialize variables if the first thing we do is assign a
-    different value to them
+    iso14443: the uid size is a generated item
     
-    Change-Id: I719db9180b2ba5f21653086f2697ca9bac68d6b1
-    Reviewed-on: https://code.wireshark.org/review/5652
+    Change-Id: I77952e0099ed8103c8316becafc700866b4c46d8
+    Reviewed-on: https://code.wireshark.org/review/16366
     Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit ade2bef
+commit d68043a
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Dec 6 18:28:37 2014 +0100
+Date:   Sun Jul 10 13:48:27 2016 +0200
 
-    make sure that we don't read past the end of the compressed buffer
+    iso14443: expert info for invalid uid size
     
-    Bug: 10757
-    Change-Id: I30054c4a75ec86ea603cf78b702be5255c35f549
-    Reviewed-on: https://code.wireshark.org/review/5642
+    Change-Id: I3181375c3a2c8a905e1fd8bb722ac27902735ff0
+    Reviewed-on: https://code.wireshark.org/review/16365
     Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 1bc8791
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 5 19:42:47 2014 -0500
+commit 3faf0dd
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 10 00:17:03 2016 +0200
 
-    Eliminate proto_tree_add_text from packet-telnet.c
+    Qt: add assert (CID 1311486).
     
-    Change-Id: I0e8610f381e650f2c5b3f78ea927b727ec9ac62a
-    Reviewed-on: https://code.wireshark.org/review/5637
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I62290f1f1c7856ee431705a64fae2022b850234a
+    Reviewed-on: https://code.wireshark.org/review/16361
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit afa5558
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 7 08:05:11 2014 -0800
+commit 01b28ca
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 23:01:06 2016 +0200
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-12-07]
+    randpkt_core: change rand() to g_rand_int (CID 1355360).
     
-    Change-Id: Ice8195b09120fb21144e504289a64fd5af84775b
-    Reviewed-on: https://code.wireshark.org/review/5647
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I48560cbb6007eb16aa545a3e8e6a0e8e3b206930
+    Reviewed-on: https://code.wireshark.org/review/16326
+    Petri-Dish: João Valverde <j@v6e.pt>
+    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 de61f06
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 6 15:59:07 2014 -0800
+commit e3cbea3
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jul 9 15:37:27 2016 +0100
 
-    The packet encapsulation is in pkt_encap, not rec_type.
+    IPv6: Remove obsolete comment
     
-    rec_type is the type of record (which isn't necessarily a packet; future
-    work on libwiretap will let it return non-packet data); if it's a packet
-    (REC_TYPE_PACKET), then pkt_encap contains the "link-layer"
-    encapsulation for the packet (in quotes because it may contain metadata
-    not transmitted over the network).
+    WS_INET6_ADDRSTRLEN should be used instead of INET6_ADDRSTRLEN.
     
-    Change-Id: I6f32b02f4466df6d7b07dbdc9d77e881830ac749
-    Reviewed-on: https://code.wireshark.org/review/5645
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id937ca72361f4f1b3cad2c18b1067c3fddc527a9
+    Reviewed-on: https://code.wireshark.org/review/16359
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 22da8a3
+commit a9d5256
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 6 16:21:07 2014 -0500
+Date:   Sat Jul 9 09:05:12 2016 -0400
 
-    Remove annex_a_used from packet_info structure.
+    packet-wsp.c: Fix infinite loop in add_headers
     
-    Change-Id: I660caa8283aecff5060c6ed476f316bc5793373e
-    Reviewed-on: https://code.wireshark.org/review/5643
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
+    Bug: 12594
+    Change-Id: Id86d1e5f2db12871bc1b345721e79e57192f01e1
+    Reviewed-on: https://code.wireshark.org/review/16355
+    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 8e1cc70
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 8 23:25:14 2016 +0200
+
+    Fix detection of NSIS/WiX install path when running a win64 CMake
+    
+    On x86 system:
+    System32\cmd.exe
+    ProgramFiles=C:\Program Files
+    
+    On x64 system:
+    System32\cmd.exe
+    ProgramFiles=C:\Program Files
+    ProgramFiles(x86)=C:\Program Files (x86)
+    ProgramW6432=C:\Program Files
+    Syswow64\cmd.exe
+    ProgramFiles=C:\Program Files (x86)
+    ProgramFiles(x86)=C:\Program Files (x86)
+    ProgramW6432=C:\Program Files
+    
+    Change-Id: I32d52219366b299f1e8099dc6d7737970dc398dd
+    Reviewed-on: https://code.wireshark.org/review/16346
+    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 6d4c0ed
+commit 01c6483
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 5 20:53:39 2014 -0800
+Date:   Sat Jul 9 00:07:52 2016 -0700
 
-    Don't go past the end of the "extra data".
+    Check for pcapng files when reading from a pipe.
     
-    The "extra data", according to the RF5 API manual I have, is "hardware
-    parameters", so change some names.
+    That way, people don't get confused by an "Unrecognized libpcap format"
+    error - it's *not* libpcap format!
     
-    Report an error if the variable parts of the configuration event record
-    run past the record length.
+    Also, improve *that* message to say "...or not libpcap data", and put a
+    period at the end of the error messages.
     
-    Report an error if the hardware parameters are too short.
-    
-    For the purportedly DS0 hardware parameters, don't assume they'll be
-    long enough for the mask; they might not be.
-    
-    Change-Id: Ib63d042e4ede32216fb474c4ecdba84db1387abc
-    Reviewed-on: https://code.wireshark.org/review/5638
+    Change-Id: I175f9399fe99ce424f1d83596b7330e1fa5c0625
+    Reviewed-on: https://code.wireshark.org/review/16349
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 8c190d6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 3 16:39:58 2014 +0100
+commit 94c0f91
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 30 11:09:07 2016 +0100
 
-    RPKI-RTR: Missing break in switch (CID 1233099)
+    Fix value_string_ext_free() constness
+    
+    Don't declare destructor as taking a const argument.
     
-    Change-Id: I01f01ce51fb1c9deb857ef01696b406b97dca3a9
-    Reviewed-on: https://code.wireshark.org/review/5616
+    Change-Id: I9badfe400718bef41a0e0a00d4b3d1b0bb2879d1
+    Reviewed-on: https://code.wireshark.org/review/16342
+    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 646d52e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 3 16:48:48 2014 +0100
+commit 4feb116
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 2 17:17:43 2016 +0100
 
-    PCEP: Missing break in switch (CID 1247685)
+    IPv6: Remove a memcpy()
     
-    Change-Id: Id001a6c1e116fdabfd51c354832ca68f50e65e7d
-    Reviewed-on: https://code.wireshark.org/review/5618
+    Replace CamelCase and remove unnecessary casts too.
+    
+    Change-Id: Iacf56912448c0e0dc0fe21477d6b71ba9caba69a
+    Reviewed-on: https://code.wireshark.org/review/16344
     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: João Valverde <j@v6e.pt>
 
-commit a5fe0d4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Dec 4 10:57:16 2014 +0100
+commit 44c2560
+Author: Amitoj Setia <asetia@juniper.net>
+Date:   Fri Jul 8 09:42:50 2016 -0700
 
-    BT obex: Missing break in switch (CID 1132031)
+    fixed some juniper vn dissector bugs
     
-    Change-Id: I6b8fc8db006bc3b8f8f4bac019cb7e240931d3b5
-    Reviewed-on: https://code.wireshark.org/review/5619
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I67ea5df962266c1476d1d1b6234e831018138422
+    Reviewed-on: https://code.wireshark.org/review/16341
+    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 bb00570
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 5 15:46:58 2014 -0800
+commit 837b534
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 8 15:58:55 2016 +0200
 
-    Fix some copy-and-pasteos in error messages.
+    GSM RLC/MAC: register dissectors for EC-GSM-IoT control messages
     
-    Change-Id: I1fe3434e69a08aae3d7413067275b3d7ee1552f5
-    Reviewed-on: https://code.wireshark.org/review/5634
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8fe84cc98b8967c529c07ff17014648610ad8660
+    Reviewed-on: https://code.wireshark.org/review/16340
+    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 4510306
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 5 13:14:31 2014 -0800
+commit f0bc390
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 8 12:24:13 2016 +0200
 
-    Get rid of a trailing blank.
+    MAC LTE: upgrade dissector to v13.2.0
     
-    Change-Id: I0cf6d04f5075ba1f064c40f4b39b32b6976b54c7
-    Reviewed-on: https://code.wireshark.org/review/5633
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic859d69583ca3c342d4775511b68fc276f3290a4
+    Reviewed-on: https://code.wireshark.org/review/16339
+    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 b98c570
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 5 13:04:59 2014 -0800
+commit 80b4302
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Jul 7 09:46:12 2016 +0000
 
-    Fix varargs handling in col_{add,append}_lstr().
+    When generating the LUA reference in AsciiDoc then say so.
     
-    We do multiple va_start() calls using the first string in the list of
-    strings; do *not* use the first-string argument to iterate over all the
-    argument strings, as that means that only the first va_start() call will
-    do the right thing, use a separate variable.
+    Generating LUA documentation source for the developer guide says that
+    it's generating XML, which it did before the switch to AsciiDoc. Fix
+    this statement.
     
-    Bug: 10755
-    Change-Id: Ic4a6c24f911e335d147883a25d30289628836875
-    Reviewed-on: https://code.wireshark.org/review/5630
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib8625af84c74b5f6dc31c1e9e5ded80d9d7940ff
+    Reviewed-on: https://code.wireshark.org/review/16320
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit a7b7f94
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jul 8 08:06:30 2016 +0200
+
+    couchbase: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
+    
+    Change-Id: Ie1e3b071388b3527bba1088af69d76dcb8d6981a
+    Reviewed-on: https://code.wireshark.org/review/16333
+    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 18fabb4
+commit c3fc1e4
 Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Dec 2 09:40:46 2014 -0500
+Date:   Thu Jul 7 21:49:41 2016 -0400
 
-    Strengthen association matching when we haven't seen the INIT/INIT-ACK.
+    APRS: more cleanup.
     
-    The fact that the vtag matches the initiate tag doesn't mean much if both are 0
-    (uninitialized).
+    There's no need to create global structures with pointers to the (global) hf's
+    to pass into the dissection functions.  Just reference the global variables
+    directly.
     
-    Also leave in some (commented-out) debug to make debugging this stuff easier
-    in the future.
+    Remove other global variables passed as arguments while we're at it.
     
-    Change-Id: Id007de8bf9d2d4e0bb18309ed3e2572fedda45f1
-    Reviewed-on: https://code.wireshark.org/review/5571
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 0867344
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Thu Dec 4 16:59:43 2014 -0700
-
-    Look for python3 in addition to python in configure script.
+    Remove boilerplate comments.
     
-    Change-Id: I77ff22aabdbbbf7376483b53d8795e7fbf0c0433
-    Reviewed-on: https://code.wireshark.org/review/5627
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I7ce6b356172aa25983f4cc6a007a0158cb7f26c9
+    Reviewed-on: https://code.wireshark.org/review/16331
+    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 d5a4cc3
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Thu Dec 4 13:15:41 2014 -0700
+commit 54bf3e9
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jul 7 21:23:57 2016 -0400
 
-    Make autogen.sh look for "python3" if "python" isn't found before
-    giving up.
+    APRS: clean up some header fields.
     
-    Change-Id: Id109c78f90da71c54c7b4fd6df20cc153248f46f
-    Reviewed-on: https://code.wireshark.org/review/5623
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit 3b7c165
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Dec 4 22:49:42 2014 +0100
-
-    use the same data types as in i2c_phdr
+    Try to make the names self-explanatory (without relying on blurbs).
     
-    Change-Id: Ic0abcf8173a690a1dc0cd250f5e8770eb92a5aa9
-    Reviewed-on: https://code.wireshark.org/review/5626
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Icfb4797282987b42ac68709b431d8b7248a0a633
+    Reviewed-on: https://code.wireshark.org/review/16330
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 5d95067
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Dec 4 22:38:16 2014 +0100
+commit 07ab40e
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Jul 8 10:52:29 2016 +0200
 
-    simplify dissect_i2c()
+    Qt: Update scrollbars when change byte view format
     
-    Change-Id: I67dd6ae5dc48b297e5c04aba2fe53e3e159d2611
-    Reviewed-on: https://code.wireshark.org/review/5625
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 73f48a0
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Dec 4 22:25:39 2014 +0100
-
-    dont't manually throw a ReportedBoundsError if the packet is empty
-    use tvb_captured_length() instead of tvb_length()
+    Update scrollbars when changing display format between hex and
+    bits view because the height of the phane will change.
     
-    Change-Id: I7e7efd69515fc3e30c986ac5d9a56b4db1931c10
-    Reviewed-on: https://code.wireshark.org/review/5624
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I81556c8dbdfb0a34f6c97e76834646a40aed62bb
+    Reviewed-on: https://code.wireshark.org/review/16336
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 70ca52c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Dec 4 14:38:35 2014 +0100
+commit 3cf1048
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Fri Jul 8 11:37:31 2016 +0300
 
-    3GPP: upgrade 2G/3G NAS dissector to v12.7.0 and NAS EPS dissector to v12.6.0
+    ZigBee GreenPower: Fix GP Pairing command dissection.
     
-    Change-Id: I1e5bc5d28cb956b333c302b1cb18335b59d096a8
-    Reviewed-on: https://code.wireshark.org/review/5621
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Fix length of Sink GroupID in GP Pairing command.
+    
+    Change-Id: I5905812456faa0181ee1cc13824a12ce2583d4e0
+    Reviewed-on: https://code.wireshark.org/review/16335
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit ab3c182
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Dec 4 09:54:08 2014 -0500
+commit 0b53325
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Jul 8 09:45:26 2016 +0200
 
-    There's no need to talk about update-alternatives here.
-    
-    Our "make install" process does nothing with 'alternatives'.  Our RPMs do use
-    alternatives but they do the necessary update-alternatives stuff already.
+    p1: Add BuiltInEncodedInformationTypes.telex
     
-    (If someone wants to set up Linux "make install"s to use alternatives it would
-    make sense to put these notes to the user back in.)
+    This is for completeness.
     
-    Change-Id: Ib7f4655a222ccaee83830a97b213656856cee73e
-    Reviewed-on: https://code.wireshark.org/review/5622
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: Id89f649aa836dd011f0967cdbdc905916b4d2182
+    Reviewed-on: https://code.wireshark.org/review/16334
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit b2fcbb2
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 22:12:52 2014 -0500
+commit 330bc0e
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jul 6 08:46:29 2016 +0200
 
-    Add a MIME type for Tektronix rf5 files and register Wireshark for that type of
-    file.
+    nbifom: fix no previous prototype for 'proto_register_nbifom' [-Wmissing-prototypes]
     
-    The magic matching comes from wiretap/k12.c.
-    
-    (Yes, I just made the application/x-tektronix-rf5 MIME type up.)
-    
-    Change-Id: Iafd7300aa7f2664bb06e1330caede10785c21d68
-    Reviewed-on: https://code.wireshark.org/review/5607
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I4456cfd6600986b2e0c1cecf7d3054f3e829a210
+    Reviewed-on: https://code.wireshark.org/review/16332
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit a919566
-Author: Steve Karg <skarg@users.sourceforge.net>
-Date:   Wed Dec 3 13:30:42 2014 -0600
+commit b080563
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 22:43:49 2016 +0200
 
-    BACnet: fix dissection of exception-schedule property.
+    Qt: add initializers (CID 1261463).
     
-    The exception schedule special-event disection already used matched
-    open-close tags and only needed to check for an unmatched close tag
-    to exit when used with ReadPropertyMultiple service.
-    
-    Bug: 10691
-    Change-Id: I54f2f6f3f470138a6a88f84c62fd15b07ea74c37
-    Reviewed-on: https://code.wireshark.org/review/5593
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I5c2d5c73e188586a91dde342d6347d25495e0263
+    Reviewed-on: https://code.wireshark.org/review/16325
+    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 f27c345
-Author: Michele Baldessari <michele@acksyn.org>
-Date:   Wed Dec 3 20:14:33 2014 +0100
+commit 785d229
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 22:38:40 2016 +0200
 
-    Add resource-id parsing to the X11 errors that return it
+    Qt: add initializer (CID 1269610).
     
-    - Rename BadColor to BadColormap as the former does not exist in the X11
-      specs
-    - Parse the bad resource id field in case of the following errors:
-      BadColormap, BadWindow, BadPixmap, BadCursor, BadFont, BadDrawable,
-      BadGC and BadIDChoice
+    Change-Id: I483e5d3f239f4708f9fc6b11c98869bb1381fb44
+    Reviewed-on: https://code.wireshark.org/review/16324
+    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 03ca5c0
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 22:35:30 2016 +0200
+
+    Qt: add initializers (CID 1317257).
     
-    Change-Id: I5b23d32189e1a8bb291c656cf6383a85b3e89642
-    Reviewed-on: https://code.wireshark.org/review/5592
+    Change-Id: I61a63c187990b119b62e99871832913a0e3f75e4
+    Reviewed-on: https://code.wireshark.org/review/16323
+    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 b8a2364
+commit d83ee1d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 4 00:03:03 2014 -0800
+Date:   Thu Jul 7 17:21:48 2016 -0700
 
-    Don't do the desktop integration stuff if we're not building Wireshark.
+    Handle extcap binaries and the libssh upon which some depend.
+    
+    Search the extcap binaries for shared libraries they require.
     
-    Wireshark is the desktop app; if we're not building it (i.e., we're only
-    building the command-line TShark), we don't need any desktop files.
+    Treat libssh specially - for some reason, when built by macosx-setup.sh
+    (which just does a standard cmake build of libssh), libssh's shared
+    library has just libssh.4.dylib, not {installation
+    directory}/libssh.4.dylib, as its shared library ID, so we don't find
+    its binary using otool -L.
     
-    Change-Id: Id8244b417fd53c9d55b4d77fe3ad748c98868ad7
-    Reviewed-on: https://code.wireshark.org/review/5615
+    Bug: 12471
+    Change-Id: I3e5632d7520f1bbeca1a8faae3a012938ef9dee7
+    Reviewed-on: https://code.wireshark.org/review/16329
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c02417f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 23:56:10 2014 -0800
+commit 853df46
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jul 7 22:13:41 2016 +0200
 
-    Don't do all the fd.o desktop integration stuff on OS X.
+    osx-app.sh: add ciscodump.
     
-    It doesn't need it, so don't install those files, or uninstall them, or
-    suggest running various unnecessary commands after the installation
-    finishes.
-    
-    Change-Id: Ieecab22884723670f47f2fc7cc1ac827f48c1967
-    Reviewed-on: https://code.wireshark.org/review/5614
+    Ping-Bug: 12471
+    Change-Id: I7326e43ce8b294c8065e09120d85b4743f1659a9
+    Reviewed-on: https://code.wireshark.org/review/16321
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 6e5d84f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 3 15:22:39 2014 -0500
+commit d80c3b9
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Fri Jul 8 00:24:14 2016 +0200
 
-    Rename some filter names to fix cases of duplicate filter names.
+    Clean up fixed field handling
     
-    Note: Use of most of these filter names could have caused a Wireshark crash.
+    - Get rid of FF_FIELD macro. Use resoved strings instead.
+    - Reorder add_ff_ functions so we don't need forward declarations
+    - Replace add_fixed_field call by call to resolved function
+    - Remove add_fixed_field and all structs and enums exclusive to it.
+    - #if 0 out unused function add_ff_relay_capable_sta_info
     
-    Change-Id: I393402a25dd26d174baff77f4706f6d5f43a94ae
-    Reviewed-on: https://code.wireshark.org/review/5610
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I9955febb317f3e7c1b9ae28a5ee9c6a6472f7e9c
+    Reviewed-on: https://code.wireshark.org/review/16328
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit f8c0bff
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 3 15:19:36 2014 -0500
+commit 10db044
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jul 7 21:33:09 2016 +0100
 
-    mac-lte: Rename expert filter name to fix conflict with same name in hf[]
+    CMakeLists.txt: Fix gcee3e82
     
-    Change-Id: I906a195b3c6a1e68f273decc9c443a233af4f9be
-    Reviewed-on: https://code.wireshark.org/review/5609
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug: 12589
+    Change-Id: I7f9be4027214cb7ae4f7b235cba73c088596a80d
+    Reviewed-on: https://code.wireshark.org/review/16322
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit d519617
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 3 14:14:53 2014 -0500
+commit 166cede
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jul 5 22:01:52 2016 -0400
 
-    mausb: Rename expert filter names to fix dup filter names.
+    APRS: register the storm fields.
     
-    Change-Id: Id650c3aff6d073b05e844574ffbde8fec4368f49
-    Reviewed-on: https://code.wireshark.org/review/5608
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 245bdd1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 18:37:50 2014 -0800
-
-    Put a bunch of suggestions in post-install/post-uninstall hooks.
+    There's been a comment here since 2012 about them being unregistered.  Put in
+    some registrations based on a feeble understanding of the specification (these
+    are all strings, add them as such); that should be close enough and is much
+    better than the (dissector) assertion we'd get otherwise.
     
-    This covers a bunch of commands that might have to be run after "make
-    install".  ("might" - none are needed on OS X, for example, as it's a
-    different desktop and its dynamic loader doesn't have a cache that you
-    have to manually update whenever you install a new shared library.)
+    Don't bother putting those hf's in a global structure and passing around the
+    structure: the hf's are global anyway--just reference them directly.
     
-    Change-Id: I21e1728bdde26a7ab1585fdfb54f63fdc1c25dd6
-    Reviewed-on: https://code.wireshark.org/review/5606
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Add a link to the specification while we're here.
+    
+    Change-Id: Ia7b17e92a996a1a8eb4a4489eff9fca042190a32
+    Reviewed-on: https://code.wireshark.org/review/16318
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@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 1ffe32b
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 16:59:08 2014 -0500
+commit fb74b16
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed May 25 08:06:46 2016 +0200
 
-    Fix building of RPMs and get RPM builds working with a prefix other than /usr again.
+    PAPI: Update Header field
     
-    (Change I567269d8e45e6543d9e39dbedc49830adf7edb9f made the desktop files
-    install outside of /usr/share/ .)
+    Change-Id: I0c2a522ea70e62b6962c99729068e962beb21085
+    Reviewed-on: https://code.wireshark.org/review/15572
+    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 0f07378
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Wed Jul 6 13:39:54 2016 +0200
+
+    openSAFETY: Simplify handling of SN Fail/Ack
     
-    RPMs now build and work regardless of the prefix but the desktop integration stuff
-    only works if the prefix is /usr or (if you're lucky) /usr/local .
+    Also add information about error group/code acknowledged,
+    and additional parameter set missing, if applicable
     
-    Change-Id: If20e0127a044eac1ba099f959a90d068c4bb2ae5
-    Reviewed-on: https://code.wireshark.org/review/5600
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I911d9941a33ff4064649090908e0fcc2bf6e00f8
+    Reviewed-on: https://code.wireshark.org/review/16319
+    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 44e2716
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 20:02:04 2014 -0500
+commit 0bc8cf2
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Jul 5 20:14:34 2016 +0100
 
-    Tell the loader where to find our libraries if we're being installed
-    someplace other than /usr .
+    configure: Check for working lrelease
     
-    Change-Id: I42cbe98bcfc0e8ba2aa08f651044db051d31205c
-    (cherry picked from commit 25d9695cb3536b672f4cd8bc280e2a3c816a0d8a)
-    Conflicts:
-       packaging/rpm/SPECS/wireshark.spec.in
-    Reviewed-on: https://code.wireshark.org/review/5605
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    The qtchooser package in many (all?) distros installs executable symlinks to
+    qtchooser that can mislead AC_PROG_PATH if the corresponding Qt linguist
+    tools package is missing.
+    
+    Bug: 12570
+    Change-Id: I98795a3a7b8a05214c56a0c7b50829ea3b2976fa
+    Reviewed-on: https://code.wireshark.org/review/16316
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com>
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit f0bd311
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Dec 3 16:05:29 2014 -0800
+commit 5758aa5
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jul 5 21:22:36 2016 -0400
 
-    CMake: Don't cache LUA_LIBRARIES.
+    ATM PW: don't use macros to generate hf entries.
     
-    Don't cache the LUA_LIBRARIES variable. This matches the behavior of the
-    other library modules and fixes a compilation problem on my machine
-    where /usr/local/lib/liblua.dylib wasn't showing up in the various
-    build.make and link.txt files.
+    The macros weren't saving much code, were confusing checkhf.pl, and were hiding
+    useability problems with the fields (such as names equal to the abbreviation
+    and having several fields with the same abbreviation--things checkAPIs.pl can
+    check now that the macros are out of the way).
     
-    Change-Id: Ib75ef303f2e67b266a246621718d0ea2ab885dca
-    Reviewed-on: https://code.wireshark.org/review/5603
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Id2ba67d09ce7dd424aee9d7f2e25eb54fa432d98
+    Reviewed-on: https://code.wireshark.org/review/16315
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0d20456
+commit 7f22c8a
 Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 17:54:45 2014 -0500
+Date:   Tue Jul 5 21:40:26 2016 -0400
 
-    Make a note that cmake needs to install the freedesktop integration files too.
+    LAT: use ENC_ASCII when adding strings.
     
-    Change-Id: I5eeeb2fa32e8f90bc56f0515e0fc9f6c5f88eb79
-    Reviewed-on: https://code.wireshark.org/review/5602
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: If3970fbc25d4085037fb975498de02449e2c25c1
+    Reviewed-on: https://code.wireshark.org/review/16317
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7ef5abc
+commit c43984c
 Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 17:05:00 2014 -0500
+Date:   Tue Jul 5 20:46:08 2016 -0400
 
-    Don't run gtk-update-icon-cache when uninstalling the Qt package.  But do run
-    it when installing the gnome package.
+    LAT: register several hf's.
     
-    Change-Id: I0bbd9c0edc3fb6fe0e672aa3dbea5ba23d847d87
-    Reviewed-on: https://code.wireshark.org/review/5598
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Found by checkhf.pl
+    
+    Change-Id: If985d04f24a188ac402bc11cf61d29aa418ad242
+    Reviewed-on: https://code.wireshark.org/review/16314
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c86d1d2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 3 20:48:08 2014 +0100
+commit f5eaf53
+Author: Hendrik Uhlmann <Hendrik.Uhlmann@rheinmetall.com>
+Date:   Tue Jul 5 14:16:48 2016 +0200
 
-    FC: fix dissection when packets are captured with Fibre Channel FC-2 encapsulation type
+    DIS: Introduced support of Collision PDU
     
-    This is broken since ga9dd765
+    Parse all Attributes of Collision PDU and display them in wireshark HMI.
     
-    Bug: 10751
-    Change-Id: Id4f282d9e0104bfa2314e2348aedf31233a671bd
-    Reviewed-on: https://code.wireshark.org/review/5594
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I3003c6dd709498cc6c1adf784800047d0984bafa
+    Reviewed-on: https://code.wireshark.org/review/16299
+    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>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 0a30f68
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 29 19:00:58 2014 +0100
+commit 4b06222
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 16:45:52 2016 +0200
 
-    start dissecting the stsz box
+    Qt: add initializers (CID 1268205).
     
-    Change-Id: Ia8fce9307bae33c44d630af403980d162afd88c2
-    Reviewed-on: https://code.wireshark.org/review/5597
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I7eb71876731df29c076a3a756b6748f165d1c327
+    Reviewed-on: https://code.wireshark.org/review/16306
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 2f39f2e
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 29 18:50:59 2014 +0100
+commit 50d1d59
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 23:08:30 2016 +0200
 
-    BOX_TYPE_STZ2
+    Qt: add initializers (CID 1162824).
     
-    Change-Id: I4eadf2b613b7803c81593e517408631f8375ab2c
-    Reviewed-on: https://code.wireshark.org/review/5596
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ib570d3531bfdd35404b75d49dbd7dd43db4c30d9
+    Reviewed-on: https://code.wireshark.org/review/16310
+    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 ee48194
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 29 12:58:20 2014 +0100
+commit 4b484a6
+Author: Sergey Avseyev <sergey.avseyev@gmail.com>
+Date:   Wed Jul 6 01:22:11 2016 +0300
 
-    start dissecting the mvhd box
+    packet-couchbase.c: describe observe-seqno (0x91)
     
-    Change-Id: I66c1973daa89690f6aaa10891408e93e886875ea
-    Reviewed-on: https://code.wireshark.org/review/5595
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I6018a57a8ae947ee68aa35901398d504d35b99c7
+    Reviewed-on: https://code.wireshark.org/review/16312
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit b088ca5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 11:03:23 2014 -0800
+commit 5848845
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 23:35:11 2016 +0200
 
-    Squelch some "can't happen in reality" warnings.
-    
-    (I guess newer versions of GCC/Clang know that dissect_eh_frame() is
-    never called with a segment_size of 0, so the loop is traversed at least
-    once.  NOTE: if it ever *is* called with a segment_size of 0, then
-    that's a genuine bug and needs to be fixed.)
+    Qt: remove unneeded constructors.
     
-    Also, segment_size is used; no need to mark it as unused.
+    There is no need to have an empty private constructor if an explicit
+    one is already present. The former private constructor didn't initialize
+    the private members causing many CIDs from coverity.
     
-    Change-Id: I63b7a580a853b55f22494de73b4c4e6f9a387647
-    Reviewed-on: https://code.wireshark.org/review/5591
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8ba98d2b9fc32a867fdcf3421df7946b90bd7b09
+    Reviewed-on: https://code.wireshark.org/review/16311
+    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 db462ce
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Dec 3 12:57:38 2014 +0100
+commit 21f5c53
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Jul 5 15:30:38 2016 +0100
 
-    Try to please the buildboots by plasing th '#' at the begining of the
-    line.
+    Rename PIDL Makefile
     
-    Change-Id: Ie17e83504e7fbccb71190b3fdbfb6ad3507a806e
-    Reviewed-on: https://code.wireshark.org/review/5584
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c4602e1
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 25 15:16:48 2014 +0100
-
-    elf: fix .eh_frame parsing, add expert info for bad CIE length
-    
-    Fixes, matching LSB 4.1[1] and the AMD64 ABI[2]:
-     - Multiple CIE entries can exist after the first one. Introduce a CFI
-       subtree and add CIE and FDE records below it. Merge comon parsing
-       functionality of CIE/FDE. A CIE terminator is treated specially, and
-       added instead of a CFI subtree.
-     - Validate the header length before using it to avoid a dissector
-       assert. This condition is triggered by a binary produced by a buggy
-       gold linker[3].
-     - Add two expert items: one to detect an invalid CIE length (too small
-       or too large) and one to detect a segment which is larger than the
-       CFI records (to catch the gold linker bug[3] where the segment begins
-       with zeroes).
-     - Do not overload the elf.eh_frame.length field with the value of the
-       Extended Length, instead use elf.eh_frame.extended_length (likewise
-       for FDE).
-     - Stop tracking the subsection size with another variable
-       (remaining_length), just store the end of the entry.
-     - Fix typos in descriptions, improved / shortened field descriptions.
-    
-    Tested with the 'bad' and 'good' binary from bug 10726 as well as the
-    'a' binary from bug 8818 (which introduced this code). Decodes properly.
-    
-     [1]: https://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html
-     [2]: http://www.x86-64.org/documentation/abi.pdf
-     [3]: https://sourceware.org/bugzilla/show_bug.cgi?id=17639
-    
-    Bug: 10726
-    Change-Id: I523600b8141bd8953ae468051a57357ab199a258
-    Reviewed-on: https://code.wireshark.org/review/5488
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Otherwise it will get overwritten by the in-tree cmake build.
+    
+    Issue reported by Rémy Léone.
+    
+    Change-Id: I0d908973386bcb70585f5e32c36456230967bb7f
+    Reviewed-on: https://code.wireshark.org/review/16305
+    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>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c69ccab
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 01:06:02 2014 -0800
+commit addf064
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 22:27:55 2016 +0200
 
-    Install the other desktop files with "make install" as well.
+    Qt: remove unused variable.
     
-    (And remove them with "make uninstall".)
+    This fixes also CID 1159350.
     
-    Change-Id: I76b554bf1a1272813d61c8d2c96cda0a152eebb5
-    Reviewed-on: https://code.wireshark.org/review/5582
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I21b55686f96131e3e1cff0feac5f16df1c7c7ca2
+    Reviewed-on: https://code.wireshark.org/review/16309
+    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 08c0247
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Fri Nov 28 16:53:04 2014 +0100
+commit 1eea415
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 16:30:28 2016 +0200
 
-    Support dissecting REAL (BER) data values
+    bgp: add return check (CID 1354417).
     
-    Both exponent and 'integer N' values are limited:
-     * max exponent is 3 octets/24-bits
-     * max integer N is 8 octets/64-bit
-    
-    Tested with zero value/length, integers, doubles, positive and negative numbers all using the Basic Encoding Rules (BER)
-    
-    Change-Id: If92e1b3e209c42909b8cb76e6f50b8e6cd1da0da
-    Reviewed-on: https://code.wireshark.org/review/5527
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Id8be1d5f6346686087d747167ec44df2b88dd35e
+    Reviewed-on: https://code.wireshark.org/review/16304
+    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>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit e55fe95
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Dec 3 09:55:08 2014 +0100
+commit aea0023
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jul 5 16:19:33 2016 +0200
 
-    Make dissect_sip_tcp() a new style dissector.
+    tap: check return value (CID 1355643).
     
-    Change-Id: I773f6738b3ed507e1ce031ee308d16de4bdeb7d4
-    Reviewed-on: https://code.wireshark.org/review/5580
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I03b141c7aeaa1bc06dc126c5cc8f0d001a57c116
+    Reviewed-on: https://code.wireshark.org/review/16302
+    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 fb0999a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 00:21:59 2014 -0800
+commit d7c072d
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:49:32 2016 +0200
 
-    Use $(srcdir) when installing image/wsicon.svg.
+    Qt: remove unused variable.
     
-    We're not necessarily running from the top-level source directory.
+    This fixes CID 1232347.
     
-    Change-Id: I0bb815275f85630e5316bf593f4ac098d9475308
-    Reviewed-on: https://code.wireshark.org/review/5579
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I42b5ac997dbde8fcb05665b24444a60b009871be
+    Reviewed-on: https://code.wireshark.org/review/16290
+    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 d6d55b2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 00:18:01 2014 -0800
+commit 7a3e9b1
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Tue Jul 5 16:06:16 2016 +0100
 
-    Uninstall the icons with "make uninstall".
+    Developers Guide updates
     
-    Just in case not all shells expand {list}, create the apps/icons and
-    apps/mimetypes directories separately; that makes it a bit clearer in
-    any case.
+    Added info about debugging under Visual Studio.
+    Updated buildbot info.
     
-    Change-Id: I25b3426a17a2ca7e1ce3ce1f7f9e1c650db511a7
-    Reviewed-on: https://code.wireshark.org/review/5578
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I9a6a0a2b14e3616a35f652c99b04ee23ea642ba5
+    Reviewed-on: https://code.wireshark.org/review/16307
+    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 b5a52ee
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 2 22:21:13 2014 -0800
+commit bed9d18
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jul 5 16:21:01 2016 +0200
 
-    Get rid of trailing blank.
+    Remove remnants of g_spawn_helper support
     
-    Change-Id: Ia0eecbbe1ff1778d5c34338e042c0518895663b4
-    Reviewed-on: https://code.wireshark.org/review/5577
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cff44e5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 2 22:19:01 2014 -0800
-
-    Always install icons, and install them under $(datadir).
-    
-    We always install them because of bug 10737.
-    
-    We install them under $(datadir) because that's where we should install
-    our data - if your desktop environment can't find the icons there,
-    either it's broken (file a bug) or misconfigured (fix the configuration
-    or, if you didn't configure it, file a bug).
-    
-    Bug: 10737
-    Change-Id: I567269d8e45e6543d9e39dbedc49830adf7edb9f
-    Reviewed-on: https://code.wireshark.org/review/5576
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c681091
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Dec 2 17:34:29 2014 -0500
-
-    Fix instances of duplicate display-filter-names with incompatible types.
-    
-    Change-Id: I3b5afb8a59f6443624708b9fecfdcbe93dad59ef
-    Note: Some of the filters, when/if used, could have caused Wireshark crashes.
-    Reviewed-on: https://code.wireshark.org/review/5575
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 43e759e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 2 22:18:55 2014 +0100
-
-    L2TP: add dissection of H bits
-    
-    As requested in https://ask.wireshark.org/questions/38280/l2tp-dmpt-header-h-bit
-    
-    Change-Id: If6cb61c720505e547432e87faf2a36bb4ec6e7c5
-    Reviewed-on: https://code.wireshark.org/review/5574
+    Change-Id: I88121a280ff01a889daeda438b308380b6ea0703
+    Reviewed-on: https://code.wireshark.org/review/16303
+    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 5abfc60
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 2 16:09:26 2014 +0100
-
-    Couchbase: fix missing comma...
-    
-    Change-Id: Ic86e07b434e693d2f0fbd9518a23ed49cf49f24d
-    Reviewed-on: https://code.wireshark.org/review/5572
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit d5aa8a4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 2 15:32:34 2014 +0100
+commit d245698
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Tue Jul 5 16:01:10 2016 +0200
 
-    Couchbase: fix Extended value string 'opcode_vals' forced to fall back to linear search
+    openSAFETY: Add byte offset of frame
     
-    entry 85, value 128 [0x80] < previous entry, value 245 [0xf5]
+    Add the absolute byte offset of each openSAFETY frame to
+    dissection, so a change in the offset can be easily detected
     
-    Change-Id: I14bbe276eef5fdaa70561764ac4e6f2e174ceabe
-    Reviewed-on: https://code.wireshark.org/review/5570
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ib935eff7ba1e2e1169cb9071a5c9703cc58fc123
+    Reviewed-on: https://code.wireshark.org/review/16301
+    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 f6a4f32
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 1 15:00:13 2014 +0100
+commit 5cc5ba6
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:53:21 2016 +0200
 
-    cms: Handle media_type pkcs7-mime and pkcs7-signature
+    Qt: add initializers (CID 1233100).
     
-    Change-Id: I7db4e67ffe99a9f3b41d0b507d9837e0237d4547
-    Reviewed-on: https://code.wireshark.org/review/5558
+    Change-Id: I99e0d6bd10cc0faddb8a503ec877b3d03b927f4e
+    Reviewed-on: https://code.wireshark.org/review/16293
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 077b45e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 1 15:13:25 2014 +0100
+commit 5c11909
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:58:41 2016 +0200
 
-    imf: Added base64 content encoding support
+    Qt: add initializers (CID 1249475).
     
-    Change-Id: I668b9c3dfcac83c698e83d4111af8bd19ec8076c
-    Reviewed-on: https://code.wireshark.org/review/5559
+    Change-Id: Ic001c0dfab1e82c66473d6ca15633aaa57520659
+    Reviewed-on: https://code.wireshark.org/review/16294
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 485399a
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Tue Nov 18 21:11:22 2014 +0300
+commit 0b35075
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:41:01 2016 +0200
 
-    Update Couchbase dissector
+    dis: cast to guint64 to avoid potential overflow (CID 1214480).
     
-    * Include DCP port to the list default ports
-    * Parse payloads for DCP commands:
-      * OPEN_CONNECTION
-      * ADD_STREAM
-      * STREAM_REQUEST
-    * Reorganize if conditions to cases
-    * Update list of known commands
-    
-    Change-Id: Id37b5c61f0d1084628c6286fd6e4ad722e1d6d99
-    Reviewed-on: https://code.wireshark.org/review/5388
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
+    Change-Id: I24ae4a7a5ef8b4ed363ec849ac9c8aeeefe836dd
+    Reviewed-on: https://code.wireshark.org/review/16288
+    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 9c05b7f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Dec 2 12:53:46 2014 +0100
+commit f2786bc
+Author: Roland Knall <rknall@gmail.com>
+Date:   Tue Jun 28 21:34:46 2016 +0200
 
-    Make it possible to register an OID dissector to dissect
-    ManagementExtension.
+    extcap: Remove g_spawn_helper support
     
-    Change-Id: I52c626b0d7a63214ccecf13d62e0a2850c2dee07
-    Reviewed-on: https://code.wireshark.org/review/5569
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+     Move g_spawn to separate file and implement functions to
+     use Windows based method of spawning, instead of the glib
+     based version
+    
+    Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f
+    Reviewed-on: https://code.wireshark.org/review/16049
+    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>
+    Reviewed-by: Roland Knall <rknall@gmail.com>
 
-commit 987383d
+commit fdd87a1
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Dec 1 17:21:41 2014 +0100
+Date:   Mon Jul 4 22:41:29 2016 +0200
 
-    6LoWPAN: use manually managed memory for the stateful address decompression preferences
+    Network-Based IP Flow Mobility (NBIFOM) dissector
     
-    Bug: 10747
-    Change-Id: I9d1b7ce2782f7cd133ab3ba02b0dd43afab3e145
-    Reviewed-on: https://code.wireshark.org/review/5560
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Based on 3GPP 24.161 V13.1.0
+    
+    Change-Id: I7bf635c862bf7e0b73fd05bc8a55c900d1f4dd87
+    Reviewed-on: https://code.wireshark.org/review/16291
     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 f260f9a
-Author: Matthieu Texier <matthieu@texier.tv>
-Date:   Mon Dec 1 23:48:44 2014 +0100
+commit 308a538
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jul 4 16:24:57 2016 -0700
 
-    BGP: Incorrect decoding AS numbers when mixed AS size
+    Style fix and trailing whitespace fix.
     
-    Fix AS Path Heuristic
-    
-    Issue reported by Jon
-    
-    Bug: 10742
-    Change-Id: Ie5e4108bd93464a2d1076dcc4f322171ea8e68cb
-    Reviewed-on: https://code.wireshark.org/review/5564
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I03a438fa58f84939f6245426cbe725e6196c2560
+    Reviewed-on: https://code.wireshark.org/review/16297
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5eec6bb
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 1 14:57:07 2014 +0100
+commit 6e91389
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jul 4 16:22:11 2016 -0700
 
-    multipart: Handle multipart/signed
+    Add a length check.
     
-    Change-Id: I39742dcce79fc41344c64e5266304c8c120aeb7c
-    Reviewed-on: https://code.wireshark.org/review/5557
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 325014a
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 1 14:47:02 2014 +0100
-
-    multipart: Don't include boundary in preamble.
+    Make sure the LBMR TNWG Interest record's length is at least the size of
+    a minimum-length LBMR TNWG Interest record.
     
-    Change-Id: I2d2fd28462b974e4ad656e36f2562633d0743962
-    Reviewed-on: https://code.wireshark.org/review/5556
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Hopefully this will fix the real problem about which CID 1363025 is
+    complaining.
+    
+    Change-Id: I60d94a054ec1ba4fb32b0cdd361995a584fe74a6
+    Reviewed-on: https://code.wireshark.org/review/16296
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 9441909
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Dec 1 23:08:50 2014 -0500
+commit 240f605
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jul 4 22:47:27 2016 +0200
 
-    dftest: load plugins so plugin display filters can also be tested.
+    Qt: add initializer (CID 1230901).
     
-    Change-Id: Ideab88b525cf58b05502f11fb1cf0f58b2864c42
-    Reviewed-on: https://code.wireshark.org/review/5566
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ie7874ef90ce14978adb2c62f208dbcc2a636d3cf
+    Reviewed-on: https://code.wireshark.org/review/16289
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit d643325
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Dec 1 12:13:03 2014 -0500
+commit 38c6a59
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jul 4 14:14:58 2016 -0700
 
-    alljoyn: Rename some filters; Fix some filter types.
+    Add length checks.
     
-    Details:
-     - Rename various "alljoyn.header..." display filter
-        names releated to the alljoyn "message header"
-        to "alljoyn.mess_header..." to distinguish
-        the fields from actual alljoyn "header" fields.
-        This also fixes the duplicate use of the display
-        filter name "alljoyn.header".
-     - Don't use FT_PROTOCOL for a field type.
+    Make sure the authentication trailer length is large enough for a
+    minimum-length authentication trailer.
     
-    Change-Id: Id4e78f36716cf6064638aecd5faf561bcbc88b46
-    Reviewed-on: https://code.wireshark.org/review/5561
-    Petri-Dish: Bill Meier <wmeier@newsguy.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Joe Huffman <jhuffman@codeaurora.org>
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Hopefully this fixes the real problem reported by CID 1363027.
+    
+    Use proto_tree_add_item_ret_uint() while we're at it.
+    
+    Change-Id: I3377f2a52a26f00eeb24ee5776853ffc6e4f7cce
+    Reviewed-on: https://code.wireshark.org/review/16295
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 05c1aa2
-Author: Yann Lejeune <ylejeune@netyl.org>
-Date:   Mon Dec 1 19:08:31 2014 +0100
+commit 6b5d839
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jul 4 13:52:20 2016 -0700
 
-    BGP: fix dissection of BGP community tag
+    Check to make sure the name length <= DLM3_RESNAME_MAXLEN.
     
-    The offset used for BGP community tag dissection is a wrong one.
+    If it's not, we'd misdissect it.
     
-    Bug: 10746
-    Change-Id: I1d1d443568bb97a0b3b95a312762ac0a3102326a
-    Reviewed-on: https://code.wireshark.org/review/5562
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Hopefully this fixes the *real* problem that CID 1363031 was complaining
+    about.
+    
+    Change-Id: If1fc7c30f72d75b9dc047d7e475f78c9d5869943
+    Reviewed-on: https://code.wireshark.org/review/16292
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 6d207fe
+commit 7490ad4
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Nov 24 10:10:12 2014 -0500
+Date:   Sun Jul 3 11:34:37 2016 -0400
 
-    Remove private_data member from packet_info structure.
+    packet-packetbb.c cleanup
     
-    Dissectors should pass data directly to their subdissectors through the data parameter (of new-style dissectors). This avoids unintentional "trampling" from other dissectors trying to "share" private_data member.
-    
-    Change-Id: I2efef5c8dfeef64588ba3ac6e695b469238c6468
-    Reviewed-on: https://code.wireshark.org/review/5487
+    Change-Id: I2f6ab0bffca5aa4b021b46b930b55455e76b8a9f
+    Reviewed-on: https://code.wireshark.org/review/16284
     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 e77507b
+commit de90565
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Dec 1 00:18:41 2014 -0500
+Date:   Sat Jul 2 21:21:54 2016 -0400
 
-    Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.
+    packet-tcap.c: Remove MEM_TCAPSRT
     
-    Part 3 of many, but this concludes the strict conversion to proto_tree_add_bitmask.  Patches to follow with use proto_tree_add_bitmask_xxx (some functions still need to be written)
+    No need to duplicate memory allocation of hash tables to have a "debug copy".
+    Maybe a separate wmem allocator can be used within the dissector, but that
+    type of debugging shouldn't be in trunk source. Keep it on private branch
+    until it's working.
     
-    Change-Id: Ic2435667c6a7f1d40602124e5044954d2a296180
-    Reviewed-on: https://code.wireshark.org/review/5553
+    Change-Id: I4bdd0f3d1b613f7ae79aa57ebb8e5c3293023253
+    Reviewed-on: https://code.wireshark.org/review/16282
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 542439e
+commit 276db50
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jul 4 13:40:07 2016 -0700
+
+    Add length checks.
+    
+    While scanning through the Prefix64 option, check to make sure we
+    haven't run past the end of the option.
+    
+    The Prefix64 option requires that the prefix length be <= 12, and, if
+    it's not, we end up with part of the prefix having a negative length.
+    Check to make sure that it is <= 12.
+    
+    While we're at it, use proto_tree_add_item_ret_uint(), update IETF
+    document references to use RFCs rather tha earlier I-Ds, and add
+    references for RFC 7220 and RFC 7225.
+    
+    Hopefully this fixes the *real* problem that CID 1363032 was complaining
+    about.
+    
+    Change-Id: I1592de31f1d4f4ed6e6cdc141516fb764f21d2fb
+    Reviewed-on: https://code.wireshark.org/review/16287
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit af35e89
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 1 10:29:29 2014 +0100
+Date:   Sun Jul 3 22:01:23 2016 +0200
 
-    SNA: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    .mailmap: Update some name...
     
-    Change-Id: I7a491488e67890c6cde98beec6a4935b10505afb
-    Reviewed-on: https://code.wireshark.org/review/5555
-    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>
+    Change-Id: I755010e59d33bc771a3be06bd1f6da1bcd81d836
+    Reviewed-on: https://code.wireshark.org/review/16267
+    Reviewed-by: Eugene Exarevsky <eugene.exarevsky@dsr-company.com>
+    Reviewed-by: Anil Kumar K K <anilkumar911@gmail.com>
+    Reviewed-by: Jose Rubio <joserubiovidales@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 0415df8
-Author: Marko Hrastovec <marko.hrastovec@gmail.com>
-Date:   Mon Dec 1 09:43:26 2014 +0100
+commit 2fbf611
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jul 3 11:16:45 2016 -0400
 
-    Asterix: fix Coverity scan (1025624 & 1025625: Missing break in switch)
+    LTE PDCP: Replace a few g_malloc0 calls with wmem
     
+    Change-Id: I8bce527fcd2cf9feb77326a5e9fa6857218dda19
+    Reviewed-on: https://code.wireshark.org/review/16283
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit c0949bf
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jul 4 12:42:11 2016 -0700
+
+    Fix typo.
     
-    Two comments are added to the code to notify Coverity scan that breaks are not put in switch statement intentionally.
+    Addresses CID 1363024.
     
-    Change-Id: Ie391790ee7365da56ddf0bf7b19042c9a11efddd
-    Reviewed-on: https://code.wireshark.org/review/5554
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ie365f77ca215293aa880a9063521d2c2d7de73c8
+    Reviewed-on: https://code.wireshark.org/review/16286
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 4f9af86
+commit 52559e9
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 30 12:51:30 2014 -0500
+Date:   Sat Jul 2 17:40:17 2016 -0400
 
-    Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.
+    General cleanup of packet-ipsec.c
     
-    Part 2 of many
+    Noticed some things working on bug 12567 that weren't related to bug.
     
-    Change-Id: I50815e7738b011382392f3078a7107d3d9eec4ec
-    Reviewed-on: https://code.wireshark.org/review/5542
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ie9acbf85cad0899af18202415a40f392a3088ffa
+    Reviewed-on: https://code.wireshark.org/review/16249
     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 86c659c
+commit 1e8ed70
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 30 15:53:45 2014 -0500
+Date:   Sat Jul 2 16:08:58 2016 -0400
 
-    Improve checkfiltername.pl for pre-commit script.
+    Treat SPI field in ESP/SA configuration as string only if wildcards are used.
     
-    1. Bugfix grep statement checking if file is "autogenerated"
-    2. Add to the list of "whitelist" duplicates.  Many more were found after #1 was changed.
+    Otherwise convert the SPI field to a number, which allows more user
+    flexibility in SPI format.
     
-    Change-Id: Idea764c0c8b5fa4f30c9acaab9ba10340834d4f5
-    Reviewed-on: https://code.wireshark.org/review/5547
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Bug: 12567
+    Change-Id: I646f0aeeeec4ca4302eb7d5172af9218e88b289f
+    Reviewed-on: https://code.wireshark.org/review/16248
+    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>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 90977c7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 30 16:17:26 2014 -0500
+commit 3f80490
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Jun 30 23:32:27 2016 +0200
 
-    Update display filter names per checkfiltername.pl
+    NHRP: Add option for source address in authentication extension.
     
-    Change-Id: I7694a6f8d8ccec3109fb86ccefee5798de57757d
-    Reviewed-on: https://code.wireshark.org/review/5548
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    It seems that not all Cisco IOS implementations adhere to RFC2332
+    with respect to having the source address after the SPI in the
+    authentication extension. This change adds a preference to suppress
+    the interpretation of the bytes following the SPI as the source
+    address. The default is to adhere to the RFC.
+    
+    Bug: 12569
+    Change-Id: I00d3c1b90ace54f16f0fe4704e6127a5c4881c82
+    Reviewed-on: https://code.wireshark.org/review/16231
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit cd14ff3
+commit 764b147
 Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Nov 29 19:32:30 2014 +0100
+Date:   Tue Jun 28 00:15:33 2016 +0200
 
-    qt: use qstring_strdup
+    wslua: fail on tree:add(nil)
     
-    Replaces the more verbose `g_strdup(foo.toUtf8().constData())` by
-    `qstring_strdup(foo)`. While at it, plug a minor memleak in
-    MainWindow dialogs.
+    It is unlikely that tree:add(nil) or tree:add(nil, tvb) represents a
+    valid invocation. Most likely the developer made a mistake and tried
+    something like:
     
-    Change-Id: I32b53f972b4e3998ac9beabd98647a381b7b42e3
-    Reviewed-on: https://code.wireshark.org/review/5531
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+        local pf_thing = ProtoField.string("some.thing", "Description")
+        some_proto.fields = { pf_thing }
+        ...
+            tree:add(some_proto.fields.thing, tvb())
+    
+    which should have been:
+    
+        some_proto.fields = { thing = pf_thing }
+    
+    or:
+    
+            tree:add(pf_thing, tvb())
+    
+    Save the developer some pain and bail out early.
+    
+    Change-Id: I59fc04153f02bb186b47b763676a68bb0271df76
+    Reviewed-on: https://code.wireshark.org/review/16177
+    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: Stig Bjørlykke <stig@bjorlykke.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0cf2f74
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 17:03:20 2014 -0800
+commit cf508f8
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:04:38 2016 +0200
 
-    Squelch another compiler warning.
+    androiddump: fix leak (CID 1293387).
     
-    Change-Id: Ib79bb30e67dacdda2e87f39438c4a836632d55bd
-    Reviewed-on: https://code.wireshark.org/review/5552
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I27e167368575dfddf78c237723d20c8b790e5f15
+    Reviewed-on: https://code.wireshark.org/review/16268
+    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 cc0b083
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 17:00:04 2014 -0800
+commit 81a81fb
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:56:28 2016 +0200
 
-    Squelch a compiler warning.
+    Qt: add initializers (CID 1159363).
     
-    Change-Id: Ic904f9b8551353192e872cb896f198572da83e27
-    Reviewed-on: https://code.wireshark.org/review/5551
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I5d8c2c847c842ddc172d26a3c8aee5d877201a4d
+    Reviewed-on: https://code.wireshark.org/review/16276
+    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 ff18b35
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 16:57:09 2014 -0800
+commit 85ed737
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:50:47 2016 +0200
 
-    Fix compile error.
+    Qt: add initializer (CID 1159361).
     
-    Change-Id: I858248e252a09f4348e7ab88bef81c8452f39051
-    Reviewed-on: https://code.wireshark.org/review/5550
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib7b66b4e1d600048b8a66b47d035c27ef126da29
+    Reviewed-on: https://code.wireshark.org/review/16275
+    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 18f0109
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Nov 29 19:29:26 2014 +0100
+commit 5f69a2f
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:46:33 2016 +0200
 
-    qt: fix use-after-free pattern
-    
-    qstring.toUtf8() returns a QByteArray object and .constData() returns
-    a pointer inside that object. It is not safe to store this pointer as
-    it will become invalid after the statement. Store a const reference
-    instead. (Due to scoping differences, some are copy-assigned though.)
-    
-    In the UAT dialog, strlen(bytes.constData()) has also been replaced by
-    bytes.size() as an optimization.
-    
-    Caught by ASAN.
+    Qt: add initializer (CID 1159360).
     
-    Change-Id: Ie09f999a32d0ef1abaa1e658b9403b74bedffc37
-    Reviewed-on: https://code.wireshark.org/review/5528
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I0ade3925497022d5ac16e66c02727be7fd9f4aa5
+    Reviewed-on: https://code.wireshark.org/review/16274
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 846bb53
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 16:30:19 2014 -0800
+commit 21a0fdc
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:43:05 2016 +0200
 
-    Add a Buffer to wtap_pkthdr to hold file-type-specific packet metadata.
-    
-    For example, this can be used for pcap-ng options not mapped to
-    file-type-independent metadata values.
+    Qt: add initializers (CID 1159359).
     
-    Change-Id: I398b324c62c1cc1cc61eb5e9631de00481b4aadc
-    Reviewed-on: https://code.wireshark.org/review/5549
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I21de7d1b5f69bdcfa91da560abc262906d412777
+    Reviewed-on: https://code.wireshark.org/review/16273
+    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 35b1bc5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 30 20:29:34 2014 +0100
+commit 8aa2e87
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:40:11 2016 +0200
 
-    win32: use target file format when checking if it supports comments
+    Qt: add initializer (CID 1159358).
     
-    Bug: 10656
-    Change-Id: Ib74f213630d6d382118c09b3cbf998b28cbc045e
-    Reviewed-on: https://code.wireshark.org/review/5544
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I3002015d793e48c87017571f8997dd5a78438f75
+    Reviewed-on: https://code.wireshark.org/review/16272
+    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 6c7af1d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 11:27:18 2014 -0800
+commit 585cff2
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:37:42 2016 +0200
 
-    Change some names to make them the same in multiple lists.
+    Qt: add initializers (CID 1159357).
     
-    Change-Id: I20ca39f69052b4134147577ae5be74c05b4d5e48
-    Reviewed-on: https://code.wireshark.org/review/5543
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I27d561d8d63e0d15f7811dd7a033c38df17dfb36
+    Reviewed-on: https://code.wireshark.org/review/16271
+    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 10046cc
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 30 08:05:01 2014 -0800
+commit 9579d17
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:34:50 2016 +0200
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-11-30]
+    Qt: add initializer (CID 1159355).
     
-    Change-Id: I582091ce31fdd9e961b1000c2b58ef6cb2adca0d
-    Reviewed-on: https://code.wireshark.org/review/5539
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: If2504ea4a9d806005a6d7631ec4645df1af0206a
+    Reviewed-on: https://code.wireshark.org/review/16270
+    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 090a046
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 29 16:57:20 2014 -0800
+commit e865db4
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sun Jul 3 22:31:32 2016 +0200
 
-    Update to reflect current reality.
+    Qt: add initializer (CID 1159354).
     
-    Change-Id: I6defd7ffe92e9e07f4ff41166449d5a086800846
-    Reviewed-on: https://code.wireshark.org/review/5538
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I0aa4b9db902d084fe33eff5b69ac5cdc85c3fec8
+    Reviewed-on: https://code.wireshark.org/review/16269
+    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 e28a847
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 29 15:01:34 2014 -0800
+commit d439525
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 3 16:04:19 2016 +0200
 
-    Fix tfshark.c to match changes to epan/print.[ch].
+    ssh: wmem_strdup() never returns NULL
     
-    Change-Id: I765cd0dbb5451b578ccabd221afc477a6559e60c
-    Reviewed-on: https://code.wireshark.org/review/5537
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I2f7b01e5a71f043e49305d0e2a3e78eaa5eae0a8
+    Reviewed-on: https://code.wireshark.org/review/16262
+    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 81ab601
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 29 14:43:22 2014 -0800
+commit 79fb9fd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jul 3 08:07:30 2016 -0700
 
-    Clean up routine names, don't pass capture_file into libwireshark.
+    [Automatic update for 2016-07-03]
     
-    Give all routines in epan/print.c that write a particular format a name
-    beginning with write_{formatname}.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    If routines write columns, rather than the raw protocol tree, don't give
-    it a name containing proto_tree.
+    Change-Id: Ie8e9bf51a9c25c6693597ba1109c221a111e3b58
+    Reviewed-on: https://code.wireshark.org/review/16264
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit ce52309
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 3 16:39:20 2016 +0200
+
+    iso14443: expert info if the crc is wrong
     
-    Get rid of empty preamble/finale routines.
+    Change-Id: I1b59a7d7bf0f9f304f816558f38ce5d52deb504e
+    Reviewed-on: https://code.wireshark.org/review/16263
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit 2da35bc
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 3 13:37:51 2016 +0200
+
+    profinet, CID 1362120: check the return value of ftell()
     
-    For CSV, the preamble routine writes out column titles, so call it
-    write_csv_column_titles().
+    change filePosRecord's data type to long, this is what ftell() and
+    fseek() expect
     
-    For C arrays, the body routine writes out raw hex data, so call it
-    write_carrays_hex_data().
+    limit filePosRecord's scope to the block where it's actually used
     
-    capture_file isn't a structure defined by libwireshark, so don't make it
-    an argument passed into libwireshark.
+    if ftell() returns < 0, don't move the file pointer and don't call
+    fseek() with the negative offset
     
-    Change-Id: I5a7e04de9382cf51a59d9d9802f815b8b3558332
-    Reviewed-on: https://code.wireshark.org/review/5536
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: If5a43099c32e476a691f4d6cd26ed7fb73490fcf
+    Reviewed-on: https://code.wireshark.org/review/16258
+    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 05516b0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 29 15:41:12 2014 -0500
+commit 50614a9
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 13:17:41 2016 +0100
 
-    Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.
+    checkhf: Use colon as field separator for better readability
     
-    Part 1 of many
+    Comma looks like a list when skimming quickly.
     
-    Change-Id: I77a5789ac23388e6a5f8098dc398592f39638124
-    Reviewed-on: https://code.wireshark.org/review/5532
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: Ic0ac1bc8746c70724d2279e3d725c5c9449b79d8
+    Reviewed-on: https://code.wireshark.org/review/16260
+    Reviewed-by: João Valverde <j@v6e.pt>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e399382
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Nov 29 17:01:30 2014 -0500
+commit ff7d0b3
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 12:58:24 2016 +0100
 
-    Rename some hf[] display filter names to fix dups.
+    ICMPv6-RPL: Fix DRO-ACK reserved field.
     
-    Change-Id: Ibe932bc37e03194f1801ec4eed4da1ff31370de3
-    Reviewed-on: https://code.wireshark.org/review/5535
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Unused href entry: epan/dissectors/packet-icmpv6.c, hf_icmpv6_rpl_p2p_droack_flag_reserved
+    
+    Change-Id: I2fb74946aeb7cf1df708449c185126ee7b6b0253
+    Reviewed-on: https://code.wireshark.org/review/16259
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 1aeab74
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Nov 29 17:00:07 2014 -0500
+commit 6d4c976
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jul 3 13:42:40 2016 +0200
 
-    ieee80211; Rename some hf[] display filter names to fix dups and for clarity.
+    profinet: add a space to make checkhf happy
+    
+    without the space, checkhf complains about an ei entry
+    
+    martin@reykholt:~/src/wireshark.git$ ./tools/checkhf.pl plugins/profinet/packet-dcerpc-pn-io.c
+    ERROR: NO ARRAY: plugins/profinet/packet-dcerpc-pn-io.c, ei_pn_io_unsupported
     
-    Change-Id: Ibcca2d7f85130b4a5a74808d88735513cfc0b580
-    Reviewed-on: https://code.wireshark.org/review/5534
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ie72efcec644225bc4f554117ae10672694823cad
+    Reviewed-on: https://code.wireshark.org/review/16257
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 785ef83
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 29 07:26:42 2014 +0000
+commit 4562a70
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sat Jun 18 16:35:26 2016 -0700
 
-    Revert "Add QNX' QNET protocol"
+    dns: remove a bunch of unnecessary NULL checks
     
-    This reverts commit 72b91a56f86e3bbab700900366f81dc8c353b91d.
+    Change-Id: Ia4066ae3fc31fb43d4cc63cfb739f22738581831
+    Reviewed-on: https://code.wireshark.org/review/16256
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit 0bc3d75
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jul 3 09:47:22 2016 +0000
+
+    Revert "Support for NSH with VXLAN-GPE encapsulation"
     
-    value_string_ext tables ***MUST*** be sorted numerically, otherwise the code prints warnings such as the ones in
+    This reverts commit 76a8bca9bc87823e9182fa6ebb35f0b93bcc451b.
     
-        http://buildbot.wireshark.org/trunk/builders/Ubuntu%2014.04%20x64/builds/1419/steps/test.sh/logs/stdio
+    Change-Id: I85b9778329373872e4f9fd1b90280dfef5e33a06
+    Reviewed-on: https://code.wireshark.org/review/16255
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 783bb5b
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 01:29:04 2016 +0100
+
+    Fix indentation
     
-    Fix this and resubmit.
+    Change-Id: I41b9cf4b7e3efbee48174fe0151ca94cb0bbc425
+    Reviewed-on: https://code.wireshark.org/review/16254
+    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 1464261
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 01:26:32 2016 +0100
+
+    ICMPv6: Avoid "no response found" for multicast ping
     
-    Change-Id: I448025bb7b19a607e992831202ed31d243ce70d8
-    Reviewed-on: https://code.wireshark.org/review/5530
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ia6bfdd28fc6d85b3899d542db5aa4ed54be054ea
+    Reviewed-on: https://code.wireshark.org/review/16253
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 1429986
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 28 23:10:44 2014 -0800
+commit 32e8f07
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Jul 3 00:31:38 2016 +0100
 
-    Sadly, index() was the name of a routine in V7, so....
+    ICMP: Avoid "no response found" for multicast ping
     
-    Change-Id: Id83899de08e0ad8e5664dddfb6ca268e7d0bd54d
-    Reviewed-on: https://code.wireshark.org/review/5529
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Ping-Bug: 12581
+    Change-Id: I6943d275de988e9de66bc01e2b421901947a5b95
+    Reviewed-on: https://code.wireshark.org/review/16252
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 72b91a5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 17 17:03:11 2014 +0200
+commit 791c93f
+Author: Adrian Simionov <daniel.simionov@gmail.com>
+Date:   Sat Jul 2 22:49:44 2016 +1000
 
-    Add QNX' QNET protocol
+    DOCSIS: Update to Type 35 UCD
     
-    no ethertype 0x8203-0x8205 support in trunk.
-    0x8204 is QNX OS VER 6's qnet ethernet protocol number.
+    Change-Id: Ie0dda94894cfaec9bccbd69d52367034e1c629da
+    Reviewed-on: https://code.wireshark.org/review/16242
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 76a8bca
+Author: sjha3 <sjha3@ncsu.edu>
+Date:   Sat Jul 2 19:09:50 2016 -0400
+
+    Support for NSH with VXLAN-GPE encapsulation
     
-    Bug:3934
-    Change-Id: I5f3e910876bb7fb86de2111f856d026fdf220917
-    Reviewed-on: https://code.wireshark.org/review/2954
+    Bug: 12271
+    Change-Id: I8481c4ab69c4432985acc79bff7818e6857fa1cb
+    Reviewed-on: https://code.wireshark.org/review/16251
     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 8e17fd6
-Author: cbontje <cbontje@gmail.com>
-Date:   Thu Nov 20 15:13:37 2014 -0700
+commit 3d7b817
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sat Jul 2 23:16:11 2016 +0200
 
-    Add optional user Fast SER preference for SEL Fast Message Protocol
+    Qt: add initializer (CID 1159352).
     
-    * Also cleanup description of remaining preferences
+    Change-Id: Ie355a31284685ca0c160a46a4daa6c28b39e3093
+    Reviewed-on: https://code.wireshark.org/review/16247
+    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 794da62
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Sat Jul 2 23:05:24 2016 +0200
+
+    Qt: remove unneeded check (CID 1159309).
     
-    See Bug 10719
+    fi has already been checked in line 51.
     
-    Change-Id: I81faba77d8b88b24c65156f5139067233869154b
-    Reviewed-on: https://code.wireshark.org/review/5416
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Idd4d09a35ef1d4897479538979debd708e2cfe5b
+    Reviewed-on: https://code.wireshark.org/review/16246
+    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 ca95800
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 27 16:23:58 2014 +0100
+commit 3bb019f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 1 10:35:22 2016 -0700
 
-    Endpoint: wrong filter when select a TCP endpoint (INVALID == a.x.y.z ...)
+    Qt: Fixup byte view context menus
+    
+    Shorten text similar to other context menus.
     
-    Change-Id: If56209f1274245f54100d0acfaf14098c8df4582
-    Reviewed-on: https://code.wireshark.org/review/5520
+    Change-Id: I8806ed4dddb6fc3c51ddbd4150d9090f5b2ca787
+    Reviewed-on: https://code.wireshark.org/review/16238
+    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 f1b37bc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 27 12:29:13 2014 +0100
+commit 1f28e68
+Author: Matt Texier <matthieu@texier.tv>
+Date:   Wed Jun 29 17:33:21 2016 +0200
 
-    Endpoint: wrong filter when select a UDP endpoint (INVALID == a.x.y.z ...)
+    BGP: Fixed an side effect of length coding on offset
     
-    Change-Id: Ie46d6c201df0b0164a8bf96c02d6430734fd2948
-    Reviewed-on: https://code.wireshark.org/review/5518
+    Bug: 12568
+    Change-Id: Ibf063293041d749664f6e6ecd2455024ea3fd4ed
+    Reviewed-on: https://code.wireshark.org/review/16237
+    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 3355ed6
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 25 19:40:12 2014 +0100
+commit 94e97e4
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jul 2 08:23:34 2016 -0400
 
-    elf: fix FDE Count formatting
-    
-    Displays the FDE Count as a number, not a series of bytes.
+    packetbb: Prevent divide by 0.
     
-    Change-Id: I60dd426cb5305a5001a8200578008b7c4a99c64e
-    Reviewed-on: https://code.wireshark.org/review/5489
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Bug: 12577
+    Change-Id: Ibfa605597b786d8dbf1e256ef2ca6dc691498974
+    Reviewed-on: https://code.wireshark.org/review/16241
+    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>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e8cda3b
+commit b78dd09
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Nov 25 23:14:50 2014 +0100
+Date:   Mon Jun 27 14:45:03 2016 +0200
 
-    TCP: move Windows Scaling and SCPS checks after options decoding
+    proto.c: allow calling get_hfi_length() with a 0 byte tvb and length=-1
     
-    This was changed in g8881f3f in an attempt to avoid throwing an exception when decoding the options field
+    As indicated in the comment, we allow FT_PROTOCOL, FT_NONE, FT_BYTES, FT_STRING
+    and FT_STRINGZPAD to be zero-length.
+    But in that case do not call tvb_ensure_captured_length_remaining() that ensures
+    that at least 1 byte is  present.
     
-    Bug: 10514
-    Change-Id: Ia4b49f484d6255090c5a6e425a9716b48ccc4cb5
-    Reviewed-on: https://code.wireshark.org/review/5495
+    Bug: 12561
+    Change-Id: I881754368c24d334b88f0dda1d59a68e08219227
+    Reviewed-on: https://code.wireshark.org/review/16167
     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 afcdff0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 27 11:11:18 2014 +0100
+commit 7ad9db8
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Fri Jul 1 13:22:09 2016 +0300
 
-    Endpoint dialog (Qt): Add missing text to translate
+    ZigBee Green Power: implement GP Pairing Configuration command dissection.
     
-    Change-Id: I375b348b6d6e35c212f76fc73135990a93560a75
-    Reviewed-on: https://code.wireshark.org/review/5517
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I539e98935699e5be8f91daaebade00f22b500dbc
+    Reviewed-on: https://code.wireshark.org/review/16235
+    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 a67d0d2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 27 22:33:22 2014 -0500
+commit cb987e8
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Fri Jul 1 11:27:52 2016 -0400
 
-    Eliminate proto_tree_add_text from packet-sna.c.
+    Don't leak a file descriptor when changing the SSL debug file name.
     
-    Also convert many of the proto_tree_add_boolean calls into proto_tree_add_bitmask.
+    I guess people don't change the SSL debug file name that often--this bug has
+    been here since 2006...
     
-    Change-Id: I1fb2f943abed28434a2aadc48eb7e9ffb766f463
-    Reviewed-on: https://code.wireshark.org/review/5523
+    Change-Id: I3db053dd7e0cb9a9e4ae49a310e956b3c77c99f6
+    Reviewed-on: https://code.wireshark.org/review/16236
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3f85761
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 26 20:08:07 2014 +0100
+commit f3bd70b
+Author: Hessam Jalali <hessam.jalali@gmail.com>
+Date:   Thu Jun 30 21:41:15 2016 +0430
 
-    RADIUS: Sync with FreeRADIUS Master
+    fix missing fields for json, ek and pdml when used with -e fields
     
-    commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Tue Nov 25 16:45:45 2014 -0500
     
-        as found on the net
+    Description:
     
-    commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427
-    Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
-    Date:   Thu Nov 13 17:39:46 2014 -0500
+    when -T json,ed or pdml used in conjunction with -e fields they would
+    always miss  the last field.
     
-        Add memcached rlm_cache_driver
+    in case of json and ek, if some fields in the middle are empty,
+    the generated json would be invalid.
     
-    commit 6277960bc830891123b00400af56912e51d4d311
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Tue Oct 28 17:01:49 2014 -0400
+    sample for ek:
     
-        Add FreeRADIUS-Response-Delay-USec
+     {  "_index": "packets-2016-06-30",  "_type": "pcap_file",
+     "_score": null,  "_source":
+     {  "layers": {  "e212.mcc": ["255","262"]  "frame.time_epoch":
+     ["1426550400.004751510"],  "e212.mnc": ["1","1"]  }  }  }
     
-    Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f
-    Reviewed-on: https://code.wireshark.org/review/5510
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    command:
+    
+    tshark -T ek -r C:\a.pcap -e e212.mcc -e frame.comment
+    -e frame.time_epoch -e e212.mnc > C:\test.json
+    
+    note:
+    
+    the comma is missing between e212.mcc and frame.time_epoch
+    
+    Change-Id: I2efae0c48036cf6313e2a064453c8dbc49f38b09
+    Reviewed-on: https://code.wireshark.org/review/16226
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Martin Kacer <kacer.martin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 8839d7b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 27 16:07:16 2014 -0800
+commit ad30999
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Wed Jun 29 23:18:57 2016 +0200
 
-    Make the ENTTEC dissector reject packets that don't look like ENTTEC packets.
+    Cleanup LAPD preferences and registration handoff routine
     
-    This should avoid questions like
+    The preferences and the registration handoff routine used to handle
+    preference changes are setup inconsistent and less efficient. This
+    change cleans it up.
     
-       https://ask.wireshark.org/questions/38198/what-is-enttec-in-a-pcap-file
-    
-    It also splits DMX-over-UDP and DMX-over-TCP into separate dissectors,
-    as
-    
-       1) DMX-over-TCP has only config packets, DMX-over-UDP has the
-          others;
+    Change-Id: I9a1d51d8924c30d9e86d8af394ab1f0f31da4d2d
+    Reviewed-on: https://code.wireshark.org/review/16208
+    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 a062c80
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jun 30 20:41:45 2016 -0400
+
+    ASN.1 dissectors - don't try to find yourself.
     
-       2) that would let us do reassembly, if necessary, for
-          DMX-over-TCP.
+    If an ASN.1 dissector is calling register_dissector for itself in its proto_register_xxx
+    function and then calling find_dissector for itself in its proto_reg_handoff_xxx
+    function then just create a static handle for that dissector and use the return
+    value of register_dissector, so the find isn't necessary.
     
-    Change-Id: I2606c814693028c7ba2bbc458e45c853372baaf3
-    Reviewed-on: https://code.wireshark.org/review/5522
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I911bdadc2fb4259601c141b955e741a2369cc447
+    Reviewed-on: https://code.wireshark.org/review/16233
+    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 a30f3d5
+commit d4add25
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 26 16:38:30 2014 +0100
+Date:   Thu Jun 30 22:37:10 2016 +0200
 
-    Qt: Add long option for -R (--read-filter) and -Y (--display-filter)
+    s7comm: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: Id535c04493f6c6df88006d922ee43cff9f4b70a1
-    Reviewed-on: https://code.wireshark.org/review/5507
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I296d11ec43b3817d30920432239632f86b9f773f
+    Reviewed-on: https://code.wireshark.org/review/16227
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Thomas Wiens <th.wiens@gmx.de>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b4b6a5d
-Author: Enrico Jorns <ejo@pengutronix.de>
-Date:   Fri Sep 26 12:07:03 2014 +0200
+commit 250f248
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 30 09:24:57 2016 -0700
 
-    canopen: LSS dissection
+    Qt: Add ASCII+EBCDIC actions to the byte view context menu.
     
-    Dissection of Layer setting services (LSS) sub-protocol
-    according to CiA 305.
+    Add actions to switch between ASCII and EBCDIC, similar to the hex and
+    bits items.
     
-    Change-Id: I24ca1827b25c30a672fb31cad390b3c1486102f4
-    Reviewed-on: https://code.wireshark.org/review/5516
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 5298
+    Change-Id: Ib601ac6e89411e6482f3e4172726e16a08fdbd2b
+    Reviewed-on: https://code.wireshark.org/review/16225
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 608d83c
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Thu Nov 27 11:24:40 2014 +0100
+commit 5cf7fcd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 30 14:55:19 2016 -0700
 
-    LEX and YACC are required
+    Qt+Gtk: Fix the -t command line flag.
     
-    When building both LEX (flex) and YACC (bison or yacc) are required to generate C files from l(ex) and y(acc) files
+    Add the time format to commandline_param_info_t and apply it when we've
+    finished application initialization.
     
-    Change-Id: I8892a05eb437d0bef613b68f681225df2cb2c6b4
-    Reviewed-on: https://code.wireshark.org/review/5515
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Bug: 12489
+    Change-Id: Ice626198a610567e945a8e53c0c1093797e8208e
+    Reviewed-on: https://code.wireshark.org/review/16232
+    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: Graham Bloice <graham.bloice@trihedral.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 121d9ae
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 27 00:15:24 2014 -0800
+commit f860e8d
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jun 30 23:04:37 2016 +0200
 
-    Note that this document is a bit old.
+    exported_pdu(.h): Fix warning: parameter 'tag_type.' not found in the function declaration [-Wdocumentation]
     
-    Change-Id: Ie9a45acf1d3bc116d73b6430b058ffdcabead42b
-    Reviewed-on: https://code.wireshark.org/review/5514
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic93914a7f526b645bc21a5c9c5f2fa0bf988c27e
+    Reviewed-on: https://code.wireshark.org/review/16230
+    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 4469346
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 26 20:41:16 2014 -0500
+commit 52ab7bb
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jun 30 22:42:26 2016 +0200
 
-    Fix a number of dup hf[] filter-names probably mostly resulting from cut/paste errs
+    802.11 radio: fix an out of bounds access
     
-    Change-Id: Id658b9e1803b2f5b92e711a3ce981ff602333d98
-    Reviewed-on: https://code.wireshark.org/review/5513
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug: 12571
+    Change-Id: I4dafdd9bdec5acddf346fd2db6a06d9dfabcbb2e
+    Reviewed-on: https://code.wireshark.org/review/16228
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c28f280
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 26 18:18:57 2014 -0500
+commit cd1ddf6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 29 16:51:37 2016 -0700
 
-    Fix a number of dup hf[] filter-names probably resulting from cut/paste errs.
+    Speed up print_line_text.
     
-    Change-Id: I9242300b2ace3155c1506b584a90f073100a305e
-    Reviewed-on: https://code.wireshark.org/review/5512
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    isatty adds a small delay, at least on OS X. Call it only when we
+    allocate a stream. Do the same for our codeset check.
+    
+    Change-Id: Id3a20059dbc9cf7d5db16d8d238d038b9de0ebf2
+    Reviewed-on: https://code.wireshark.org/review/16222
+    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 cc893ab
+commit 6b15251
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Nov 26 23:01:48 2014 +0100
+Date:   Thu Jun 30 17:40:44 2016 +0200
 
-    XML: pass XML structure to caller through p_(add|get)_proto_data functions
+    NAS EPS: upgrade dissector to v13.6.0
     
-    Since ge3a04bb data parameter is used for the media-type string
-    
-    Bug: 10729
-    Change-Id: I3df640079a8bf57f4bd86a1baa08cbf9a3a7e1b3
-    Reviewed-on: https://code.wireshark.org/review/5511
+    Change-Id: Ie27ce7481b9730ad8da0d465ed1c2bc373d4b602
+    Reviewed-on: https://code.wireshark.org/review/16224
+    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 c2913d2
-Author: Enrico Jorns <ejo@pengutronix.de>
-Date:   Thu Sep 25 12:53:26 2014 +0200
+commit e594603
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jun 30 09:16:58 2016 -0400
 
-    canopen: Enhanced SDO decoding
-    
-    * Move sdo dissection to separate function
-    
-      Added dissect_sdo() function to handle the more complex SDO dissection.
-    
-    * SDO command specifier decoding
+    Reinstate the wmem test-programs target.
     
-      Decoding of both client and server command specifier for SDO transfers
-      according to CiA 301 Chaper 7.2.4.3.
+    It's used when building the test programs (today wmem has only one but it
+    might someday have more).
     
-      Note: Fully decoding block transfer frames is more complex and not supported
-      yet.
-    
-    * basic SDO abort code decoding
+    Change-Id: I627513e1297b8348bf034e852eaf212ddbef96ff
+    Reviewed-on: https://code.wireshark.org/review/16221
+    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>
+
+commit b483f8d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 30 08:25:44 2016 -0700
+
+    Add missing breaks.
     
-      SDO abort codes as specified in CiA 301 Chapter 7.2.4.3.17 (Table 22).
+    Add a couple of missing breaks. Fixes CIDs 1362970 and 1362971.
     
-    * Basic value ranges for object dict index parameter
+    Change-Id: If37bcfed9b48ba30ce8ed85df6e232a6bc5d36f4
+    Reviewed-on: https://code.wireshark.org/review/16223
+    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 9ed7568
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 29 13:28:57 2016 -0700
+
+    Recompress PNGs.
     
-      Object dict ranges as specified in CiA 301 7.4.1 (Table 41)
+    Recompress PNGs using the current versions of various compressors:
     
-    * cs-based multiplexer and data decoding
+      optipng 0.7.6
+      advpng 1.20
+      advdef 1.20
+      pngcrush 1.8.1
     
-      A data width of 4 byte is valid only for expedited transfer and a
-      multiplex value is present only in initialisation messages.
+    Parallelize PNG compression. Note why we're not using a couple of other
+    compression utilities.
     
-      This patch now handles also normal sdo segment data.
+    Change-Id: I52757d0bc2d424013e7f00b693a0f5378427cc31
+    Reviewed-on: https://code.wireshark.org/review/16209
+    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 a16d401
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Jun 21 05:06:23 2016 +0100
+
+    Remove Makefile.common files
     
-      Reference: CiA 301, Chapter 7.2.4.3.3 and 7.2.4.3.6
+    Now that nmake build system has been removed they are not needed anymore.
     
-    Change-Id: I37005894082d62eed1ddd85e09e3676aa3af8222
-    Reviewed-on: https://code.wireshark.org/review/5504
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
+    Reviewed-on: https://code.wireshark.org/review/16050
+    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 d77c5a5
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Wed Nov 26 10:09:03 2014 -0700
+commit f6c5cf9
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 30 00:29:31 2016 +0100
 
-    Update the URL for the CPUID instruction documentation.
+    SDP: Fix warnings [-Wcast-qual]
     
-    Change-Id: I9729b3aa11027783a3557468743e91e180a6de8d
-    Reviewed-on: https://code.wireshark.org/review/5509
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I471c3d060ff69982e94c9046ca121bb0c15f0d74
+    Reviewed-on: https://code.wireshark.org/review/16212
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit a159ced
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 26 15:20:27 2014 +0100
+commit 37c928f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 29 16:12:12 2016 -0700
 
-    WCCP: Remove uneeded check (pinfo & info_tree)
+    Qt: Show the correct data in the packet dialog.
     
-    Remove also some false positive Dereference of null pointer
+    Set our pointers and copy our data *after* we read our packet.
     
-    Change-Id: I09687993531827c6e4f5178f3414ddd9a2702038
-    Reviewed-on: https://code.wireshark.org/review/5506
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Bug: 12556
+    Change-Id: I5b373f94ad5b2fa2e6563142200a80912e717a96
+    Reviewed-on: https://code.wireshark.org/review/16211
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit a2c2f87
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 16:15:17 2014 -0500
+commit e55eaf5
+Author: Matt Texier <matthieu@texier.tv>
+Date:   Wed Jun 29 17:33:21 2016 +0200
 
-    Remove the use of pinfo->private_data from dissectors that just save it to restore it.
+    BGP dissector: Fixing NLRI length for flow spec NLRI
     
-    Change-Id: I13197cc48068bb35ee12a7023cfe5f76bbc4e264
-    Reviewed-on: https://code.wireshark.org/review/5486
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Bug: 12568
+    Change-Id: Id2b89c2d133865771e21acf3ee224f57ac9d262b
+    Reviewed-on: https://code.wireshark.org/review/16203
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 449bc19
+commit e4c86ac
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 22 12:58:43 2014 +0100
+Date:   Sun Jun 26 20:13:30 2016 +0200
 
-    Qt: support the -R option to set a read filter on the command line
+    remove Wireshark.pro, modify update-tx accordingly
     
-    rename display_filter to read_filter in some places to make it clear
-    what it's used for
+    Wireshark.pro is the qt project file used by qmake
+    which in turn was used by nmake
     
-    modify MainWindow::openCaptureFile() so that a read filter can be set
-    when the file name is passed in cf_path, not only when it's chosen from
-    a file selection dialogue
+    now that nmake is gone, the only reason to keep Wireshark.pro
+    was the update-tx script that syncs our translation files with Transifex
     
-    don't display the read filter string in the filter toolbar
+    update-tx calls lupdate to create a list of texts to translate and
+    lrelease to convert such a list into a binary file
+    lupdate and lrelase can read file names from a project file or
+    get them on the command line
     
-    Change-Id: Ie8dc94cbd1ff7e61ce1e2a55518a28297daa5d51
-    Reviewed-on: https://code.wireshark.org/review/5446
+    modify update-tx to pass the required file names on the command line
+    we can use wildcards so there's no need to change update-tx when a new
+    source file is added
+    
+    remove Wireshark.pro from the release tarball as well
+    
+    Change-Id: I7ff4ebc96f13b4ffc6fb1b2f4e045999fbfbed5e
+    Reviewed-on: https://code.wireshark.org/review/16151
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    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 691f647
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Nov 26 13:36:03 2014 +0100
+commit 641904b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 29 18:45:41 2016 -0700
 
-    [MGCP] When changing tvb_length(tvb) -> tvb_reported_length(tvb) it turns
-    out that tvb_new_subset(tvb, tvb_sectionbegin, sectionlen, -1) causes a
-    problem as reported_length is set to -1, set it to sectionlen.
+    Pass the format as an argument to write_specified_fields().
     
-    Change-Id: I650d3fa1390be5add66ed44d0f70929b9eb0aad6
-    Reviewed-on: https://code.wireshark.org/review/5505
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    That makes failing to specify a format a compile-time error.
+    
+    Change-Id: Iff0bda8be35b1e3acc97e4314657ceaff2b3d0be
+    Reviewed-on: https://code.wireshark.org/review/16218
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ab8cad28
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 11:54:54 2014 -0500
+commit b4e8479
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 29 18:39:45 2016 -0700
 
-    Remove sccp_info member from packet_info structure.
+    Mention autotools, give some information for other UN*Xes.
     
-    sccp_msg_info_t* is now passed from SCCP dissector to its subdissectors through dissector data parameter.
+    For OS X, mention the use of CMake or autotools for building.
     
-    Change-Id: Iab4aae58f8995e844f72e02e9f2de36e83589fc0
-    Reviewed-on: https://code.wireshark.org/review/5442
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    For Linux, mention autotools as well as CMake, and speak of Debian
+    derivatives other than Ubuntu.
+    
+    Add a section for UN*Xes other than OS X and Linux.
+    
+    Change-Id: I73bb7afe2d427333b10016aeb497ab32eee16d43
+    Reviewed-on: https://code.wireshark.org/review/16217
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7c47503
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 25 13:49:12 2014 -0500
+commit 73e414d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 29 17:21:53 2016 -0700
 
-    openflow: Use (what appear to be the) correct filter names for a few fields.
+    ui/qt/i18n.qrc is a generated file; ignore it.
     
-    Change-Id: I2acd93d99942601b34c85177d21bbc2c4a4e2633
-    Reviewed-on: https://code.wireshark.org/review/5492
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ifc8b45d42d9dbf9560ec825e3ce1784534df7b3b
+    Reviewed-on: https://code.wireshark.org/review/16216
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5464bc6
-Author: Enrico Jorns <ejo@pengutronix.de>
-Date:   Thu Oct 2 16:09:38 2014 +0200
+commit bef07e7
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 29 17:07:44 2016 -0700
 
-    canopen: Improve NMT error control and SYNC message dissection
-    
-    1.  Also show Reserved/Toggle bit of NMT error control
-    
-      In case of the node guarding protocol this bit is used as a toggle bit.
-      In case of the hearbeat protocol this bit is reserved.
-    
-      Reference: CiA 301 (rev 4.2.0), Chap. 7.2.8.3.2
+    Remove unused edt field from print_data structure.
     
-    2. Show optional 'counter' parameter of SYNC messages if available
-    
-      Reference: CiA 301 (rev 4.2.0), Chap. 7.2.5.3.1
-    
-    Change-Id: I5dc0ab65e95fec4846a9c8bd8972ef2eba664ee2
-    Reviewed-on: https://code.wireshark.org/review/5484
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    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>
+    Change-Id: I5778b08c52119b5be1ec482be9417b3c4ba8ed62
+    Reviewed-on: https://code.wireshark.org/review/16215
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a559f2a
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Nov 25 20:27:07 2014 -0500
+commit 6190f49
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 29 16:53:06 2016 -0700
 
-    dec-dnart: use pinfo-scoped memory for addresses
+    Get rid of unused edt member in write_pdml_data structure.
     
-    They may be accessed during the print phase, at which point packet-scope memory
-    has already been freed.
-    
-    Bug: 10724
-    Change-Id: Ifcf5fc0c0857614edf85349b12dfe605abf6fef7
-    Reviewed-on: https://code.wireshark.org/review/5497
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I2a41d378187c1685afb701372cf3a8ec9c0aeb70
+    Reviewed-on: https://code.wireshark.org/review/16214
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e843c67
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Nov 25 20:16:05 2014 -0500
+commit 6d06e69
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 29 16:49:04 2016 -0700
 
-    wccp: use pinfo-scope memory for addresses
+    Remove unused edt member from write_json_data structure.
     
-    They may be accessed during the print phase, at which point packet-scope memory
-    has already been freed.
-    
-    Bug: 10720
-    Change-Id: Ia2b160fd9de4ccaa3a4b8d9cb70fb9b32d4e08a0
-    Reviewed-on: https://code.wireshark.org/review/5496
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Id8b45715c753dc6006f7833e5f49bd8aabc15271
+    Reviewed-on: https://code.wireshark.org/review/16213
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 85ca1cf
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 25 12:39:53 2014 +0100
+commit 2257478
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 29 16:13:38 2016 -0700
 
-    conversation_table: fix indent (use 4spaces) and add modelines info
+    Fix -T fields, broken by ceae9e4d1fff4500b285dba021c3f239ff87779e.
     
-    Change-Id: I76784f0252dcd095a3016ed014632e2a5c09265b
-    Reviewed-on: https://code.wireshark.org/review/5483
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Rename write_fields_proto_tree() to write_specified_fields(), and make
+    it static.  Make write_fields_proto_tree() a wrapper around
+    write_specified_fields() that sets the format to FORMAT_CSV.  Have
+    write_specified_fields() fail with an assertion if fields->format isn't
+    one of the known formats, to catch problems such as this in the future.
+    
+    Don't fill in the "data" structure if we're not going to use it.
+    
+    Change-Id: I11dbf448d72ca389f0e5fb8558a41b7eecf7c9a4
+    Reviewed-on: https://code.wireshark.org/review/16210
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit f449be8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 25 12:37:59 2014 +0100
+commit af52c85
+Author: Benjamin Coddington <bcodding@redhat.com>
+Date:   Fri Jun 24 09:24:20 2016 -0400
 
-    conversation_table: fix warning when generate documentation (doxygen)
+    packet-nfs: fixup whitespace in pNFS SCSI work
     
-    epan/conversation_table.h:335: warning: The following parameters of add_hostlist_table_data(conv_hash_t *ch, const address *addr, guint32 port, gboolean sender, int num_frames, int num_bytes, hostlist_dissector_info_t *host_info, port_type port_type_val) are not documented:
-      parameter 'host_info'
-      parameter 'port_type_val'
+    A recent patch introduced whitespace errors.. clean them out.
     
-    Change-Id: I6c3b29750c856eb2665981553fcb8eecd8fe34ee
-    Reviewed-on: https://code.wireshark.org/review/5482
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Id67bed40646d60dc6775e1e1f958a5a07a5f5f6d
+    Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16205
+    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 2ebaa59
+commit bca1f8c
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Nov 24 14:51:13 2014 -0600
+Date:   Wed Jun 29 13:14:23 2016 -0700
 
-    Consolidate sequence analysis code.
+    Remove an unused image.
     
-    Move scattered code for seq_analysis_info_t creation and destruction to
-    tap-sequence-analysis.[ch].
+    Remove ui/qt/progress_overlay.png.
     
-    Change-Id: I87c14b1c83105a48d0ab149a3abba71e2a2fe21f
-    Reviewed-on: https://code.wireshark.org/review/5479
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I2016c6aa5f77314add9870ba95d1c297d72a05c3
+    Reviewed-on: https://code.wireshark.org/review/16207
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 5b360a9
-Author: Yaniv Kaul <mykaul@gmail.com>
-Date:   Tue Nov 25 21:24:23 2014 +0100
+commit e1b1304
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Jun 29 20:05:27 2016 +0100
 
-    SCSI: type and scope fields are ignored in some SCSI persistent reserve service actions
+    Update README.qt
     
-    Bug: 10727
-    Change-Id: Id34f57b2a0b89867eec1b0a13db2eba037835804
-    Reviewed-on: https://code.wireshark.org/review/5493
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Icf7774098986da29efdf76af1dcf217bced428e4
+    Reviewed-on: https://code.wireshark.org/review/16206
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit e2ef6c4
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Tue Nov 25 14:44:03 2014 -0700
+commit 272ec20
+Author: clairvoyant <joserubiovidales@gmail.com>
+Date:   Thu Jun 23 16:33:50 2016 +0200
 
-    Add on to the dummy.cpp hack that forces wireshark to be linked with a
-    c++ compiler to automatically create a dummy.cpp file and remove it when
-    make clean is issued.  This allows make tags to work again since the
-    file isn't missing.
+    LAPD. SCTP can carry LAPD information.
     
-    Change-Id: I17191ad2acc281734fa12da4d347fd3116018f67
-    Reviewed-on: https://code.wireshark.org/review/5494
-    Petri-Dish: Stephen Fisher <sfisher@sdf.org>
+         * LAPD can be configured in "Decode As" using port and protocol identifier.
+         * Add default sctp ppi (the number is not assigned by IANA).
+    
+    Change-Id: Iaa4797e844f6480881605ad4e6b408d7d5f60cad
+    Reviewed-on: https://code.wireshark.org/review/16107
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit e2132f9
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 25 00:43:06 2014 -0500
+commit be12a25
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jun 23 23:10:08 2016 -0400
 
-    openflow: Minor changes
+    Provide new interface for Export PDU.
     
-    - Remove unneeded/undefined forward declarations;
-    - Create/use some extended value-strings;
-    - Do some whitespace changes.
+    Rather than have a bitmask for each desired field, have a dissector
+    provide a list of structures that represent data that goes into
+    the PDU.
     
-    Change-Id: I7961864f0e404e141d2887584751116011f8d941
-    Reviewed-on: https://code.wireshark.org/review/5490
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I125190cbaee489ebffb7d9f5d8bc6f3be2d06353
+    Reviewed-on: https://code.wireshark.org/review/16122
+    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 2015398
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 25 12:53:43 2014 -0500
+commit 4656191
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jun 28 10:35:27 2016 -0700
 
-    proto.c: proto_registrar_dump_values(): don't skip "same name" fields.
+    CMake: Update the macOS wrapper script behavior.
     
-    It appears that Wireshark allows (and currently has) fields with the
-    same name with differing "strings" content.
+    CMake on macOS creates a convenience wrapper (run/wireshark) that runs
+    run/Wireshark.app/Contents/MacOS/Wireshark. Have it run the executable
+    using "exec" instead of opening the bundle using "open" so that
+    Wireshark runs in the foreground.
     
-    Change-Id: Iddac5a2c9f456a97ea676f2007f43d786482eebd
-    Reviewed-on: https://code.wireshark.org/review/5491
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I295ce0681da75678e5e01781e9c8fb58e2236fc9
+    Reviewed-on: https://code.wireshark.org/review/16196
+    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 152b0c9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 19:24:06 2014 -0500
+commit ceae9e4
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Tue Jun 28 13:01:25 2016 +0200
 
-    Remove support for pinfo->private_data in "data-text-lines", "data-l1-events" and "urlencoded-form" dissectors.  Data must be passed from parent through dissectors data parameter.
+    tshark fields filter added for other outputs
     
-    Change-Id: I24ab56ce7d99f8ed670f4a50453223d4e6a46983
-    Reviewed-on: https://code.wireshark.org/review/5463
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e3a04bb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 20:47:59 2014 -0500
-
-    Ensure dissector data parameter is used instead of pinfo->private_data when passing data between dissectors using the "media_type" subdissector.
+    -e fields filter addded to ek|json|pdml output.
     
-    Change-Id: I82cbfed770b41404bc42cb6a4413db07d04dffdc
-    Reviewed-on: https://code.wireshark.org/review/5462
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Bug: 12529
+    Change-Id: I1f0f8772eefceb5b71927925ce0c34af483571b9
+    Reviewed-on: https://code.wireshark.org/review/16193
+    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>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7f22ce7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 19:50:11 2014 +0100
+commit 348e364
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Jun 28 19:31:32 2016 -0700
 
-    pre-commit tools: Add arg option to specify the commit id to be checked
-    
-    If no commit id specify, it is HEAD
+    Distribute i18n.qrc.in in the release tarball.
     
-    Thanks to Michal for the help :-)
-    
-    Change-Id: Ibf579aed47c7574f9a01d868ae0d55bbe789a8a2
-    Reviewed-on: https://code.wireshark.org/review/5474
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I4f974351ab1f4781e140873f460d028f49640ca1
+    Reviewed-on: https://code.wireshark.org/review/16200
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b01ff09
-Author: Enrico Jorns <ejo@pengutronix.de>
-Date:   Tue Nov 25 10:08:05 2014 +0100
+commit 07570b5
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Jun 28 17:24:19 2016 -0700
 
-    canopen: Fixed tree expansion
+    Don't assume GNU sed.
     
-    Previously the COB-ID and Type subtree also used the main ett_canopen
-    variable. This made control of subtree expansion impossible as both
-    parent and subtree nodes shared the same state.
+    Not all versions of sed support "\n" as meaning "newline" in the
+    replacement string of an s command.  POSIX requires tr to support "\n"
+    in the replacement string, however, so use % as meaning "newline" in the
+    sed script, and translate it to a newline using tr.
     
-    Change-Id: I3dabf7f399e83bfcfbf78bc0e633e3696776c043
-    Reviewed-on: https://code.wireshark.org/review/5480
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Icdbc0b55787340953dfc90ea82e0421b4e77a896
+    Reviewed-on: https://code.wireshark.org/review/16199
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c39776c
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Nov 24 12:01:46 2014 -0700
+commit 5c03bda
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Mar 15 03:06:21 2016 +0000
 
-    Remove unused ui_simple_dialog.h from qt Makefile.common
+    Qt: Generate .qm files during build
     
-    Change-Id: I366a52a037462cb059565365ea1eec5be228078f
-    Reviewed-on: https://code.wireshark.org/review/5475
+    Change-Id: Ia2ee723227e1b331eeec0f0463654f35a4c9f37b
+    Reviewed-on: https://code.wireshark.org/review/14508
+    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>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit a600ef6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 18:17:20 2014 -0500
+commit fff248b
+Author: Bruno Verstuyft <bruno.verstuyft@excentis.com>
+Date:   Mon Jun 20 14:29:10 2016 +0200
 
-    Have media dissector take its "media type parameter" from dissector data parameter instead of pinfo->private_data.
+    DOCSIS: Added dissector for OFDM Channel Descriptor
     
-    Change-Id: I0a0cb0b4838bc4e55a759fb6031355892c220c8e
-    Reviewed-on: https://code.wireshark.org/review/5461
+    Change-Id: Idbbc1ad126e0b01952957a914bd9c16a990a9b9e
+    Reviewed-on: https://code.wireshark.org/review/16036
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 518bb10
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Nov 24 10:26:00 2014 -0500
+commit 42b8c95
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jun 28 21:47:46 2016 +0200
 
-    Remove use of pinfo->private_data since it's not used anywhere.
+    3GPP NAS: add a missing separator for optional string
     
-    Change-Id: Ibb47fd1a0d498cc9791ca31ee625395905a7e999
-    Reviewed-on: https://code.wireshark.org/review/5464
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Idddbae0e969b525ddbe31f3b1ddbccaed232891a
+    Reviewed-on: https://code.wireshark.org/review/16197
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 392dae5
-Author: Joe Fowler <fowlerja@us.ibm.com>
-Date:   Tue Nov 18 13:13:46 2014 -0500
+commit 422c0f4
+Author: Gerald Combs <gerald@zing.org>
+Date:   Mon Jun 27 20:13:35 2016 -0700
 
-    Add new dissector for Shared Memory Communications over RDMA protocol (SMC-R)
-    
-    RFC draft http://www.ietf.org/id/draft-fox-tcpm-shared-memory-rdma-05.txt
-    used as reference for packet dissection.
-    
-    A small change was made to packet-infiniband, to add the Queue Number to the
-    info column.  This allows for easy indentification of session traffic for a
-    particular QP.
+    Qt: Make the packet map work with Qt 5.7.
     
-    Also: infiniband: tvb_length() --> tvb_captured_length()
+    It's not safe to assume that the overlay scroll bar range is equal(ish)
+    to the number of packets. Adjust our arithmetic accordingly.
     
-    Bug: 10715
-    Change-Id: I774ceffaa5c271cb6a28ab4ed21e53cd42f2547b
-    Reviewed-on: https://code.wireshark.org/review/5386
-    Petri-Dish: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ic8cc8a746bdd2bdc6771794303e95a810bc3d1d2
+    Reviewed-on: https://code.wireshark.org/review/16186
+    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: Bill Meier <wmeier@newsguy.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 363b87a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 22 11:59:50 2014 +0100
+commit 000ac66
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jun 28 08:54:53 2016 -0700
 
-    Qt: support the -Y option to set an initial display filter
+    Qt: Make recent preferences changes work with Qt4.
     
-    Change-Id: I7627265b876c6994b163df1c5b037f4dae2f6d42
-    Reviewed-on: https://code.wireshark.org/review/5445
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit e899c3e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 23 23:06:34 2014 -0500
-
-    Eliminate proto_tree_add_text from some dissectors.
+    Cast a pointer to a QWidget * so that compilation and pref selection
+    works for Qt4. Add an assert and some comments.
     
-    Change-Id: Iadd80aab291e5de714891a9f3c79edeca19e9b93
-    Reviewed-on: https://code.wireshark.org/review/5458
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ide89b698220a9af7b7252488f0770ff35081432e
+    Reviewed-on: https://code.wireshark.org/review/16195
+    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: Evan Huus <eapache@gmail.com>
-
-commit 4f8a6ec
-Author: Matthieu Coudron <mattator@gmail.com>
-Date:   Tue Nov 18 19:33:53 2014 +0100
-
-    TCP: fix wrongly set base_seq when ISN is 0 and tcp_relative_seq is
-    enabled
-    
-    tcp_analysis::base_seq could be set several times when the
-    TCP ISN was set to 0, thus inducing some undesired wraps such as 0-1
-    
-    Bug: 10713
-    Change-Id: I69a0dfe677e93bf51015bf7a39ebf888631b12a4
-    Reviewed-on: https://code.wireshark.org/review/5387
     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 d5713e2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 19 21:34:20 2014 +0100
-
-    hostlist_table (GTK): Fix Dereference of null pointer found by Clang analyzer
-    
-    Change-Id: If74dc38b2a9724b9d924092796db5b6beb97043c
-    Reviewed-on: https://code.wireshark.org/review/5400
-    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 159626c
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Mon Nov 24 16:30:52 2014 +0100
+commit ff8c6d9
+Author: Jens Kilian <jens.kilian@advantest.com>
+Date:   Tue Jun 28 10:32:26 2016 +0200
 
-    Update debian symbols
-    
-     * register_tap_ui is removed in a21436eaed
-     * wtap_read_bytes(_or_eof) are introduced in 670ebda4a6
+    Qt: Add a missing Q_DECLARE_METATYPE to fix a compile error on RHEL 7.
     
-    Change-Id: If815c686d57310f0d87f965b5b5c2a71b651cbad
-    Reviewed-on: https://code.wireshark.org/review/5465
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I6cf0a95525334d5a7561a477093b892a3f821b98
+    Reviewed-on: https://code.wireshark.org/review/16189
+    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 059c257
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Nov 24 16:50:10 2014 -0700
-
-    Allow html version of man pages to be found when running from build
-    directory (they're in doc/ of the build directory).
-    
-    Change-Id: I425fa847952cf9f74a948a89c0048077dfcf0ae2
-    Reviewed-on: https://code.wireshark.org/review/5478
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit 1cdf644
+commit 980d3b4
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Nov 21 11:24:50 2014 +0100
+Date:   Mon Jun 27 08:08:28 2016 +0200
 
-    A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
-    
-    Second try... ;-)
+    DTN: fix indent
     
-    Remove also double space
+    * Replace tab by 4-spaces
+    * Add modelines (for packet-dtn.c)
     
-    Change-Id: I77aa269c1abae18b4fb9daec6cc0ac862cf4ab9f
-    Reviewed-on: https://code.wireshark.org/review/5421
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I668f20b4a021ef94a1bb0b26ac815495eb9920d9
+    Reviewed-on: https://code.wireshark.org/review/16165
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 605a6ae
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 21:12:55 2014 +0100
+commit 0321d06
+Author: David Zoller <zollerd@gmail.com>
+Date:   Sat Jun 25 09:13:00 2016 -0500
 
-    Mate: Fix indent (use tabs)
+    DTN follow up to Change ID: I49769271a41b6a7b23c6bc1d4beaadbe8819198d
     
-    Change-Id: I9a02e4a063dc4fc173ff9b7596acd7f9ceba7aa7
-    Reviewed-on: https://code.wireshark.org/review/5477
+    Change-Id: Ia90644c22896586e4a260a3bf11d1f3e50bd4c4b
+    Reviewed-on: https://code.wireshark.org/review/16134
+    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 e02c03b
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Nov 24 12:07:59 2014 -0700
+commit ca369ac
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jun 28 16:47:20 2016 +0200
 
-    Change capitalization of "DNS UDP [p]orts" to match "DNS TCP ports" in prefs
+    3GPP NAS: upgrade dissector to v13.6.0
     
-    Change-Id: Ib0bffc6d5e4bd6b68f48a843b4b4cab7422aceb7
-    Reviewed-on: https://code.wireshark.org/review/5476
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: Ieffc5d6544f3bd121ff317ff598faaadb5f117ab
+    Reviewed-on: https://code.wireshark.org/review/16194
+    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 4b57edb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 18:11:30 2014 +0100
+commit 670b119
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jun 28 10:43:12 2016 +0200
 
-    MIPv6: Enhance ANI dissection
+    print.c NULL pointer check in print_escaped
     
-    * Fix wrong length for Operator Identifier
-    * Display Latitude and longitude in Degrees
+    Added NULL pointer check in print_escaped functions.
+    Requested by comment in change 16034.
     
-    Bug:10712
-    Change-Id: Idf6ba63db3ff16710fd0de7a7fd2233148cbaf4a
-    Reviewed-on: https://code.wireshark.org/review/5473
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Id172d772d9b5cb4bcd31fe8b42286f885ec5b968
+    Reviewed-on: https://code.wireshark.org/review/16188
+    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 15f6f56
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 18:34:19 2014 +0000
+commit 8c006fe
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jun 28 10:43:12 2016 +0200
 
-    Revert "Allow "(g)make tags" to work again"
+    print: change function call.
     
-    This reverts commit 6b8fe87ef48abb95dd303871d0835c153cf8c891.
-    
-    Change-Id: Ie4f681186c1555e6ab966e7db687035f7fc5e60f
-    Reviewed-on: https://code.wireshark.org/review/5472
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I8cae4a8d2b57f961d16cb388befed2348a88badc
+    Reviewed-on: https://code.wireshark.org/review/16191
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Martin Kacer <kacer.martin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit 6b8fe87
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Thu Nov 20 10:35:45 2014 -0700
+commit 94830dc
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jun 28 10:42:55 2016 +0200
 
-    Allow "(g)make tags" to work again
+    print: merge json and ek functions.
     
-    Change-Id: Idcff82aceedbf42652741564e06ca53984078361
-    Reviewed-on: https://code.wireshark.org/review/5413
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: Ia5d75bab03bfc065651ea83c936aedffb1f69e9f
+    Reviewed-on: https://code.wireshark.org/review/16190
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Martin Kacer <kacer.martin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit 2baac34
+commit 7fcdc75
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 18:18:00 2014 +0100
+Date:   Tue Jun 28 07:29:50 2016 +0200
 
-    CPHA : tvb_length -> tvb_reported_length
+    print(.c): fix no previous prototype for 'check_protocolfilter' [-Wmissing-prototypes]
     
-    Change-Id: I49a7ffb1fcff71d49593ab009036f21c3ae6a2d0
-    Reviewed-on: https://code.wireshark.org/review/5471
+    Change-Id: Ib10e919dd3f0bec92004c68bf73a3c7d37961f03
+    Reviewed-on: https://code.wireshark.org/review/16187
+    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 1f5dbb0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 17:16:52 2014 +0100
+commit e5a1afc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jun 27 14:34:29 2016 -0700
 
-    CPHA: Update versions lists
+    Qt: Preferences dialog performance improvements.
     
-    Use also value_string ext
+    Fill in advanced and module tree item text when requested.
     
-    Request from Hugo van der Kooij
+    Create ModulePreferencesScrollAreas only when we need to show them.
     
-    Bug:10723
-    Change-Id: I0603687215b7e82a987a4a6cde00eb996b04a77c
-    Reviewed-on: https://code.wireshark.org/review/5466
+    Change-Id: I5aa7d5dba8f5d20de088de3a9d1ee9d58e779269
+    Reviewed-on: https://code.wireshark.org/review/16181
+    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 10803f2
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Nov 21 16:23:24 2014 -0700
+commit ee6c1f5
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Mon Jun 27 23:17:27 2016 +0200
 
-    Second attempt at putting a description in the preferences page
+    OSPF: Differentiate meaning of N/P bit in NSSA LSA type 7
     
-    Change-Id: I6d196486e824c82d29f1c233ef3230ad8619715d
-    Reviewed-on: https://code.wireshark.org/review/5434
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit 953e6b1
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 14:13:10 2014 -0500
-
-    Pass data to JSON through dissector data, not pinfo->private_data.
+    In OSPF v2 the N/P bit in NSSA LSA type 7 messages has to be
+    interpreted as P-bit (RFC 3101) instead of N-bit. This change
+    makes it so.
     
-    Change-Id: I21dc2777822f0836f486432343cc1238886ad29d
-    Reviewed-on: https://code.wireshark.org/review/5460
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0c716f7
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Nov 24 11:38:43 2014 -0500
-
-    openflow; Fix a (no-effect) typo in openflow_version_values[]
-    
-    Change-Id: I7a51face9c675ac3c03f2306ec40293b4835e02e
-    Reviewed-on: https://code.wireshark.org/review/5468
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug: 12555
+    Change-Id: I1d4a8978ca42d0472d5967528e72cbfada87b799
+    Reviewed-on: https://code.wireshark.org/review/16174
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 7309664
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Nov 24 17:22:02 2014 +0100
+commit f0e6764
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jun 27 19:58:21 2016 -0700
 
-    [SIP/DIAMETER] Reinstate the lost dfilter_store_sip_from_addr() and use it
-    for 3GPP AVP 601 Public-Identity.
+    Global, not static.
     
-    Change-Id: I5ef6608e7821779b00f79486860ee5f578828dfc
-    Reviewed-on: https://code.wireshark.org/review/5467
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I185a1786365f185f18f3ec492a8ef165d61595ed
+    Reviewed-on: https://code.wireshark.org/review/16185
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 78849d0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 24 15:51:27 2014 +0100
+commit 3ebac2b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jun 27 19:54:42 2016 -0700
 
-    SMTP: escape ASCII strings printed to COL_INFO
+    Have commandline_other_options() directly fill in the global structure.
     
-    This is already done automatically for the hf entries thanks to hfinfo_format_text() function
+    Other code looks at the global structure, so there won't be other
+    structures; just fill in the global structure directly.
     
-    Bug: 10536
-    Change-Id: I9ee56b795234a94f0e59c82a96e3e6cedf71c4e6
-    Reviewed-on: https://code.wireshark.org/review/5459
-    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>
+    Change-Id: I4dc87b79168c5a7c9ab1f085aa2d78cc6d2c9019
+    Reviewed-on: https://code.wireshark.org/review/16184
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit daed807
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 23 00:12:57 2014 -0500
+commit ac4ad2b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jun 27 18:56:29 2016 -0700
 
-    Pass FrameID as data to the heuristic table, rather than use pinfo->private_data.
+    Don't set quit_after_cap if no pcap, as it's not present.
     
-    Change-Id: Idd5818cbb2b1f8628bb29c2c71dfc6d41df89b5d
-    Reviewed-on: https://code.wireshark.org/review/5448
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I871f75394ba66967d7d7be203bd9e235575458e1
+    Reviewed-on: https://code.wireshark.org/review/16183
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 6dbb97d
-Author: Dave Tapuska <dtapuska@google.com>
-Date:   Mon Nov 17 17:12:36 2014 -0500
+commit 5d019cf
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jun 27 18:40:09 2016 -0700
 
-    SSL: Implement Extended Master Secret
-    
-    Store all handshake mesages in a buffer so that we can hash them
-    correctly when generating the master secret.
+    Make quit_after_cap an item in commandline_param_info_t.
     
-    This change does not work correctly for DTLS retransmitted packets; that
-    are in the handshake as they will be hashed twice; which is bad. Looking
-    for ideas to implement this.
+    And make the commandline_info structure global, so all the places that
+    look at quit_after_cap can get at it.
     
-    Bug: 10686
-    Change-Id: Ied01d4cc37b4270f325070a8d1630d3123577a0d
-    Reviewed-on: https://code.wireshark.org/review/5168
-    Reviewed-by: 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I006329cf8842c655cca36f024570855d1b16e107
+    Reviewed-on: https://code.wireshark.org/review/16182
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit eb93f3b
+commit 3f49e89
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 23 17:03:42 2014 -0800
+Date:   Mon Jun 27 17:21:24 2016 -0700
 
-    Don't do unsafe pointer casting
+    Pull quit_after_cap out of the global capture options.
     
-    Don't cast a pointer-to-int into a pointer-to-pointer and pass the
-    resulting pointer to g_hash_table_lookup_extended() - pointers and ints
-    are *not* guaranteed to be the same size.  Instead, just have a variable
-    of type gpointer, pass a pointer to *that*, and then run that result
-    through GPOINTER_TO_UINT().
+    Really, all the GUI-related options should be pulled out, so they're not
+    cluttering up dumpcap and tshark.
     
-    This fixes a reproducible crash.
+    Change-Id: I0276dee2be48bae3498a819d8c0c2747fe1352e7
+    Reviewed-on: https://code.wireshark.org/review/16180
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 72d9785
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jun 27 16:49:08 2016 -0700
+
+    We need global_capture_opts if we have extcap, even without pcap.
     
-    Change-Id: I42954f222ab59866cb909b80d9dbb1d2668d2aff
-    Reviewed-on: https://code.wireshark.org/review/5457
+    Change-Id: I16b778064c1cd2bbf281fb5192bf35da252e99dd
+    Reviewed-on: https://code.wireshark.org/review/16179
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ec650d4
+commit 9b91e64
 Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Nov 23 23:58:24 2014 +0100
+Date:   Tue Jun 28 00:34:07 2016 +0200
 
-    elf: separate ett for program and sections entries
+    test: ensure temporary directory outside source tree
     
-    This makes it easier to focus on a single section entry, collapsing all
-    other entries.
+    The whole point of using mktemp is to get a temporary directory outside
+    the source tree. Commit v2.1.0rc0-1027-ge01f8fb tried to fix the
+    invocation for *BSD (including OS X), but by adding a template it
+    dropped the implicit --tmpdir option for GNU mktemp on Linux..
     
-    Change-Id: I3de72065eb279e9449496a7224508e5be85c3757
-    Reviewed-on: https://code.wireshark.org/review/5456
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Use the GNU mktemp invocation and if it fails (for example, because a
+    template is expected for BSD/OS X), provide a template.
+    
+    Change-Id: I77bbc7dc2045e4fa756e102afa080860b0857713
+    Reviewed-on: https://code.wireshark.org/review/16178
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 4d55e1f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 23 12:30:59 2014 -0800
+commit e69194a
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Mon Jun 27 23:23:31 2016 +0200
 
-    Presumably the intent is to dump *non*-dummy entries.
+    qt: fix linking error with global_capture_opts
     
-    I.e., presumably the intent is to dump *resolved* hosts, rather than
-    *unresolved* hosts where there's no known host name and the name field
-    is a string form of the address (the premise being that looking the
-    address up in the hash table repeatedly, and using the already-generated
-    string, will be faster than generating the string repeatedly).
+    global_capture_opts is already defined by ui/commandline.c which is also
+    linked with wireshark-qt.cpp. Remove the duplicate definition to avoid a
+    build failure with the gold linker.
     
-    Change-Id: Iad1beb1d5f9cd9ed92bad5386111cb659614ee4d
-    Reviewed-on: https://code.wireshark.org/review/5455
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Fixes regression from v2.1.1rc0-192-g9b5b444.
+    
+    Change-Id: I4484e2769bf270dee1ec0378fd9c925e01eaf390
+    Reviewed-on: https://code.wireshark.org/review/16175
+    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 da5487f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 23 00:20:10 2014 -0800
+commit 4add8b6
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Thu Jun 16 15:27:25 2016 -0700
 
-    Newlines at the ends of lines, please.
+    cmake: add idl2wrs-dissectors target for DCERPC
     
-    Change-Id: I7b484e3ddac7cb1330c966819514a9468ea69066
-    Reviewed-on: https://code.wireshark.org/review/5454
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Add a callable target such that dissectors can be generated without the
+    AUTOGEN_dcerpc option.
+    
+    Modelled after the pidl CMakeLists.txt file and target. This approach
+    has the advantage over the previous implementation such that the clean
+    target does not remove the packet-dcerpc-X.c files.
+    
+    Change-Id: I3226937eaa76dffa253df9d4f989421d5faa3f3f
+    Reviewed-on: https://code.wireshark.org/review/15989
+    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 b2030ca
+commit b0b2540
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 23 08:04:42 2014 -0800
+Date:   Mon Jun 27 09:02:51 2016 -0700
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-11-23]
+    Qt: Clean up capture file callbacks.
+    
+    Mark some callbacks GTK+ only as appropriate. Change a debug message to
+    an assert since we handle all callbacks.
     
-    Change-Id: I6f8a66b742571dcde011125df9295daedc5652a7
-    Reviewed-on: https://code.wireshark.org/review/5450
+    Change-Id: I4266f0d7134d19a9c0432354ea36de67501275b4
+    Reviewed-on: https://code.wireshark.org/review/16171
+    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 e50095c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 23:11:32 2014 -0500
+commit d8ddf84
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Mon Jun 27 06:41:56 2016 +0200
 
-    Remove use of pinfo->private_data (which doesn't appear to be used anyway) and pass it as dissector data.
+    Fixed tshark pdml output.
     
-    Some other minor cleanup while in the neighborhood.
+    Corrected if no protocol filter (-j) specified.
     
-    Change-Id: I1b0c0567488fa350c14d21c5f5e4cb9746177af1
-    Reviewed-on: https://code.wireshark.org/review/5447
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Id20dd255642951633efa935dbb1363e7b9aa9be0
+    Reviewed-on: https://code.wireshark.org/review/16164
+    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>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit e908804
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 22 12:20:05 2014 -0800
+commit d90e6e7
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 27 09:48:35 2016 -0400
 
-    Update symbol list.
+    There's no need to check the return from g_array_index().
     
-    Change-Id: Ib1cb41f212bbccd4e20d3621110cbb98c01a7196
-    Reviewed-on: https://code.wireshark.org/review/5444
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    g_array_index() returns an index into an array: we're sure to find
+    something at that index (whether that something is in bounds is
+    a-whole-nother question).
+    
+    This fixes CIDs 1362829 and 1362890/1362830.  There were other CIDs like
+    this but they've already been fixed.
+    
+    Change-Id: I94af0931b9adf3abd3bedc969e399cda98bbdd07
+    Reviewed-on: https://code.wireshark.org/review/16168
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit 08cf40e
+commit 2ab4155
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 13:13:22 2014 -0500
+Date:   Sun Jun 26 10:52:37 2016 -0400
 
-    Use dissector data to "return" XML data to XMPP dissector.
+    tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_string
     
-    Change-Id: I9abdc8c3deed35131af1537733d624d5cfced182
-    Reviewed-on: https://code.wireshark.org/review/5443
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Also some other tricks to remove unnecessary tvb_get_string_enc calls.
+    
+    Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914
+    Reviewed-on: https://code.wireshark.org/review/16158
+    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>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 534b596
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 16 10:22:34 2014 -0500
+commit 8c37621
+Author: D. Ulis <daulis0@gmail.com>
+Date:   Sun Jun 26 22:34:03 2016 -0400
 
-    Cleanup packet-sccp.c in preparation of trying to remove sccp_info member of packet_info.
+    CIP: Cleanup info column for MSP packets
     
-    Convert a handful of global variables into function parameters that get passed through the dissector, so we shouldn't be dependent on pinfo->sccp_info anymore. Removal of pinfo->sccp_info will be done in a separate patch (when the dissectors that use it can be updated).
+    1. Skip printing class name in info column when it was an MSP, since it's implied.
+    2. Don't print response status for embedded messages in info column for MSP. It makes the line too long.
+    3. Print the response status for embedded messages in the Service Packet tree. This makes it easier to find the packet that may have failed.
     
-    packet-sua.c may need similar treatment.
-    
-    Change-Id: If0001638d666afc07e04b02aa32ef31d6223a5de
-    Reviewed-on: https://code.wireshark.org/review/5343
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I2c60fb9baf113a215ada7301f493cbd51e340dcd
+    Reviewed-on: https://code.wireshark.org/review/16162
+    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: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit e2b597a
+commit 58ccf8e
 Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Nov 19 22:22:12 2014 -0500
+Date:   Sun Jun 26 21:38:19 2016 -0400
 
-    Fix problem where the profile bar moves further left every time Wireshark is
-    run.
+    endpoint dialog: fix compilation when we don't HAVE_GEOIP.
     
-    For the saved/restored geometry to be consistently correct we need to always
-    show the expert info and capture file comment icons.  Disable them if no
-    capture file is open.
+    Also fix some indentation and white space.
+    Remove a break-after-return.
     
-    Bug: 10518
-    Change-Id: I6e254f66a17f8f54f28cfbafb4e0f92e02cff70c
-    Reviewed-on: https://code.wireshark.org/review/5404
-    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 12562
+    Change-Id: I912ccdac62aceaabcffec8f7739da56cc6036abf
+    Reviewed-on: https://code.wireshark.org/review/16159
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit c61a037
-Author: Jesse Gross <jesse@nicira.com>
-Date:   Tue Nov 18 14:36:30 2014 -0800
+commit 010f5bb
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jun 27 08:10:33 2016 +0200
 
-    Add version check in Geneve dissector.
+    LTP: fix indent
     
-    We should warn when decoding Geneve packets with an unknown
-    version number.
+    replace space by tab
     
-    Change-Id: Id40b756c3bb0320b69fbd8ee98830a2b05834a48
-    Reviewed-on: https://code.wireshark.org/review/5420
+    Change-Id: I52d5fefbf795fe6ee2dbdeda087c49280ba47503
+    Reviewed-on: https://code.wireshark.org/review/16166
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     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 01f9706
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Fri Nov 21 23:27:56 2014 +0000
+commit af26f31
+Author: Bruno Verstuyft <bruno.verstuyft@excentis.com>
+Date:   Thu Jun 16 10:24:21 2016 +0200
 
-    Add the required c flags for some test executables
+    DOCSIS: Fix unknown TLVs in UCD type29 caused parsing errors + bugfixes
     
-    Change-Id: I93b0c346fff162899e5f97dd2366e01cf99ec38e
-    Reviewed-on: https://code.wireshark.org/review/5435
-    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>
+    Change-Id: I9ab56ded7ebf9f087afceed979e451e369eaf1d6
+    Reviewed-on: https://code.wireshark.org/review/15967
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 741db4c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 22 01:07:13 2014 -0800
+commit 03adf58
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sun Jun 26 23:42:20 2016 +0200
 
-    Get rid of another global in the print code.
+    Remove author comments and some accompanying useless code comments
     
-    Pass the "output only these protocols" hash table as an argument,
-    instead.
+    This only removes author's names that appear in the AUTHORS* files.
+    In those cases where a group of people get mentioned, this patch does
+    not remove any in case at least one name is not found in AUTHORS*
     
-    Change-Id: Id8540943037e7b9bbfe377120c3f60dbe54fe0f1
-    Reviewed-on: https://code.wireshark.org/review/5440
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I2259dbda3d4a1250bdc103f3fc5be93df5482489
+    Reviewed-on: https://code.wireshark.org/review/16154
+    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 c68e77b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 22 00:28:12 2014 -0800
+commit ff9e62a
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jun 25 19:23:58 2016 +0100
 
-    Pass a capture_file * to write_psml_preamble() in tfshark as well.
+    autotools: Qt 5.7 requires C++11
     
-    Change-Id: I2b2ae78d4b75bb27a44d185b48e3d85794effdb7
-    Reviewed-on: https://code.wireshark.org/review/5439
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Icad622a052a84862ace98a7000f10ccf677f54a5
+    Reviewed-on: https://code.wireshark.org/review/16138
+    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 b19b12a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 22 00:06:54 2014 -0800
+commit fbb23e2
+Author: Thomas Wiens <th.wiens@gmx.de>
+Date:   Fri Jun 24 23:53:36 2016 +0200
 
-    Get rid of write_headers global variable.
+    s7comm: Sinumerik NC file transfer
     
-    Have write_psml_preamble() and write_csv_preamble() take a capture_file *
-    as an argument, so they can print the column titles themselves, rather
-    than having to defer it to the routine that prints packet data.
+    Added decoding of up-/downloading files from/to a Sinumerik NC CNC control
+    machine.
     
-    Change-Id: Ifd1b7a13062be8ad46846315976922a752778153
-    Reviewed-on: https://code.wireshark.org/review/5438
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: If7939e56e972fc2b8feb12150c4184a880b0cdae
+    Reviewed-on: https://code.wireshark.org/review/16129
+    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 6e1214c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 21 19:32:33 2014 -0800
+commit 76ae2d9
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jun 26 18:54:54 2016 +0200
 
-    Fix comments.
+    AUTHORS: fix duplicate / wrong name entry
     
-    Change-Id: I3b7340939b8204102bfc7e2e7d83f4d978cf7bad
-    Reviewed-on: https://code.wireshark.org/review/5437
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I1e2bb98d1e78af193f449c75109eabc92f934c11
+    Reviewed-on: https://code.wireshark.org/review/16149
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: David Zoller <zollerd@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7d7fc47
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 21 19:22:54 2014 -0800
+commit 148d586
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Sun Jun 26 21:13:06 2016 +0200
 
-    Split the low-level print stream code into a separate file.
+    json: corrected json output format.
     
-    Put the low-level print stream code from epan/print.c into
-    epan/print_stream.c, leaving the higher-level stuff in print.c
+    Some pcaps caused invalid json and ek files.
     
-    Change-Id: Iae961f168ec655a29f434257b1af0937fca9f025
-    Reviewed-on: https://code.wireshark.org/review/5436
+    Bug: 11754
+    Change-Id: Id4c4d744b4d07fe4e8b6423688be1bb10a803844
+    Reviewed-on: https://code.wireshark.org/review/16152
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 08475ff
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 19 13:52:52 2014 -0500
+commit 6196595
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Jun 25 09:44:28 2016 -0700
 
-    README.heuristic: rework example code.
+    CMake: Qt 5.7 requires C++ 11.
     
-    Specifically: show the use of tcp_dissect_pdus()
-       for a TCP heuristic dissector
+    Add -std=c++11 to CMAKE_CXX_FLAGS if we have Qt >= 5.7.0 and we're
+    compiling with g++ or clang++.
     
-    Change-Id: I02f184b2c8ef6ed128ef3d0bc59eed759aae54bb
-    Reviewed-on: https://code.wireshark.org/review/5399
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Id4ce5921ce5c475e9eb9cc67f94c3b3a895924a1
+    Reviewed-on: https://code.wireshark.org/review/16135
+    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 fecea97
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 19 21:34:50 2014 +0100
+commit a4711f8
+Author: Ashish Shukla <shukla.a@gmail.com>
+Date:   Fri Jun 24 15:59:39 2016 -0700
 
-    VoIP Call (GTK): Fix Dereference of null pointer found by Clang analyzer
+    radiotap: Fix for the VHT 20MHz MCS 9 data rate not displayed
     
-    Change-Id: I80029b6238c78dcab83a6a70eca0af5b66e1488d
-    Reviewed-on: https://code.wireshark.org/review/5401
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    MCS 9 at 20 MHz is valid for 3 and 6 spatial streams.
+    Changed the rate table to include rate (mbps) for VHT 20MHz MCS 9.
+    
+    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    
+    Bug: 12558
+    Change-Id: Ia16ae545a5ac1779131e24e1f54a5659390cd321
+    Reviewed-on: https://code.wireshark.org/review/16146
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c07e9fe
-Author: Irene Ruengeler <ruengeler@wireshark.org>
-Date:   Mon Nov 17 08:51:12 2014 +0100
+commit 28048a9
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jun 26 17:19:56 2016 +0200
 
-    Add minimize and maximize buttons to the SCTP analysis windows.
+    circuit(.h): fix indent (and add modelines)
     
-    As suggested by Jeff Morriss.
-    
-    Change-Id: Ibe2d30c31d51ab92377d64068527b424a92e8a64
-    Reviewed-on: https://code.wireshark.org/review/5361
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I71bb0a8eaf9f5bd34395a4182e4158abaca4ace2
+    Reviewed-on: https://code.wireshark.org/review/16144
+    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: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit d7e277a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 21 10:43:40 2014 -0500
+commit 4f2c3ad
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jun 26 18:48:30 2016 +0200
 
-    CANopen bugfixes
+    Fix typo on AUTHORS.src (about @)
     
-    1. Fixed endianess in CANopen dissector.
-    According to CiA 301, 7.1.1. (p. 26):
-    "For numerical data types the encoding is little endian style."
-    
-    2. Fixed NMT type string in CANopen dissector
-    NMT function code should not display 'EMERGENCY'
-    
-    3. Fixed time stamp decoding
+    Change-Id: Ie4ba5b6ca9cdcf0a90c4b7604b0b4ff89690f3d9
+    Reviewed-on: https://code.wireshark.org/review/16148
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit ea4d01d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 26 17:37:49 2016 -0700
+
+    The "coding" subfield of the VHT field is a bitmask.
     
-    * Offset increment was too low for data type size
-    * Decoding of time_stamp_days must equal time_stamp_msec and thus be letohs instead of ntohs. CANopen data is little-endian encoded.
+    Treat it as such.  Fetch it once, regardless of whether we have any
+    non-zero NSS values or not, and use the per-user NSS value to decide
+    whether a particular bit in the bitmask is valid and worth displaying.
     
-    4. Fix: Use correct description string for NMT error control state bits
-    canopen.nmt_guard.state was faulty named "Node-ID". This was changed to "State".
+    Make the four coding fields bitfields, with the appropriate bit.
     
-    5. Fix nmt_guard_state value_string array
-    CiA 301 desribes only 4 valid values. All other were deleted.
-    0x00 was renamed from 'Initalisation' to 'Boot-up' following CiA301.
+    Change-Id: I506b35afa9d07da8d800da5c304d5d0aadd87c54
+    Reviewed-on: https://code.wireshark.org/review/16155
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 497159f
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 26 13:44:17 2016 -0700
+
+    Check for an invalid 11ac MCS/bandwidth/NSS combination.
     
-    6. Shortened EMERGENCY to EMCY
+    A few of the combinations are marked as "Not valid" in 802.11ac-2013.
     
-    The term EMCY is the standard abbreviation used in CiA standard for Emergency service.
+    Ping-Bug: 12558
+    Change-Id: I18b78ebb84ab32a6fc53c6d634ef07ae87fb4866
+    Reviewed-on: https://code.wireshark.org/review/16153
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit b84637b
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sun Jun 26 19:07:57 2016 +0200
+
+    Decode partial virtual bitmap in TIM IE
     
-    7. Fix: Allow SYNC and NMT error frames without any payload
-    NMT node guard remote requests do note have a payload,
-    SYNC frames only have an optional payload (counter)
+    - Add yet another filter name for an association id element
+    - Minor (consistency) cleanups in the vicinity of the new hf element.
     
-    If item length is set to -1, decode will cause a 'Malformed Packet' error.
+    Bug: 12545
+    Change-Id: Ic8e7580e7de7572e1b449ae03494b25567d86ea3
+    Reviewed-on: https://code.wireshark.org/review/16150
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+
+commit e702da6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 26 08:09:49 2016 -0700
+
+    [Automatic update for 2016-06-26]
     
-    8.  Rename MT_NMT_GUARD to MT_NMT_ERR_CTRL which better reflects its scope
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I676f9b5f2e4efd8e7c9528fe289e7510c4d43235
-    Reviewed-on: https://code.wireshark.org/review/5425
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Id5cc1bbd3d7f899e48ae9c2de48613ef0366cc29
+    Reviewed-on: https://code.wireshark.org/review/16142
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit f2fc562
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 21 15:54:59 2014 +0100
+commit 5e8649b
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Jun 25 10:12:21 2016 -0700
 
-    Replace tvb_length()
+    Qt: Don't use QStyleOptionViewItemV4.
     
-    Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645
-    Reviewed-on: https://code.wireshark.org/review/5431
+    It was deprecated in Qt 5.7. Just use QStyleOptionViewItem.
+    
+    Change-Id: I890305a11393940e21bdc68d90ca6602ade16769
+    Reviewed-on: https://code.wireshark.org/review/16137
+    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 96fb347
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Nov 20 19:35:25 2014 -0500
+commit 4addfc6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 16:48:23 2016 -0700
 
-    Remove some leftover debug printfs.
+    Add an RA_INTERFACES register action.
     
-    Change-Id: I9f4c7f71ae403059a2a236ba095b21753f7938fa
-    Reviewed-on: https://code.wireshark.org/review/5417
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Add RA_INTERFACES between RA_PREFERENCES and RA_CONFIGURATION. Wireshark
+    was spending a suspiciously long time loading module preferences here.
+    (Now we just need to find out why that section of the code is slow.)
+    
+    Change-Id: Iecbe55e8e10c8844bcb151a13e383cb13a3f6eb1
+    Reviewed-on: https://code.wireshark.org/review/16133
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1cde318
-Author: Michał Orynicz <michal.orynicz@tieto.com>
-Date:   Thu Nov 20 13:16:33 2014 +0100
+commit 60cdee9
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 15:17:25 2016 -0700
 
-    Fix for very big pid and tid numbers in logcat_text
+    Qt: Handle unhandled filter actions.
     
-    There can be no space after pid colon if tid is big enough
-    in logcat long format.
+    Handle FilterAction::ActionColorize and ::ActionFind. Remove
+    ::ActionConversation since it was unused. Assert when we encounter a
+    missing FilterAction, similar to what we do in other parts of the code.
     
-    Change-Id: I8e03e78c88e4bef1a5fdb3a04b77f58fa7d055bc
-    Reviewed-on: https://code.wireshark.org/review/5411
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Bug: 12363
+    Change-Id: I5c1ecd488e5bdb9700a80fc70ec7c047311054b6
+    Reviewed-on: https://code.wireshark.org/review/16131
+    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 1d8673c
-Author: Michał Orynicz <michal.orynicz@tieto.com>
-Date:   Thu Nov 20 13:09:31 2014 +0100
+commit 291762d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 10:52:44 2016 -0700
 
-    Move text logcat regex strings to shared header
+    Qt: Try to fix un-maximize behavior on OS X.
     
-    To avoid further duplication of work and bugfixing,
-    move regex strings to wiretap/logcat_text.h and include
-    this file in epan/dissectors/packet-logcat-text.c
+    On OS X, create dialogs with valid parents so that we don't trigger
+    QTBUG-46701. Document QDialog's "on top", maximize, and minimize
+    behaviors.
     
-    Change-Id: I82773cda0e3240844139b104c68738ec82788014
-    Reviewed-on: https://code.wireshark.org/review/5410
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Bug: 12544
+    Change-Id: I32c0ef01dba3f7132e5fd0cd61f9feb654b92009
+    Reviewed-on: https://code.wireshark.org/review/16127
+    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: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1b9dd75
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Nov 20 20:30:32 2014 -0500
+commit 974a530
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 23 13:10:52 2016 -0700
 
-    Fix the build: dissect_a21_ie_common() can't be static any more.
+    Qt: Conversation and Endpoint dialog performance tweaks.
     
-    Change-Id: I93db6bc35aef9c36a294e530730cd295ad6851ef
-    Reviewed-on: https://code.wireshark.org/review/5419
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 1df0d9c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 20 16:57:24 2014 -0800
-
-    Include "ws_symbol_export.h" to make sure WS_DLL_PUBLIC is defined.
+    Generate column text dynamically. This keeps us from having to iterate
+    over our tree items each time we receive updates.
     
-    Wrap the declaration for C++ while we're at it.
+    Set the uniformRowHeights property.
     
-    Change-Id: Ifcc1b47bab139f5fb8da8c3dd4f20b1ebb99739e
-    Reviewed-on: https://code.wireshark.org/review/5418
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9732398
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 20 20:04:42 2014 +0100
-
-    A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
+    Stop automatically resizing columns after 200 items.
+    
+    Fixup name resolution behavior. Disable the checkbox if host name
+    resolution is disabled.
     
-    Change-Id: Ib2f3816892f1682c175b0dee3c80725caebf3d4d
-    Reviewed-on: https://code.wireshark.org/review/5415
+    Change-Id: Ib2fef604d6ee9e39a8b1edd72d58d0cb02d3bb64
+    Reviewed-on: https://code.wireshark.org/review/16110
+    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 5e932ad
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 20 20:04:26 2014 +0100
+commit 01e2280
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:52:51 2016 +0200
 
-    EPL: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
+    circuit: rename shadow variable
     
-    Change-Id: I40de0c8c2bd40f18a33947367fdeec5a22a3093a
-    Reviewed-on: https://code.wireshark.org/review/5414
+    Change-Id: I67e2c80e89af9526ba4b482933d64cab93b9490a
+    Reviewed-on: https://code.wireshark.org/review/16105
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e77261f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Nov 17 20:04:30 2014 -0500
+commit 12efbd6
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:53:45 2016 +0200
 
-    Eliminate proto_tree_add_text from some dissectors.
+    app_mem_usage: rename shadow variable
     
-    Change-Id: Ib160211198ca02f7eacf29d04568628c11f208a5
-    Reviewed-on: https://code.wireshark.org/review/5407
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I0db888633118beeabfe4bb8fa6da419d0827c7c1
+    Reviewed-on: https://code.wireshark.org/review/16106
+    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 9611e75
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Nov 20 16:07:55 2014 +0100
+commit f8500f3
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:51:41 2016 +0200
 
-    Replace tvb_length...() calls.
+    conversation: rename shadow variable
     
-    Change-Id: Idda7cd56a12b36d18774a1fe324c69eb8f5e4330
-    Reviewed-on: https://code.wireshark.org/review/5412
+    Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911
+    Reviewed-on: https://code.wireshark.org/review/16104
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9145acb
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 18 22:53:32 2014 -0500
+commit 46fc6f5
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:40:40 2016 +0200
 
-    uat: tighten up dec/hex uat field validity checking
-    
-    Specifically:
-    - Use the proper code for testing strtol() result;
-    - Also: Values greater than 32-bits treated as an error
-       (on LP64 architectures);
+    ex-opt: rename shadow variable
     
-    Change-Id: I56e8e734fbb9a22dbd9ed4112e24327ffd7ee3c0
-    Reviewed-on: https://code.wireshark.org/review/5394
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-    Petri-Dish: Bill Meier <wmeier@newsguy.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Iba19920e58ffb7f1a88c2a75964c518f0479c66f
+    Reviewed-on: https://code.wireshark.org/review/16103
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ead585f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 16 15:15:52 2014 -0500
+commit 916958c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:39:43 2016 +0200
 
-    Give better hints as to where the "expert info" fields go.
+    filter: rename shadow var
     
-    Change-Id: I9b1cee43ef9280504745b136b87507c2b6bb5369
-    Reviewed-on: https://code.wireshark.org/review/5406
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545
+    Reviewed-on: https://code.wireshark.org/review/16102
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f7f19f0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Nov 19 20:10:15 2014 +0100
+commit bfb6f62
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:35:17 2016 +0200
 
-    IrDA: always initialize buffer before accessing it
+    srt: rename shadow variable
     
-    Bug: 10716
-    Change-Id: I8e54f750b70076758d5fd0d7f35f9c782f5d0bf9
-    Reviewed-on: https://code.wireshark.org/review/5398
-    Tested-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: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I69bda25f79b6b46bdb288e32133847a853b614e0
+    Reviewed-on: https://code.wireshark.org/review/16101
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit bcc4c7f
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Fri Nov 14 21:39:00 2014 +0100
+commit b845e29
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:31:49 2016 +0200
 
-    Fix global plugin folder when it is set as an absolute path
-    
-    This fixes regression in creating Debian packages caused by
-    80b36cdbde90ac9639938a14e8fd90a79602666a
+    stats_tree: rename shadow variable
     
-    Change-Id: I46702ad4c9a11ce317da7ef664c84e1f22d3f709
-    Reviewed-on: https://code.wireshark.org/review/5316
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Change-Id: I5b3272cc4df728c70d6b0370b0d8a6d3482a0c6c
+    Reviewed-on: https://code.wireshark.org/review/16100
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6fbcc18
-Author: Michał Orynicz <michal.orynicz@tieto.com>
-Date:   Thu Nov 20 09:55:40 2014 +0100
+commit 581d44f
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 17:15:34 2016 +0200
 
-    Fix text logcat for changes in android L
+    h248: rename shadow variable.
     
-    In L, in line "-- beginning of /<buffer>" the "/" was removed.
-    This commit accomodates text logcat to that change.
-    
-    Change-Id: I4cbfadf5a8169589f2848ce1a5793cea593ba459
-    Reviewed-on: https://code.wireshark.org/review/5405
-    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>
+    Change-Id: I98545776127a0cc3b5d9c44bb625a217672b4443
+    Reviewed-on: https://code.wireshark.org/review/16099
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 087518b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 19 19:18:39 2014 +0100
+commit b47aca5
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 16:01:51 2016 -0700
 
-    MIP6: Access network identifier option is not full decoded
+    Minor UI locale updates.
     
-    * Add subtype Geo Location (2) and Operator Identifier (3)
-    * Use also offset to calculate the length
-    * Remove proto_tree_add_text
+    Qt: Call setlocale before commandline_early_options so that we get
+    proper "-v" output, similar to the GTK+ UI.
     
-    Issue reported by Ravindranath K M
+    GTK+: Call setlocale once at startup.
     
-    Bug:10712
-    Change-Id: I9ad81ece856df134f3a706ad774d34e638cb5c94
-    Reviewed-on: https://code.wireshark.org/review/5397
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 11960
+    Change-Id: I3c3a196b9d94fc768e1085200891bc8d67e21a08
+    Reviewed-on: https://code.wireshark.org/review/16132
+    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 d23247e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 19 16:53:36 2014 -0800
+commit 79836fa
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Thu Jun 23 10:43:30 2016 +0200
 
-    White space tweaking to match what's in Samba git.
+    wsutil: Move Win32 helper routines from capchild
     
-    (Samba git also needs some white space tweaking; this only changes the
-    cases where we're not obviously "better".)
+    Move error handling and argument quoting routines from
+    capchild to wsutil, as those methods will be used by
+    extcap_spawn as well.
     
-    Change-Id: Iafb9cf8fea67b898b12850a7793806e3fccb39ac
-    Reviewed-on: https://code.wireshark.org/review/5403
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I2c4515fefd5aecad317fcdaefa721734288f792c
+    Reviewed-on: https://code.wireshark.org/review/16123
+    Petri-Dish: Roland Knall <rknall@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: João Valverde <j@v6e.pt>
+    Reviewed-by: Roland Knall <rknall@gmail.com>
 
-commit 4fdabdc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 19 21:35:14 2014 +0100
+commit fe68566
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 24 12:59:07 2016 -0700
 
-    SBC: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Qt: Fix "-l" behavior.
     
-    Change-Id: I6ac8e0eed88e78521f7d5623b9afdb6a42900ede
-    Reviewed-on: https://code.wireshark.org/review/5402
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    gbcae998 didn't completely fix the missing "-l" behavior.
+    
+    Bug: 12311
+    Change-Id: Iee3c844013ac137e94848aaafca7aeb3de43e080
+    Reviewed-on: https://code.wireshark.org/review/16128
+    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 06dc2a7
+commit cc007e5
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Nov 19 09:03:44 2014 -0800
+Date:   Fri Jun 24 08:59:48 2016 -0700
 
-    voip_calls: Fix tap callbacks.
-    
-    We don't need to call the VoIP tap reset and draw callbacks repeately.
-    Do so only once from the RTP tap. Packet callbacks should return a
-    gboolean.
+    Qt: Keep the syntax line edit cursor active.
     
-    Clean up some function names and make some static.
+    Ignore focusOutEvents when the syntax line edit completer is active.
+    This keeps it from hiding its cursor.
     
-    Change-Id: I5c934ce8ce7f279861e8cc73235bbfc27d7fe622
-    Reviewed-on: https://code.wireshark.org/review/5396
+    Bug: 12520
+    Change-Id: I8e25b92c097e039e26e2381c5209be1e27a6a7cd
+    Reviewed-on: https://code.wireshark.org/review/16126
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Jim Young <jim.young.ws@gmail.com>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit cb090e8
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 19 11:25:17 2014 -0500
+commit 4adf695
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jun 24 14:13:06 2016 +0200
 
-    [pedantic] Replace usage of 'long' and 'long long'
+    print(.c): fix indent
     
-    Change-Id: I78fc82c1a83eb04d78a11fc76710c92dfc916208
-    Reviewed-on: https://code.wireshark.org/review/5395
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ie7c55fb432b29abe689eed1968cfa30bd8e88e33
+    Reviewed-on: https://code.wireshark.org/review/16124
+    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 67ab27a
-Author: Michael Tüxen <tuexen@wireshark.org>
-Date:   Wed Nov 19 15:57:48 2014 +0100
+commit 1df9918
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 18:21:13 2016 +0200
 
-    Add support for PAD chunks.
+    tfshark: remove unused variable
     
-    Add support for PAD chunks as defined in RFC 4820.
+    Change-Id: I30ab3e4e044de12b18b7b7213a605df7096d1c54
+    Reviewed-on: https://code.wireshark.org/review/16108
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 71a57dc
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 23 18:51:25 2016 -0700
+
+    Indicate how this should be done.
     
-    Change-Id: I66a83d5d133429154fe40ccef26687c8350463cf
-    Reviewed-on: https://code.wireshark.org/review/5393
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
+    Assuming that it could, if registered as an "eth.trailer" heuristic
+    dissector, get the length of the entire frame, that is.
+    
+    Change-Id: I1ac26feeb10bb8ba357089a80f4b768f580bb51d
+    Reviewed-on: https://code.wireshark.org/review/16121
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit d7179ac
-Author: Michael Tüxen <tuexen@wireshark.org>
-Date:   Wed Nov 19 15:35:36 2014 +0100
+commit a5e9e7e
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 23 12:45:32 2016 -0700
 
-    Fix the length reported as value length.
+    Fix "disable this protocol by default".
     
-    The length reported as value length for unknown chunks
-    was actually the chunk length. Therefore it was off by 4.
+    Allow a dissector to mark its protocol as "disabled by default", which
+    means that the "enable all protocols" routine won't enable it.  This is
+    necessary in order to allow the disabling of protocols not to be
+    unintentionally changed due to profile changes; see bug 9826.
     
-    Change-Id: Ieea79d2c51b4729fc139395174625d1f362d1ee5
-    Reviewed-on: https://code.wireshark.org/review/5392
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
+    Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f
+    Ping-Bug: 9826
+    Reviewed-on: https://code.wireshark.org/review/16109
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c62dac1
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 16 13:10:37 2014 -0500
+commit dd5f3c9
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jun 23 16:10:09 2016 +0200
 
-    Eliminate proto_tree_add_text from packet-mate.c
+    LTE RRC: fix display of info column when receiving a BR SIB
     
-    Change-Id: I3f4b3eb23b91b219df373b3012fbefa63abfa4d3
-    Reviewed-on: https://code.wireshark.org/review/5350
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ic288cb10fad3bd34fe088479e7a79f77985808e0
+    Reviewed-on: https://code.wireshark.org/review/16098
+    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>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 61b0638
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Tue Nov 18 15:59:44 2014 +0000
+commit 45db2fb
+Author: Benjamin Coddington <bcodding@redhat.com>
+Date:   Thu Jun 23 05:57:03 2016 -0400
 
-    Remove Windows linker flags from the CMake link flags test as the
-    test doesn't actually pass the flags to the VS linker.
+    packet-nfs: add extent decoding for SCSI layouts
     
-    Change-Id: I5d546afcb80a49e39143078bc8f0855b0ba0f7e8
-    Reviewed-on: https://code.wireshark.org/review/5384
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Decode extents sent within the response to a LAYOUTGET operation on
+    SCSI layout types.
+    
+    Change-Id: I1fc0a5e3d4782f078f96866dc63f2ec43b6d62b1
+    Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16097
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
     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 39b0c2d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Oct 16 13:58:58 2014 +0200
+commit 738b3e8
+Author: dz-msfc <zollerd@gmail.com>
+Date:   Wed Mar 2 20:39:12 2016 -0600
 
-    Wiretap: Added file_seek SEEK_END support.
-    
-    This is needed for Lua File:seek("end").
+    NASA provided LTP and DTN updates
     
-    Change-Id: I28fb23f2f29ca8083c77bf065db8816e039ae5a1
-    Reviewed-on: https://code.wireshark.org/review/4722
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I49769271a41b6a7b23c6bc1d4beaadbe8819198d
+    Reviewed-on: https://code.wireshark.org/review/14310
+    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 edac72e
+Author: Jens Kilian <jens.kilian@advantest.com>
+Date:   Thu Jun 23 10:31:42 2016 +0200
+
+    Increase MAX_DISSECTOR_ADDR_TYPE.
+    
+    With the recent changes causing some address types to be registered
+    by their proper dissectors, I ran into the MAX_DISSECTOR_ADDR_TYPE
+    limit in a new dissector I'm currently writing.
+    
+    Change-Id: I72f521266af9190e8ad198ace4d6608b6b4d2dee
+    Reviewed-on: https://code.wireshark.org/review/16091
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 982359c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 23 10:13:15 2016 +0200
+
+    bthci: add missing break (CID 1362832)
+    
+    Change-Id: I705cb17d7c6d615361d29f00ba840a94dc835ff0
+    Reviewed-on: https://code.wireshark.org/review/16090
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
     Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit cfa0e5f
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 18 13:13:35 2014 -0800
+commit a51b6a6
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 23 02:33:46 2016 -0700
 
-    voip_calls: Regression fixes.
+    Fix some of the brokenness in the PRP redundancy control trailer dissector.
     
-    Fix struct initialization logic. Clear a GQueue instead of deleting it.
-    Don't crash if we have no sequence diagram items. Make sure we show all
-    flows and not just invites. Zero allocated memory in a couple of places.
+    IF YOU ARE DOING A HEURISTIC CHECK TO DETERMINE WHETHER THE PACKET
+    YOU'RE LOOKING AT IS ONE YOU SHOULD DISSECT, EVEN IN A DISSECTOR
+    THAT'S NOT REGISTERED AS A HEURISTIC DISSECTOR, DO NOT LOOK AT PACKET
+    BYTES UNLESS YOU HAVE ALREADY DETERMINED THAT THEY ARE AVAILABLE IN THE
+    CAPTURE.
     
-    Change-Id: Ia5bb3ba57cf625de4b554b354e098aa0361dff28
-    Reviewed-on: https://code.wireshark.org/review/5390
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    THERE ARE NO EXCEPTIONS TO THIS RULE.
+    
+    Bug: 9826
+    Change-Id: I2327a92ee760003bc10489263c0c53acdf2094e9
+    Reviewed-on: https://code.wireshark.org/review/16092
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit dc5b8f1
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Nov 16 19:09:57 2014 +0200
+commit 6b0923a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 23 01:00:26 2016 -0700
 
-    dissect TA(1)
+    No pcap, no live capture, so no auto_scroll_live.
     
-    Change-Id: If618b0c3dc0502f5a31dcc580b9116daacb40239
-    Reviewed-on: https://code.wireshark.org/review/5389
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ic1993916cdb78c946bb291fa59f7cdc25e9cef2d
+    Reviewed-on: https://code.wireshark.org/review/16088
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7cdfe52
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Tue Nov 18 21:11:22 2014 +0300
+commit 2c8056a
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jun 13 20:02:46 2016 +0200
 
-    Update Couchbase dissector:
+    Qt: quit the UI if WIRESHARK_QUIT_AFTER_CAPTURE is set (offline mode too).
     
-    * Register new commands:
-        * 0x5c: DCP_NOOP
-        * 0x5d: DCP_BUFFER_ACKNOWLEDGEMENT
-        * 0x5e: DCP_CONTROL
-        * 0x5f: DCP_RESERVED4
+    This change is useful to use the offline mode in tests (like fuzzing)
+    that require the software to quit after the processing of a sample.
     
-    Change-Id: I22d8eb8f6628e07b2e2ab2bc137688329eead1be
-    Reviewed-on: https://code.wireshark.org/review/5385
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I311c642edecf4012dc518c2bf8bca66c97aa1b02
+    Reviewed-on: https://code.wireshark.org/review/16038
+    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 e97d235
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 17 22:49:24 2014 +0100
+commit bf29a5c
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jun 23 00:30:51 2016 -0400
 
-    SPDY: do not try to access an uninitialized tvb
+    Add LACP "flag strings"
     
-    Coming when data length = 0
+    Merged the functionality of a Lua script from Sharkfest '16
+    presentation into the dissector.
+    Also cleaned up some of the tfs values used by the dissector.
     
-    Bug: 10704
-    Change-Id: Ibd0730be661d966aa0429480dba97ed7d3e5c471
-    Reviewed-on: https://code.wireshark.org/review/5377
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 12550
+    Change-Id: I6b4c2f4d8a07cfb836265518d713a499df3e971c
+    Reviewed-on: https://code.wireshark.org/review/16086
+    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 4b96030
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 30 09:16:51 2014 +0100
+commit 1cdd091
+Author: Chris Brandson <chris.brandson@gmail.com>
+Date:   Fri Jun 17 15:12:12 2016 -0700
 
-    802.11: Remove proto_tree_add_text
+    ZigBee updated ZDO support to comply with R22
     
-    Change-Id: I40d351e3317ff7e207e5c68a39aaedb73faf54f9
-    Reviewed-on: https://code.wireshark.org/review/5281
+    Update ZDO support for R22 (and IEEE 802.15.4-2015)
+    - Add support for the new IEEE Joining List request / response
+    - Changed Network Update to support channel pages
+    - Added Network Update Enhanced request
+    - Added decoding of EU Sub-GHz Frequency Band
+    
+    Change-Id: I3a513a486f6d3784897fc8b783411c678e3f905e
+    Reviewed-on: https://code.wireshark.org/review/16040
+    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>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c2f971d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 17 21:16:19 2014 -0800
+commit fdcfd3a
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Jun 22 21:10:50 2016 +0100
 
-    Fix indentation.
+    IPv6: Don't check payload length for ICMPv6 encapsulation
     
-    Change-Id: Icc474748f755c21d281620c3b0f5d4d90f09223b
-    Reviewed-on: https://code.wireshark.org/review/5380
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I783df2ddc98da1c78020837a32005ea143321990
+    Reviewed-on: https://code.wireshark.org/review/16081
+    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 36837a2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 17 23:22:08 2014 +0100
+commit 30f7434
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 22 21:29:20 2016 -0700
 
-    MIPv6: display Experimental Mobility Message Data as such
+    Squelch some 64-bit-to-32-bit-shortening warnings.
     
-    Bug: 10703
-    Change-Id: I9b16f503418d7464234be3c772b5dae3fb5eb7a9
-    Reviewed-on: https://code.wireshark.org/review/5378
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I64f833abd11d3b2511c235bb353cb5fb7b813b7f
+    Reviewed-on: https://code.wireshark.org/review/16085
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1dec509
+commit 300e055
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Nov 17 16:43:39 2014 -0800
+Date:   Wed Jun 22 12:44:02 2016 -0700
 
-    voip_calls: Move to ui.
+    Qt: Use queued signals+slots for filter actions
     
-    Move voip_calls.[ch] to ui. Add callbacks to voip_calls_tapinfo_t.
-    Remove unused function definitions.
+    Many of our dialogs can send an "apply this display filter" signal to
+    the main window. Applying a display filter in turn creates a nested
+    event loop via cf_read+update_progress_dlg. If the "apply" signal+slot
+    is directly connected (which is the default, and which means we're
+    calling into a function table) we can close the dialog while the signal
+    is firing, which means we return into a deleted object.
     
-    Change-Id: Ib12db7053d53afa81ef2a66dc0cfe681bc624dd2
-    Reviewed-on: https://code.wireshark.org/review/5379
+    Make all of the filterAction signals+slots queued instead of direct.
+    
+    Bug: 12523
+    Change-Id: Ica331054c0aa52a7f33bd8df1fa65ecd09fdc292
+    Reviewed-on: https://code.wireshark.org/review/16080
     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 a07f081
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 16 11:32:11 2014 -0800
+commit 933c079
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Thu Jun 16 14:03:04 2016 +0200
 
-    voip_calls: Get rid of global variables.
-    
-    Move the members of voip_rtp_tapinfo_t to voip_calls_tapinfo_t. Move a
-    bunch of formerly static variables there as well. Note that we might
-    want to make them private again at some point. Remove launch_count. It
-    appeared to be unused.
+    HTTP: Split URI into path and query. Tokenize parameters.
     
-    Wrap the individual registration routines in voip_calls_init_all_taps.
-    Wrap the removal routines in voip_calls_remove_all_tap_listeners.
+    Split a HTTP URI into path and query.
+    Tokenize the parameters of a query.
     
-    Move voip_calls_get_info() to voip_calls_dlg.c. Make it static.
-    
-    Change-Id: I58f9d91f55cfb5e4b0c048a5a1d5d4b947f4641b
-    Reviewed-on: https://code.wireshark.org/review/5372
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Bug: 12514
+    Change-Id: I9892914eba9737c9751936ce62e63497aba61c61
+    Reviewed-on: https://code.wireshark.org/review/15971
+    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 5c7c701
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 17 19:10:14 2014 +0100
+commit fea6e73
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Fri Jun 17 20:41:31 2016 -0400
 
-    802.11: Enhance Supported Operating Classes
+    RTP player: increase the maximum number of silence frames to 30 minutes worth.
     
-    * Use expert_info to display warning about length (Remove proto_tree_add_text)
+    The BadAlloc X11 crash I reported in bug 4119 (which is why the limit was as
+    low as it was) has long since been fixed thanks to
+    bug 2630/I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a so we can now deal with
+    more silence frames.
     
-    Change-Id: I36ce6b6fc1138c53621da4913e23f9f1ceaaca50
-    Reviewed-on: https://code.wireshark.org/review/5369
+    Change-Id: I0127381e71e497560e0f23af04f9d96af1ed6335
+    Ping-Bug: 5902
+    Ping-Bug: 4119
+    Ping-Bug: 2270
+    Reviewed-on: https://code.wireshark.org/review/16003
+    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 4b63d9f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 17 19:03:46 2014 +0100
+commit bcae998
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 22 14:41:16 2016 -0700
 
-    802.11: Enhance Extenede Channel Switch Announcement
+    Qt: Support the -j, -J, and -l command line flags
     
-    * Use expert info to display warning about launch (remove proto_tree_add_text)
-    * Remove a check about Unknown data (Not need)
+    Add support for -j, -J, and -l. Mark the -m flag deprecated.
     
-    Change-Id: I3ec1d0f5b955019cfe43141df5f712eb1446dce3
-    Reviewed-on: https://code.wireshark.org/review/5368
+    Bug: 12546
+    Change-Id: Ic44b3997840018e5d571aa1813a1646bce11d4a6
+    Reviewed-on: https://code.wireshark.org/review/16083
+    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 f4ad915
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 17 21:43:36 2014 +0100
+commit 18a900f
+Author: John A. Thacker <johnthacker@gmail.com>
+Date:   Mon Jun 20 16:29:49 2016 -0400
 
-    H248: Fix Dereference of null pointer found by Clang analyzer
+    Editcap: Fix setting of max_packet_number
     
-    Also fix some indent issue
+    editcap -r only sets max_packet_number to the earliest, instead of latest,
+    packet or end of range selection. This changes it to the proper test.
     
-    Change-Id: I262bdddd031fec6a0f91b7172bb2d67be3c33000
-    Reviewed-on: https://code.wireshark.org/review/5370
+    Bug: 12547
+    Change-Id: I81772962b00fc6566ccead4fb44c6626a47fff31
+    Reviewed-on: https://code.wireshark.org/review/16045
+    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 da69b51
+commit 63027fc
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 17 21:59:14 2014 +0100
+Date:   Tue Jun 21 15:31:39 2016 +0200
 
-    DECT: ensure that bfield_data buffer is always fully initiated
+    Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dll
+    
+    This aligns the name with what is done for other Wireshark shared libraries.
+    Moreover it allows to compile a wiretap plugin once per major release, without
+    the need to recompile it each time ${PROJECT_VERSION} changes (each nightly
+    build / official release).
     
-    Bug: 10710
-    Change-Id: I444bc4ff7e542a8aa5ac8e20bac44a823ac74cfd
-    Reviewed-on: https://code.wireshark.org/review/5371
+    Change-Id: I53c82277223a4f323079cf695168ac85c2fba523
+    Reviewed-on: https://code.wireshark.org/review/16058
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-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 7a7a763
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Nov 17 21:12:54 2014 +0100
-
-    cmake:
-      Avoide rebuilding the guides each and every time.
-      Don't print the single file guides to stdout.
-    
-    Change-Id: Ie94fc4b24676e9abc7258c4ea1c7fd3049a96fb6
-    Reviewed-on: https://code.wireshark.org/review/5367
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 4a86d62
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Nov 17 21:05:11 2014 +0100
+commit a9a306f
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 22 01:28:48 2016 -0400
 
-    Use ntoh24 instead of less readable and less correct code.
-    Remove redundant / wrong comments.
-    Add two small (helpful) comments :-)
+    Don't close Wireshark (GTK) if user cancels Save on Close.
     
-    Change-Id: I9c5451587d744a8418e6a90139b771a055e93387
-    Reviewed-on: https://code.wireshark.org/review/5366
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Bug: 9635
+    Change-Id: I4a6e3ca676f1c1096521c0a8147a1459777c92fa
+    Reviewed-on: https://code.wireshark.org/review/16075
+    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 82bb363
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 17 17:10:36 2014 +0100
+commit 92ea291
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 22 10:56:07 2016 -0400
 
-    LLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Don't close Wireshark (Qt) if user cancels Save on Close.
     
-    Change-Id: I8c750ed9ad775b9be9d12050d200d7f1b4ddb86e
-    Reviewed-on: https://code.wireshark.org/review/5365
+    Bug: 9635
+    Change-Id: I8c73c839419cd4bcb850824ffb42bf72eed50b19
+    Reviewed-on: https://code.wireshark.org/review/16076
+    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 3ce0167
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Nov 17 13:36:17 2014 +0100
+commit d9fb7f9
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jun 20 09:41:10 2016 -0700
 
-    [BSSMAP] de_mid() used with wrong length.
+    Handle ENAMETOOLONG.
     
-    Change-Id: Ia64f254d85845ff39eacc7a339fdfa646ff9bb50
-    Reviewed-on: https://code.wireshark.org/review/5364
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    g_strerror doesn't appear to handle ENAMETOOLONG. Check for it ourselves.
+    
+    Change-Id: Icd113a81e8d95bb3c84c91bb420a1a6a19bf5d40
+    Reviewed-on: https://code.wireshark.org/review/16041
+    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: Michael Mann <mmann78@netscape.net>
 
-commit 3815b14
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 17 10:44:36 2014 +0100
+commit be303c2
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 22 16:26:56 2016 -0700
 
-    E212: fix bytes highlighting when dissecting the high nibble variant
+    No GeoIP, no need for geoip_none_.
     
-    Change-Id: I376dcb333f7768242dbdb73313870e1e22d959ff
-    Reviewed-on: https://code.wireshark.org/review/5362
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I6fb328d07718d2ff7a7d6008c936b7478ea6db3f
+    Reviewed-on: https://code.wireshark.org/review/16084
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit bea106c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 14 15:12:06 2014 -0500
+commit f9cf660
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 22 10:56:30 2016 -0700
 
-    Eliminate proto_tree_add_text
+    Qt: Fix crash in Conversations and Endpoints dialogs
     
-    Also some other cleanup to simplify dissector logic.
+    Don't assume that conv_item_t or hostlist_talker_t pointers never
+    change. GArrays can reallocate their data, and in our case this can
+    happen when we have more than 10,000 items (which is the size that the
+    conversation table code passes to_array_sized_new).
     
-    Change-Id: Ia84300b7eadafe292361014dd0e565ec250cae44
-    Reviewed-on: https://code.wireshark.org/review/5311
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Bug: 12288
+    Change-Id: I88e58be830e35dde272f81fe9250b054fb87facf
+    Reviewed-on: https://code.wireshark.org/review/16078
+    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>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f3f833c
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Nov 11 21:05:03 2014 +0100
+commit 692e2b6
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 22 21:08:57 2016 +0200
 
-    display filter: the body of a range should only be
-    a string, a field name or another range - not an unparsed element
+    SSH: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Bug: 10690
-    Change-Id: I126143636c940cc73ed6467660f0a573209e2ae9
-    Reviewed-on: https://code.wireshark.org/review/5243
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: If084278acfeb82ae7c91aefff9035f156e8f4f15
+    Reviewed-on: https://code.wireshark.org/review/16079
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Kenny Root <kenny@the-b.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 25f950e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 16 18:25:56 2014 -0800
+commit e82d0ae
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jun 21 16:23:04 2016 -0700
 
-    Add tshark -G dissector-tables to dump a list of dissector tables.
+    Qt: Make the syntax line edit less greedy.
     
-    That list doesn't show the entries in the dissector tables, just
-    information about the tables themselves.
+    In SyntaxLineEdit::event, only grab ShortcutOverride events that have
+    Ctrl+Alt modifiers. When the main window display filter edit has focus
+    this should let us use text editing shortcuts and most main window
+    shorcuts as appropriate. "Most" means everything except for time display
+    formats. We might want to use something other than Ctrl+Alt for their
+    modifiers.
     
-    Clean up some tshark man page issues while we're at it.
+    Bug: 12533
+    Ping-Bug: 12270
+    Change-Id: I61eb86b80b4237e6907d5e50262b8f5c291b27a7
+    Reviewed-on: https://code.wireshark.org/review/16065
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit d46daa1
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Thu Jun 16 15:09:56 2016 -0700
+
+    GTK: Keep display filter applied when switching profiles
     
-    Change-Id: I70beee34110f5c0d58105944dd71105a8400f5ca
-    Reviewed-on: https://code.wireshark.org/review/5360
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 6130
+    Change-Id: I3bcd6aaad33482474e3429e0dcc074973a338fca
+    Reviewed-on: https://code.wireshark.org/review/15992
+    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
+    Tested-by: Balint Reczey <balint@balintreczey.hu>
+    Reviewed-by: 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 57b7227
+commit 0bf1cb2
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 14 15:13:05 2014 -0500
+Date:   Tue Jun 21 22:23:05 2016 -0400
 
-    Eliminate proto_tree_add_text by formatting field hf_opcua_ByteString in a few places.
+    Add address_to_bytes API.
     
-    Change-Id: I9606aa36b7d7b6bb2ef2e7685e6629163ca83ef7
-    Reviewed-on: https://code.wireshark.org/review/5312
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    This will copy an address's "byte format" into a buffer.  The original
+    intended design is for export_pdu functionality, which tries to do
+    this "manually" for many address types (and creates undesired dependencies)
+    
+    The default functionality if a "byte format function" isn't provided
+    (currently the case for all address types) is a memcpy of the address
+    data.  Providing "address to byte" functions to aid export PDU
+    functionality will be provided later.
+    
+    Change-Id: I3703f9e617a8cef09165ad53a0f98c6372676b9b
+    Reviewed-on: https://code.wireshark.org/review/16070
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 14bc6d8
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Sun Nov 16 12:17:40 2014 -0500
+commit c664f72
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jun 21 15:13:30 2016 -0700
 
-    Remove some ununused/unmatched <resources/> tags.
+    Qt: Clear the packet list selection before freezing it.
     
-    Change-Id: I0f8e4381b27d1defeb5980692823d297d2f48bab
-    Reviewed-on: https://code.wireshark.org/review/5349
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Call selectionModel()->clear() before removing our model. This will
+    hopefully make sure we don't end up with an invalid selection in
+    selectionChanged().
+    
+    Clear the selection model before clearing the model while we're here.
+    
+    Change-Id: I1007eeaa480afa0fb31dafc15a49ca6c247b30c8
+    Reviewed-on: https://code.wireshark.org/review/16062
+    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: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Kenny Root <kenny@the-b.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit cacbffe
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 16 21:58:36 2014 +0100
+commit debbf7e
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 21 20:30:35 2016 -0400
 
-    PortableApps: ensure that the personal folder is set to the App directory
+    Move AT_VINES address type to VINES dissector.
     
-    Otherwise the portable version ends up loading the user local personal profile
+    proto.c still has to deal with FT_VINES, but maybe that
+    can be refactored to the dissector too.
     
-    Change-Id: Ib670c065319b0dd9673f239ae9459f6ee530f69e
-    Reviewed-on: https://code.wireshark.org/review/5351
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Iee04eed3b75f91cb62bb7b625dd44baeeb9aebb3
+    Reviewed-on: https://code.wireshark.org/review/16069
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e26e1dc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:12:40 2014 +0100
+commit e7b78eb
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 21 20:06:01 2016 -0400
 
-    BATMAN: fix indent and encoding args
+    Move AT_USB to inside USB dissector.
     
-    use tabs for indent and use fix-encoding-args tools
+    This required some hacking in the conversation table handling, but
+    still seemed worth it as USB address is not widely used.
+    Maybe a "is_stringlike" property for address types...
     
-    Change-Id: I5e066c6cbc429021cf21a55d5ffd5b60718ad5f8
-    Reviewed-on: https://code.wireshark.org/review/5340
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I628a15c17cb1f595bb292130867adbc5bea0f41a
+    Reviewed-on: https://code.wireshark.org/review/16068
+    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 9d0085f
+commit 3ed06ec
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 16 15:21:12 2014 -0800
+Date:   Tue Jun 21 16:34:36 2016 -0700
 
-    Make sure the NLPID appears in the protocol tree.
+    The C standard requires <stdlib.h> for getenv() and abort().
     
-    For protocols for which the NLPID is not considered part of the PDU, put
-    the NLPID into the protocol tree ourselves.
+    You might be able to get away with not including it on some or all
+    UN*Xes, but you can't do so on Windows with MSVC.
     
-    Bug: 10706
-    Change-Id: I2676d1934dd468ec755a6f94d95a23f025ba0f25
-    Reviewed-on: https://code.wireshark.org/review/5358
+    Change-Id: Id2de70745e2a6e8dedc005a55030f3d3fcb54a69
+    Reviewed-on: https://code.wireshark.org/review/16064
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 08a9478
+commit 1b1296a
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Wed Jun 22 00:23:38 2016 +0200
+
+    More helpful failure when registration fails.
+    
+    Change-Id: I3c574c504cc9166d04b5b725a6a393767a58a280
+    Reviewed-on: https://code.wireshark.org/review/16063
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+
+commit 6cc90dd
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 16 14:59:23 2014 -0800
+Date:   Tue Jun 21 11:21:33 2016 -0700
 
-    Fix a comment to reflect reality.
+    As with dissector_add_uint(), so with dissector_add_{string,guid}.
+    
+    Improve the error message for a null disssector handle.
     
-    Change-Id: I812b0246368266c76f7fe9ef355619603c5d37b0
-    Reviewed-on: https://code.wireshark.org/review/5357
+    Fix indentation while we're at it.
+    
+    Change-Id: I1cb2f8ac52e56fc98f6b3ad981018f571e5a7bf0
+    Reviewed-on: https://code.wireshark.org/review/16060
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7b558dd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 2 16:15:31 2014 +0100
+commit d970da4
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Tue Jun 21 19:56:00 2016 +0200
 
-    Add unused-const-variable (enable by default on new clang release)
+    Slightly improve error message in case of initialization errors.
     
-    Change-Id: I1d882e02188ba38ec1b5583c5933d0c92f0539e4
-    Reviewed-on: https://code.wireshark.org/review/5068
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Change-Id: Icb5d4f0f3bc60970737abbf62044f4550e8d3ca3
+    Reviewed-on: https://code.wireshark.org/review/16059
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 05acb67
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:28:51 2014 +0100
+commit c3f3bd7
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Mon Jun 20 11:03:40 2016 +0200
 
-    mcast_stream: fix indent (use 4 spaces)
+    tshark JSON and Elasticsearch output fix
     
-    Add also modelines info
+    Fixed json and ek escape function
+    Fixed -j protocol filter to do exact match
+    Fixed -T json to correctly close json
+    Added -j protocol filter also to pdml output
     
-    Change-Id: Idea65bfa25ce8a379c590074ab89a06f935c6648
-    Reviewed-on: https://code.wireshark.org/review/5344
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Bug: 11754
+    Change-Id: I02f274e4a5a02346922b37bbe946c10340c242ea
+    Reviewed-on: https://code.wireshark.org/review/16034
+    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: Guy Harris <guy@alum.mit.edu>
 
-commit 7213ad5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:42:32 2014 +0100
+commit df231d9
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jun 21 15:30:33 2016 +0200
 
-    rtp_stream: fix indent (use 4 spaces)
-    
-    Add also modelines info
+    libcodecs and libwsutil are DLLs, not static libraries
     
-    Change-Id: I4c4c6d7e292ba387aacb3f71afcac756b2875847
-    Reviewed-on: https://code.wireshark.org/review/5345
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I4486f35e07c72d4ca35d5649de25d0c9abd2a964
+    Reviewed-on: https://code.wireshark.org/review/16057
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit b867baf
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:15:27 2014 +0100
+commit 8a0b7cc
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Jun 21 15:20:16 2016 +0200
 
-    BATMAN: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Add a couple of vendor defines.
     
-    Change-Id: I6cfabc18921397002a2303f3511fa51bf5b41956
-    Reviewed-on: https://code.wireshark.org/review/5341
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I252b4f892a539c7fa585615ef636fc26de356bf7
+    Reviewed-on: https://code.wireshark.org/review/16055
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9f0fb57
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:00:35 2014 +0100
+commit 6b01909
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Jun 21 15:14:48 2016 +0200
 
-    RADIUS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    [H248-Q1950] Correct signal ids.
     
-    Change-Id: I5127b737c0d9db08c61a70bb6c16fef030d39f83
-    Reviewed-on: https://code.wireshark.org/review/5339
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Iafb030313ed3b715a09146d131dfb4ffdcb7961a
+    Reviewed-on: https://code.wireshark.org/review/16054
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0cc6a7e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 16 08:06:50 2014 -0800
+commit 57b6bc1
+Author: Anthony Coddington <anthony.coddington@endace.com>
+Date:   Tue Apr 5 14:21:36 2016 +1200
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-11-16]
+    pcap: ERF per-Host ID/Source ID interface support
     
-    Change-Id: Ie677285f75a7ef0390d93469a4f97eaad813fdc0
-    Reviewed-on: https://code.wireshark.org/review/5346
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Add encap_priv pointer to libpcap_t.
+    Initialize erf_priv when ENCAP_ERF.
+    Use erf_populate_interface_from_header() to dynamically create interfaces.
+    Free encap_priv on pcap_close.
+    
+    Ping-Bug: 12303
+    Change-Id: Ieda425ef3e50a124d9c38ee4538aa3644128ce60
+    Reviewed-on: https://code.wireshark.org/review/15362
+    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 7f7d566
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 15:27:06 2014 +0100
+commit d50b981
+Author: Yang Luo <hsluoyz@gmail.com>
+Date:   Thu Jun 16 11:39:32 2016 +0800
 
-    btavdtp: Add missing break;
+    pcap: Add support to "new" Npcap native mode without setting PATH
     
-    Issue found by Clang Analyzer:
-    Value stored to 'codec_dissector' is never read
+    Npcap decided not to add "C:\Windows\System32\Npcap" to
+    system PATH in the installation any more (starting from
+    Npcap 0.07 r14). So this patch needs to be applied, otherwise
+    Wireshark will not find Packet.dll (the error message will
+    only say wpcap.dll is missing, but actually is Packet.dll
+    missing).
     
-    Change-Id: I7a9fc5e3ffd04c77cbbb8d5e5b885d8a29468cfd
-    Reviewed-on: https://code.wireshark.org/review/5330
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Change-Id: Ifd8b6e6d8ecf9866cd37c3368b604de210ff8c7b
+    Reviewed-on: https://code.wireshark.org/review/15959
+    Reviewed-by: Yang Luo <hsluoyz@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 b12be84
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 15 21:24:27 2014 -0500
+commit 6ccee3e
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Jun 21 08:55:14 2016 +0200
 
-    Remove file_type_subtype member from packet_info.
+    bthci: Show unknown ocf as undecoded
     
-    Just pass the necessary data to the frame dissector.
+    Don't show unknown ocf values as unexpected parameters.
     
-    Change-Id: I1a4bab32f7b5e28f4e7707794d71b04dab388908
-    Reviewed-on: https://code.wireshark.org/review/5328
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I08a6c8c20d6382a847f0a2969e4c523a2873dd6f
+    Reviewed-on: https://code.wireshark.org/review/16048
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit d1696a6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 15 18:47:06 2014 -0500
+commit 6ee5464
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Jun 21 08:52:51 2016 +0200
 
-    "Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more obvious where in used in hopes that it can be eliminated through passing dissector data (or methods other than using packet_info)
+    packetlogger: Add some info types
     
-    Change-Id: Ib0e7efc123a3f9c06f58b5579c3c25b18818205c
-    Reviewed-on: https://code.wireshark.org/review/5326
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Add Kernel, Kernel Debug and Error info types.
+    
+    Change-Id: I04547a426b69adde5186e8315a08f4648c1e7837
+    Reviewed-on: https://code.wireshark.org/review/16047
+    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 9a5cdac
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Fri Jun 17 19:30:57 2016 +0200
+
+    debian-setup: add additional params to apt-get.
+    
+    Can be used to pass params like -qq and -y for automated installations,
+    like in travis-ci.
+    
+    Change-Id: Iddf18829f09ce6b16c1c71264adab38d0a893fe6
+    Reviewed-on: https://code.wireshark.org/review/15999
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
 
-commit f92ed4d
+commit e6481a9
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 15 20:35:51 2014 -0500
+Date:   Tue Jun 21 01:19:47 2016 -0400
 
-    Remove ipproto member of packet_info.
+    Check for negative nanoseconds in io,stat tap.
     
-    All situations can be handled with "shimmed" dissector functions.
+    Seconds were already being checked for negative values, but if there is
+    only a fraction of a second, the negative check wasn't being done,
+    which led to bad results.
     
-    Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8
-    Reviewed-on: https://code.wireshark.org/review/5327
+    Bug: 9014
+    Change-Id: I820e0a4b1384330acebf4a632a04f7840db2288b
+    Reviewed-on: https://code.wireshark.org/review/16046
     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>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3b8ed36
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Nov 14 17:42:44 2014 +0100
+commit f76af2e
+Author: Jeff Layton <jlayton@redhat.com>
+Date:   Mon Jun 20 15:10:32 2016 -0400
 
-    DNS: NAPTR RR Replacement Length is incorrect
+    ceph: c_dissect_sockaddr doesn't need the "data" pointer
     
-    It seems the Replacement Length field calculated by Wireshark (which Wireshark calls "rReplacement Length"), is the length of the first label of the DNS name in the Replacement, instead of the entire DNS name length.
-    
-    Issue found by Boaz
-    
-    Bug:10700
-    Change-Id: I8b726f3a3bf316d688a40c3ade100d255ca3be42
-    Reviewed-on: https://code.wireshark.org/review/5300
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I8d4ca2e46a556e32e594610fd26c72840783601e
+    Signed-off-by: Jeff Layton <jlayton@redhat.com>
+    Reviewed-on: https://code.wireshark.org/review/16042
+    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 4960171
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Nov 15 10:36:16 2014 -0800
+commit fa20f5c
+Author: Rudra Rugge <rrugge@juniper.net>
+Date:   Wed Jun 15 11:32:57 2016 -0700
 
-    VoIP calls: Fixup whitespace.
+    Add support for Opencontrail virtual network
     
-    Set modelines and reindent to match the files in the top-level ui
-    directory.
-    
-    Change-Id: I7ea221e76a4b0ad3b6bcf7a3c8b4645c16aecbba
-    Reviewed-on: https://code.wireshark.org/review/5325
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 51c5b7a
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Nov 15 09:18:06 2014 -0800
-
-    VoIP calls: Start separating common and GTK+-dependent code.
-    
-    Remove more calls to voip_calls_get_info. Get rid of the global cfile.
-    Lowercase more function names.
-    
-    Change-Id: Ieda779779cce9f05e07c54314bceab4a18bae22f
-    Reviewed-on: https://code.wireshark.org/review/5324
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ia6012e0f6425be069e222538eafb1191b398ec83
+    Reviewed-on: https://code.wireshark.org/review/15930
+    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 7f3f4a5
-Author: Robert Grange <robionekenobi@bluewin.ch>
-Date:   Sat Nov 15 11:35:09 2014 +0100
+commit 82ed904
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Jan 13 17:49:43 2016 +0100
 
-    paquet-mq: Eliminiate proto_tree_add_text
-    
-    Eliminate proto_tree_add_text for Expert Info
-    Improve PCF Parameters numeric value display
+    [RNSAP]Update to V13.1.0 (2015-12)
     
-    Change-Id: Ibc259ba05d0591d434e7638d91d6943101d45305
-    Reviewed-on: https://code.wireshark.org/review/5080
-    Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I6cb7099ac691d68ddae7be59bf37130c8affad42
+    Reviewed-on: https://code.wireshark.org/review/13263
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d550b17
-Author: Gerald Combs <gerald@zing.org>
-Date:   Fri Nov 14 18:43:28 2014 -0800
+commit a83f88f
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Jun 20 13:57:11 2016 +0200
 
-    VoIP calls: Use our tap offsets.
-    
-    Add convenience functions to convert between tap IDs and tapinfo
-    pointers. Use them to get rid of some calls to voip_calls_get_info().
+    [pre-commit-ignore] Dont check the asn1 files they are imported verbatime
+    from standards documents in most cases.
     
-    Lowercase function names. Remove more exit()s.
-    
-    Change-Id: I187fdc505bc22cc05edafed9e97ede8279ea53f9
-    Reviewed-on: https://code.wireshark.org/review/5321
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ie9db1a1431a201dc374f800b5118a199dcb51b9c
+    Reviewed-on: https://code.wireshark.org/review/16035
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0be9e7d
+commit 88b7a48
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 19:37:32 2014 -0800
+Date:   Sun Jun 19 23:54:33 2016 -0700
 
-    0.0 is a double, 0.0f is a float.
+    Pull the options structure initialization into commandline_other_options().
     
-    Change-Id: I882bbda2c579cfd7a1b96ce190541262193405e0
-    Reviewed-on: https://code.wireshark.org/review/5320
+    Change-Id: I931cde27a81566dfa0ce6e5c9307bfc1a4d5fe54
+    Reviewed-on: https://code.wireshark.org/review/16033
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 3428361
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Nov 14 19:30:42 2014 -0800
-
-    Fix a pointer type.
-    
-    Change-Id: I5cc67fa320b3241d6793575d59e49160ef40b260
-    Reviewed-on: https://code.wireshark.org/review/5319
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 3275ba2
-Author: Gregor Miernik <gregor.miernik@hytec.de>
-Date:   Tue Nov 4 11:53:39 2014 +0100
-
-    LLDP: Dissector for Hytec specific extensions added
-    
-    It provides dissection of objects with additional neighbor and link information
-    defined by Hytec (pcap example available on wiki.wireshark.org/HYTEC).
-    Also OUI of "Hytec Geraetebau GmbH" added.
-    
-    Change-Id: I92119e46fd5f4c4b385ac3df3170a4766fe056b7
-    Reviewed-on: https://code.wireshark.org/review/5107
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1e2a3dc
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Nov 14 13:53:58 2014 -0800
-
-    VoIP calls: Clean up tap registration and removal.
-    
-    Start moving away from a global voip_calls_tapinfo_t. Pass the
-    voip_calls_tapinfo_t struct address to each registration and removal
-    routine.
-    
-    All of the tap registration and removal routines are called at the same
-    time. Replace the individual registration tracking booleans with a
-    central one.
-    
-    Calling exit() from the GUI is rude. Don't do that.
-    
-    Change-Id: I9535002e2905a45a8cfc9643590b5d2d360ffc24
-    Reviewed-on: https://code.wireshark.org/review/5318
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 62fd2ac
+commit 7795082
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 14 15:18:23 2014 -0500
+Date:   Sun Jun 19 17:53:59 2016 -0400
 
-    Eliminate proto_tree_add_text from some plugin dissector files.
+    Add display filter completion suggestions to color filters.
     
-    Change-Id: Ib2d900833a8763307be6b1cfc8df20d7019d2706
-    Reviewed-on: https://code.wireshark.org/review/5313
+    Change-Id: I84d890b55c72e4427ceb2d64e4a7888c07c030f5
+    Reviewed-on: https://code.wireshark.org/review/16024
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ba3bc1e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Nov 14 13:15:38 2014 -0800
-
-    VoIP calls tap ID cleanup.
-    
-    Remove all of the public dummy members from voip_calls_tapinfo_t. Use
-    pointer arithmetic to generate private, unique IDs instead.
-    
-    We weren't removing the SUA listener. Do so. Use the correct M3UA ID.
-    
-    Change-Id: I8e8cdb6addbc4868aebc004be20a2f57b4acf75b
-    Reviewed-on: https://code.wireshark.org/review/5315
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 225c86f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 15:59:38 2014 -0800
-
-    Do the "-z help" processing separately, and do it for Wireshark as well.
-    
-    Yes, Wireshark does a bunch of GUI stuff, and then takes the window down
-    before printing the help, but the same is true for some command-line
-    error messages as well.
-    
-    Change-Id: Id501468416c83308e4c0a9e7a66116d8d33a9d84
-    Reviewed-on: https://code.wireshark.org/review/5317
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3554580
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 12:29:04 2014 -0800
-
-    It's not missing, it's passed on.
-    
-    Change-Id: Id1b1c7501f357667abb961948afdd816e13a7ad3
-    Reviewed-on: https://code.wireshark.org/review/5314
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1b4d51e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 12:24:51 2014 -0800
-
-    Update Debian symbol files.
-    
-    Change-Id: Iee66cf87d742780740b572b39c8ecf94f93dc142
-    Reviewed-on: https://code.wireshark.org/review/5310
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 99b6afb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 12:21:12 2014 -0800
-
-    Add a name field to tap_param, for use in error messages.
-    
-    Change-Id: Ia4317b61ff30e269eba0ee2ea2c46f1668544b1b
-    Reviewed-on: https://code.wireshark.org/review/5309
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 04ab731
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 12:05:31 2014 -0800
-
-    The registered -z parameter string shouldn't end with a comma.
-    
-    If it ends with a comma, then, if you don't provide any parameters, you
-    get a "no such -z statistic" message followed by a list of available
-    statistics.
-    
-    If it doesn't end with a comma, then, if you don't provide any
-    parameters *and* a parameter is required, you get a usage message, which
-    is more useful - and, in many of those cases, a parameter *isn't*
-    required.
-    
-    Change-Id: I81275ea41ad4611d8210ca3cb07c09f0abde58f2
-    Reviewed-on: https://code.wireshark.org/review/5308
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4729e13
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 11:25:04 2014 -0800
-
-    Add an optional flag and a type for UUID parameters for stat taps.
-    
-    For future use, with common code to parse the -z argument.
-    
-    Change-Id: Ib2a11bd5c91b5ac48ced2cd2d112b97c301ff72a
-    Reviewed-on: https://code.wireshark.org/review/5307
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 42c6e57
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Nov 14 12:17:36 2014 -0700
-
-    Update my e-mail address again.
-    
-    Change-Id: I0083bbf84658dbb0d4cef91e9e8f5855b8a2ba4f
-    Reviewed-on: https://code.wireshark.org/review/5306
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit c3582a6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:55:50 2014 -0800
-
-    There's nothing GTK+ about TShark.
-    
-    Remove gtk from routine names in CLI taps.
-    
-    Change-Id: I0846da9b1e8119ed966b441cb1ca0ce1820fd1c8
-    Reviewed-on: https://code.wireshark.org/review/5305
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4d3c4c4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:51:40 2014 -0800
-
-    Rename stat_cmd_args.[ch] to stat_tap_ui.[ch].
-    
-    The intent is to handle more than just command-line arguments; reflect that.
-    
-    Change-Id: Ia10efda85a9d11c6579d1bec6f789cee30d9e825
-    Reviewed-on: https://code.wireshark.org/review/5304
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0dae81b
-Author: Irene Ruengeler <ruengeler@wireshark.org>
-Date:   Fri Nov 14 10:06:51 2014 +0100
-
-    Allow SCTP graphs to resize with the window they're in.
-    
-    Bug: 10698
-    Change-Id: I3304bd36945619aeb405c74917f21de3faa3fcbb
-    Reviewed-on: https://code.wireshark.org/review/5284
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit a21436e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:42:26 2014 -0800
-
-    tap_ui -> stat_tap_ui.
-    
-    The old routine had stat_ in the name, as the expectation was that they
-    were for statistics taps; that's still the expectation, so have stat_ in
-    the data structure and routine names.
-    
-    Change-Id: Ic98d011012b8641173d41fa0ec4f4e625614370a
-    Reviewed-on: https://code.wireshark.org/review/5303
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0e64efc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:35:42 2014 -0800
-
-    Use G_GUINT64_FORMAT to format a guint64.
-    
-    A 64-bit integer isn't necessarily a long, it might be a long long.  Use
-    G_GUINT64_FORMAT to format it.
-    
-    Make it a guint64 while we're at it - the field is a FT_GUINT64.
-    
-    Change-Id: I7ee855905ea77347576005441824b1c4630f5659
-    Reviewed-on: https://code.wireshark.org/review/5302
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7390516
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:31:04 2014 -0800
-
-    For tap UIs, register a list of parameters and some menu information.
-    
-    The intent here is to centralize more UI information so that we can move
-    more tap UI stuff to common code.  This is a beginning.
-    
-    Change-Id: Ic35ac0c01bc7b942aab88177db4065847a5e6c30
-    Reviewed-on: https://code.wireshark.org/review/5301
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 09f0d2c
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 12 23:38:40 2014 -0500
-
-    hiqnet: Improve dissection for hiqnet over TCP or UDP
-    
-    -- Use tcp_dissect_pdus() for hiqnet over tcp so as to properly
-        handle hiqnet PDUS is a TCP stream of data;
-    
-    -- Handle possible multiple hiqnet PDUs in a UDP payload.
-    
-    -- Add Fixme: re multiple hiqnet PDUs in a frame.
-    
-    Change-Id: I3527c6ea13571d16bcf23dd3771d0a89734a7c5a
-    Reviewed-on: https://code.wireshark.org/review/5267
-    Reviewed-by: Raphaël Doursenaud <rdoursenaud@free.fr>
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit a55d18e
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 12 22:04:37 2014 -0500
-
-    hiqnet: Simplify code somewhat; Adjust the "names" and display of certain fields.
-    
-    Specifically: Use proto_tree_add_bitmask() to show the "flags" and
-                  "categories" bitfields (instead of building the fields
-                  display "by hand").
-                  The bitfield display changed as follows:
-                  - A bitfield with all bits=0 will have a detailed
-                    dissection tree; (for both 'flags' & 'categories');
-                  - The 'categories' individual bitfields are now
-                    displayed as FT_BOOLEAN (not FT_UINT32).
-    
-    Change-Id: Icd35698aae492b81b340d08030e6a1563f1640ae
-    Reviewed-on: https://code.wireshark.org/review/5266
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 9a1df71
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 14 15:39:45 2014 +0100
-
-    [S1AP) Wrong tree used
-    s1ap.cnf:547:14: error: variable 'subtree' set but not used
-    
-    Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e
-    Reviewed-on: https://code.wireshark.org/review/5299
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 56fa29e
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 14 14:53:02 2014 +0100
+commit 5c1d58b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 19 17:47:27 2016 -0400
 
-    [S1AP] Let the A21 dissector do further dissection of Cdma2000SectorID
+    Add field completion suggestions when adding a Display filter or Y Field to the IO Graph
     
-    Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb
-    Reviewed-on: https://code.wireshark.org/review/5298
+    Bug: 11899
+    Change-Id: I7cee36581dc773daa691dad10500124ab66520bc
+    Reviewed-on: https://code.wireshark.org/review/16023
+    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 d6f2392
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Nov 14 13:39:29 2014 +0100
-
-    Fix declaration in btavrcp
-    
-    Change-Id: I47e4ad2baa7ca4c48e8c0eea472e568fc06d3386
-    Reviewed-on: https://code.wireshark.org/review/5297
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit d7cc141
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Nov 12 12:00:46 2014 +0100
+commit 66bb67c
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Jun 18 12:13:15 2016 -0700
 
-    Bluetooth: Ubertooth: Update to the latest firmware
+    GTK+: Truncate simple_message_box messages.
     
-    Changelog:
-    - add some assign numbers
-    - implement new type of usb_rx_packet: LE_PROMISC
+    In do_simple_message_box, build our primary message using
+    g_string_vprintf instead of g_strdup_vprintf. Truncate both the primary
+    and secondary messages so that we end up with merely annoyingly wide
+    dialogs instead of insanely wide ones.
     
-    Change-Id: Iffe01a50f873221c695f16a76c1954d6c82d73df
-    Reviewed-on: https://code.wireshark.org/review/5289
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
+    Bug: 9761
+    Change-Id: I93ff76344c0da7d97cce5180ed9ecf9349190f6f
+    Reviewed-on: https://code.wireshark.org/review/16005
+    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: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9952e7c
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 14 12:54:33 2014 +0100
+commit e3289a8
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Fri Jun 17 13:43:20 2016 -0700
 
-    [BSSMAP] Handle vendor specific encoding of "Layer 3 Message Contents".
+    qt: reset the column sorting when a new file is loaded
     
-    Change-Id: I351bc0a6a8ae636b2f888a80f61e526096a61b64
-    Reviewed-on: https://code.wireshark.org/review/5295
+    Bug: 12541
+    Change-Id: I75656d4027dd39e1f97c4bcd38e0dea6fe2de297
+    Reviewed-on: https://code.wireshark.org/review/16002
+    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 e83c7f0
+commit 92f4c7c
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Nov 14 10:07:52 2014 +0100
+Date:   Sun Jun 19 16:52:50 2016 +0200
 
-    NAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFE
+    Add JSON export to Qt/GTK UI
     
-    Bug: 10699
-    Change-Id: I0f359639d5836f557370ab6d6aad45faa4417b6e
-    Reviewed-on: https://code.wireshark.org/review/5285
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I5ff46a40cdb1f8f41565d2aa54c6f9e61d397e3a
+    Reviewed-on: https://code.wireshark.org/review/16013
     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 f172791
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Nov 2 18:55:40 2014 +0100
-
-    Translations: Update Polish translation
-    
-    All messages are translated now.
-    
-    Tłumaczenie Wiresharka jest teraz kompletne. Zachęcam do testowania
-    i wytykania błędów.
-    
-    Change-Id: Iaffb2e581c765b5b3dff7750f878e6391539ebd6
-    Reviewed-on: https://code.wireshark.org/review/5293
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit f1dee59
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Nov 12 11:57:12 2014 +0100
-
-    Bluetooth: A2DP: Add AVRCP song position indicator
-    
-    "sbc.avrcp_song_position" can be used to determine time synchronization
-    between AVRCP and A2DP. It is updated on every
-    AVRCP PlaybackPositionChanged. Also provide version for aptx.
-    
-    Change-Id: I48cd49f0fee54131a738290e2a70a24d33ba1d22
-    Reviewed-on: https://code.wireshark.org/review/5290
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit ad1977b
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Nov 13 10:52:16 2014 +0100
-
-    Qt: Fix non-translate-able text
-    
-    Change-Id: I8c2376117ca1ac92c341ba938929af2d13e23f72
-    Reviewed-on: https://code.wireshark.org/review/5291
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 6d678ff
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Nov 13 19:42:36 2014 +0100
-
-    Qt: Fix typo
-    
-    Change-Id: Idc2b945ac3bd5de961cc9c581398dc12f6831070
-    Reviewed-on: https://code.wireshark.org/review/5292
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 38218df
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Nov 7 15:41:29 2014 +0100
-
-    Bluetooth: AVRCP: Improve command/response trancing
-    
-    Make command/response tracking field filterable and jumpable.
-    
-    Change-Id: Ib0dfc9ea9954f8d29d06ceda3d44a7f95c94bc53
-    Reviewed-on: https://code.wireshark.org/review/5288
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 5a46f26
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Nov 7 10:47:33 2014 +0100
-
-    Bluetooth: AVRCP: Fix swappend SongPosition and SongLength
-    
-    SongPosition and SongLength are swapped in Info column. Fix it.
-    
-    Change-Id: I4c9bece51dbfe62885e8426a8aef07f336670099
-    Reviewed-on: https://code.wireshark.org/review/5287
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 6e44997
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Nov 3 10:14:28 2014 +0100
-
-    Bluetooth: AVDTP: Add possibility to force decode as APT-X
-    
-    Change-Id: Id99647846c9bc7666f33938c811358576353390d
-    Reviewed-on: https://code.wireshark.org/review/5286
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 2986388
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 12 16:40:02 2014 +0100
-
-    dtd_preparse : fix indent (Use tabs)
-    
-    Change-Id: Iec6ef7109ccea8a164db4f62af9fae1dceba6ae6
-    Reviewed-on: https://code.wireshark.org/review/5282
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2788df9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 12 17:10:40 2014 +0100
-
-    Gtk Utils: fix unknown command tag name 'parm'; did you mean 'param'? (-Wdocumentation)
-    
-    Change-Id: I89f242bf916d22e0a4a665696ec3fe5ee02b8a1f
-    Reviewed-on: https://code.wireshark.org/review/5283
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6e535a8
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 13 20:37:46 2014 -0500
-
-    Multipath TCP checksum requires M flag set as well as enough option length.
-    
-    Bug: 10692
-    Change-Id: I8d9874a2c0a6b98497d43804bcf27a8c7e152a9b
-    Reviewed-on: https://code.wireshark.org/review/5275
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 4a7dd62
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 13 22:38:54 2014 -0500
-
-    Always create a subtree for Mobility options, even if it doesn't have a specific dissection function.
-    
-    Bug: 10618
-    Change-Id: Ic4d52485a6bd96f906b4a0d61b75a31bfad4e8f8
-    Reviewed-on: https://code.wireshark.org/review/5276
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c2e090f
-Author: Ryan Doyle <ryan@doylenet.net>
-Date:   Wed Nov 12 20:36:49 2014 +1100
-
-    Dissector for elasticsearch protocol
-    
-    Provides dissection for the elasticsearch protocol. This includes full
-    dissection of the multicast discovery protocol, the HTTP query interface
-    and partial dissection of the binary protocol.
-    
-    Change-Id: I738fb498976e44fa05168c2bc3a7e842a9e96df9
-    Reviewed-on: https://code.wireshark.org/review/4948
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4cc4315
-Author: Sven Eckelmann <sven@open-mesh.com>
-Date:   Wed Oct 1 18:26:12 2014 +0200
-
-    batadv: Add dissector support for batadv v15
-    
-    The packet format for batman-adv v15 supports:
-    
-     * Complete reordered packet type ids
-     * reordered flags
-     * type-version-length-value data containers
-     * new types for coding packets and unicast transfer of TVLVs
-     * dropped packet types for vis, translation table query and roaming
-     * reordered packet formats
-     * transparent fragmentation of batadv packets
-    
-    Change-Id: I9e6733f9dd6b54eeecda19cf570599161d28b46e
-    Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
-    Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
-    Reviewed-on: https://code.wireshark.org/review/5175
-    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 9cc9028
-Author: Lukas Emersberger <lukas.emersberger@br-automation.com>
-Date:   Fri Oct 17 14:13:06 2014 +0200
-
-    epl: Duplicated Frames
-    
-      Remake of the duplicated frames filter with
-      less memory usage.
-    
-    Change-Id: I7c8694b5ae69c919b866bbc661bad5e3f0a3e1d7
-    Reviewed-on: https://code.wireshark.org/review/4773
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ab7f35d
+commit bea1950
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 13 00:43:17 2014 -0800
+Date:   Sun Jun 19 17:42:14 2016 -0700
 
-    hf_cc_loss is supposed to be a floating-point value, divided by 65535.
-    
-    That's what the code did when it used proto_tree_add_text(); make it do
-    so now.  That squelches a run-time error.
+    Protect some code that's only for Wireshark-with-pcap.
     
-    Reformat the script-added hf_ values while we're at it.
+    Put that code inside #ifdef HAVE_LIBPCAP/#endif.
     
-    Change-Id: I48d16280c523faa3b266e8df37f5e0e0b2827712
-    Reviewed-on: https://code.wireshark.org/review/5270
+    Change-Id: I85768fd49a008341a95ac3c8656e96afa6741fbe
+    Reviewed-on: https://code.wireshark.org/review/16030
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 67f86dd
+commit e79e834
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 12 21:22:05 2014 -0800
+Date:   Sun Jun 19 16:36:57 2016 -0700
 
-    Get rid of spaces before tabs.
+    Move some option checking to common code.
     
-    Change-Id: I70ff250a905ac578d7e3afc63a82a5fcb3983608
-    Reviewed-on: https://code.wireshark.org/review/5269
+    Change-Id: Icff9dacd73ea933c59ed664db05098dd8cb3dbf5
+    Reviewed-on: https://code.wireshark.org/review/16029
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit d1ccc33
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 9 21:13:38 2014 -0500
-
-    Add dissector table for sFlow header dissection.
-    
-    Change-Id: I189a5b2d5f769395fa5e387f8be49b81903fb252
-    Reviewed-on: https://code.wireshark.org/review/5262
-    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 17798bc
+commit fb9a7d4
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 12 21:19:41 2014 -0800
+Date:   Sun Jun 19 15:28:39 2016 -0700
 
-    Handle duplicate attribute and TLV entries specially.
+    Don't assume we successfully read the configuration files.
     
-    For attributes, handle them the same way we handle duplicate vendors.
+    read_configuration_files() can fail and return NULL, so check that
+    commandline_info.prefs_p is non-null before dereferencing it.
     
-    For TLVs, ignore duplicates; they shouldn't happen.
+    Fixes CID 1362778.
     
-    Change-Id: Ie968478c40a9b7848fa8ea25b144eda8656e5874
-    Reviewed-on: https://code.wireshark.org/review/5268
+    Change-Id: I3066769c474d394fbfe548b50d6be704964e59d3
+    Reviewed-on: https://code.wireshark.org/review/16028
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit f8e24c9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Nov 5 23:07:35 2014 -0500
-
-    Eliminate proto_tree_add_text for some dissectors.
-    
-    Change-Id: Ide14bcac0b1563bee4260ac9c1a280ba99e97e71
-    Reviewed-on: https://code.wireshark.org/review/5261
-    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 0515087
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 12 19:01:26 2014 -0800
-
-    Handle new vendors and changes to vendors differently.
-    
-    If, when adding a new vendor, we already find a vendor with the given
-    ID, don't bother adding it to the vendors-by-ID table with the same ID,
-    and, if and only if the vendor name has changed, remove it from the
-    vendors-by-name table, free the old name, replace it with the new name,
-    and, add it back to the vendors-by-name table with the new name.
-    
-    Bug: 10666
-    Change-Id: I43ebcb57c742563157c71b01ebc0b35797a408e1
-    Reviewed-on: https://code.wireshark.org/review/5265
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f598fa8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 12 18:11:00 2014 -0800
-
-    Squelch a compiler warning.
-    
-    Some compilers complain that we're casting a 16-bit integer to a
-    pointer; making it a standard-size integer squelches the warning.
-    
-    Change-Id: Iba0e767d7801afdc369b64a1cf050bf8db37da7b
-    Reviewed-on: https://code.wireshark.org/review/5264
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f7d91bd
-Author: Gerald Combs <gerald@zing.org>
-Date:   Tue Nov 11 09:56:58 2014 -0800
-
-    Qt: Flatten group boxes.
-    
-    As discussed in change 5185, the "big 3" HIGs discourage the use of
-    traditional group boxes. Flatten our existing ones.
-    
-    Change-Id: I68ef4aa9fd0f69a42750bf735df2250a468bfb2d
-    Reviewed-on: https://code.wireshark.org/review/5263
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 6df5252
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 9 15:44:56 2014 -0500
-
-    Add Decode As functionality for MPLS PW Associated Channel Type.
-    
-    Add CFM and MPLS dissector as possible decoders.
-    
-    Bug: 10574
-    Change-Id: Ic39c6b8d68b965ff9d342f5ee789a8eff3134a5a
-    Reviewed-on: https://code.wireshark.org/review/4935
-    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 ae1630d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 12 12:57:36 2014 +0100
-
-    Fix warning: no previous prototype for function ... [-Wmissing-prototypes]
-    
-    warning coming after g055e4768ece and g421913b721
-    
-    Change-Id: I5caeeb89c559faef8007f2946c68c7172b75dfa8
-    Reviewed-on: https://code.wireshark.org/review/5250
-    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 54aea45
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Nov 12 14:15:48 2014 +0100
-
-    [Art-Net]
-    - The heuristic chek was missing "e" out of "Art-Net\0"
-    - tvb_length() - tvb_captured_length()
-    
-    Change-Id: Iad9900f3a22e2fdbd0d6056efc1af90511cc458a
-    Reviewed-on: https://code.wireshark.org/review/5257
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 63cf939
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 12 12:26:22 2014 +0100
-
-    ADB: fix  warning: no newline at end of file [-Wnewline-eof]
-    
-    Warning found by Clang
-    
-    Change-Id: I7b801808aefa294e32fff560ea1a49620f0e0ea0
-    Reviewed-on: https://code.wireshark.org/review/5249
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2043c9d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Nov 12 11:06:45 2014 +0100
-
-    Updates in it translation.
-    
-    Change-Id: I9e90fca521f17f4ae49e132990f77b2610807e6d
-    Reviewed-on: https://code.wireshark.org/review/5248
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f2d94e1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 12:52:04 2014 +0100
-
-    PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I1540c7878692625a9e38b48f8681c07bab852a64
-    Reviewed-on: https://code.wireshark.org/review/5234
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 219cf30
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Nov 11 15:22:12 2014 -0500
-
-    Fix SMPP timestamp decoding when the current date/time's offset to UTC is
-    different from the timestamp's offset to UTC.
-    
-    The fix for bug 6712 ignored the fact that daylight savings will affect the
-    offset from UTC--and whether daylight savings is in effect today might be
-    different than whether it was in effect in the timestamp we're decoding.
-    
-    Bug: 10672
-    Change-Id: Ie513c361cff41007f2328cd9ca9ca4800ffef500
-    Reviewed-on: https://code.wireshark.org/review/5245
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cfd71d7
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Nov 11 20:48:39 2014 -0500
-
-    Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up
-    on the OSX 10.5 buildbot.
-    
-    Change-Id: I49e066feab8b980ea85371095234e96e89db71e1
-    Reviewed-on: https://code.wireshark.org/review/5247
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit ea5b234
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Nov 11 15:37:04 2014 -0500
-
-    Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up with gcc 4.8.3.
-    
-    Change-Id: I71c9013670dd6e8c74e039bd252cfac2c9e95a18
-    Reviewed-on: https://code.wireshark.org/review/5246
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 2f3e577
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Tue Nov 11 21:21:28 2014 +0100
-
-    [GTP] Fix decoding of UMTS GTP QoS Profile i n Radius and Diameter
-    messages.
-    Fixes Bug 10688
-    
-    Change-Id: Iff29ae3f6cee1b4ad12a0e5c5d7fd3da1c9343af
-    Reviewed-on: https://code.wireshark.org/review/5244
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit feedcb0
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Tue Nov 11 21:00:16 2014 +0100
-
-    [Radius] Make dictionary.starent.vsa1 the default dictionary.
-    at least with the trace in Bug 10688 that makes the most sense.
-    
-    Change-Id: I76213449076a2f49a4b72c6dd87b022fb10b9eef
-    Reviewed-on: https://code.wireshark.org/review/5242
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b1c91b0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 19:35:55 2014 +0100
-
-    Tools: Add fix_pragma_wdocumentation to UNKNOWN licence
-    
-    Change-Id: Ib5665924b99644c52c95d408c7cff19509cf3eb2
-    Reviewed-on: https://code.wireshark.org/review/5241
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit dfaaba8
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 11 12:56:34 2014 -0500
-
-    hiqnet: Use correct filter names; Fix specification of hf_dhcp
-    
-       "foo.flags..." --> "hiqnet.flags...";
-       Use BASE_NONE for hf_dchp.
-    
-    Change-Id: Ic3ca4754a1daeefc831dbfcd6a280fe19f8efbf3
-    Reviewed-on: https://code.wireshark.org/review/5240
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit bd9ff6b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Nov 8 18:21:07 2014 +0100
-
-    Add tools for fix -Wdocumentation
-    
-    Use pragma to disable -Wdocumentation when include glib.h, gmodule or gtk/gtk.h
-    
-    Change-Id: I576c0d5c4a12ac3b505ac9543646356ff29ac814
-    Reviewed-on: https://code.wireshark.org/review/5198
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 7e2ede3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 17:56:05 2014 +0100
-
-    Hiqnet: fix warning found by fix-encoding-args tools
-    
-    Change-Id: I7e513ec5b617217cd238861f5f02d44edce0bedd
-    Reviewed-on: https://code.wireshark.org/review/5239
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0f4860b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 17:50:17 2014 +0100
-
-    Hiqnet: fix Mac OS X buildbot
-    
-    Change-Id: Ia4fec86ed389ccb558fe9e1acfb6e87b7012bb75
-    warning: declaration of 'strlen' shadows a global declaration
-    Reviewed-on: https://code.wireshark.org/review/5237
-    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 41cc80e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 17:54:09 2014 +0100
-
-    Hiqnet: fix typo lenght => length
-    
-    Change-Id: I104d8bb0c56899faef6f4d608859e7b1a34e45a4
-    Reviewed-on: https://code.wireshark.org/review/5238
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8b5b0b3
-Author: Raphaël Doursenaud <rdoursenaud@free.fr>
-Date:   Mon Oct 20 13:07:56 2014 +0200
-
-    Initial Harman HiQnet dissector
-    
-    Change-Id: I43042edde09395e328d84bf4b172465829915a98
-    Reviewed-on: https://code.wireshark.org/review/5014
-    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 7469fab
-Author: desolat <nuabaranda@web.de>
-Date:   Tue Nov 11 00:46:05 2014 +0100
-
-    BACAPP: fix dissection of event parameters for event notifications of Event_Type Change_of_Status_Flags
-    
-    Implementation for this event parameter type was missing
-    
-    Bug: 9626
-    Change-Id: Iea0bc819858bbf5660d97cfd0c418a963ac149fb
-    Reviewed-on: https://code.wireshark.org/review/5228
-    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 b2c2deb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 10 19:47:59 2014 -0800
-
-    Fix a problem that causes build failures with CMake on Yosemite.
-    
-    Change-Id: I52e81656470df887eb3c53b2632bf5a310b1b063
-    Reviewed-on: https://code.wireshark.org/review/5229
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit afae2b6
-Author: David Ameiss <netshark@ameissnet.com>
-Date:   Mon Nov 10 14:24:18 2014 -0600
-
-    Allow building under OSX Yosemite using cmake.
-    
-    CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools
-    build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and
-    update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM.
-    
-    Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b
-    Note: CFPropertyListCreateWithStream() works under Mavericks as well.
-    Reviewed-on: https://code.wireshark.org/review/5226
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit c44ff77
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Nov 10 15:07:51 2014 -0500
-
-    amqp: Misc changes;
-    
-    - amqp_1_0_dissectiom: Use MIN(32-bit-length, 0xFFFF) as the length to dissect;
-      The original code just used the low-order 16 bits of the 32-bit length
-      field  as the length to dissect.
-      Add an expert warning if the actual PDU length is > 65K.
-    
-    - tvb_length() --> tvb_reported_length()
-    
-    Change-Id: I3230600f460a8bd495eeec17fa6e704bf24de1a2
-    Reviewed-on: https://code.wireshark.org/review/5225
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit bc990fc
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Sep 1 09:47:26 2014 +0200
-
-    USB: consider the device class when we try to select the next dissector
-    
-    at the moment, we only use the interface class, even in situations where
-    it's not applicable (e.g. control request that's not addressed to an
-    interface or an endpoint) - this is a hack that works because some
-    dissectors register for interface class "unknown", I'm trying to make
-    this workaround obsolete
-    
-    Change-Id: I6bf4253a2f8bf5a75ea1a08c3e52d36f80abd7ab
-    Reviewed-on: https://code.wireshark.org/review/5215
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Sean Stalley <seanstalley@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0f7aedc
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Nov 10 17:43:53 2014 +0100
-
-    Use correct offset and lenght for Choice EOC.
-    
-    Change-Id: I8152e1a07768a3bc245bbafa7c24901ba26a2478
-    Reviewed-on: https://code.wireshark.org/review/5224
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0f758fa
-Author: Victor Voronkov <victor.voronkov@gmail.com>
-Date:   Mon Nov 10 12:07:15 2014 +0100
-
-    WCCP: fix parsing of extended assignment data element
-    
-    Bug: 10641
-    Change-Id: I51322757c5aa7877fa8ff7915330ff24e7a8cbe2
-    Reviewed-on: https://code.wireshark.org/review/5221
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ea16705
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Nov 6 11:19:25 2014 +0100
-
-    Improved deregistering fields.
-    
-    This improvement avoids use of deallocated memory (crash) if using a
-    deregistered field in display filter, color filter, custom column and
-    other cases when the field is used as "interesting field".
-    
-    This functionality is currently used in http, imf and ldap preferences.
-    
-    Also removed unused proto_registrar_n() as this does not work correctly
-    after deregistering fields.
-    
-    Change-Id: I043e3bf7a98bd773c9801e712a012d1eab8a7f94
-    Reviewed-on: https://code.wireshark.org/review/5161
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit d58567b
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Nov 5 14:36:29 2014 +0100
-
-    Fixed memory leakage in col_cleanup.
-    
-    Several fields in cinfo is allocated memory and must be freed here
-    to avoid memory leakage when recreating the packet list.
-    
-    Do not allocate memory for col_expr[] as this points to static strings
-    or other allocated strings.
-    
-    Change-Id: I840377e3c590b1a3e2a38e0537465a028041d1e9
-    Reviewed-on: https://code.wireshark.org/review/5137
-    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: Anders Broman <a.broman58@gmail.com>
-
-commit 64b8759
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 22:16:15 2014 -0800
-
-    Try to fix dist.
-    
-    Change-Id: Ib4332bace88f9db7a06867861c40627e2bdc55f0
-    Reviewed-on: https://code.wireshark.org/review/5218
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit cd5b402
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 21:28:00 2014 -0800
-
-    Fix an include.
-    
-    Change-Id: Ic46b24cac01c49be01c7ad9e8a12b276fcdf81a5
-    Reviewed-on: https://code.wireshark.org/review/5217
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 6228930
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 18:13:57 2014 -0800
-
-    Finish converting the User's Guide to AsciiDoc.
-    
-    As with the Developer's Guide, add user-guide-docinfo.xml, which lets us
-    carry over DocBook front matter. Remove the meta_info chapter. Most of
-    its contents are now in user-guide-docinfo.xml. Add a DocBook revision
-    history based on hints from the Git/SVN/CVS revision history.
-    
-    Remove the various makefile targets for converting AsciiDoc files to
-    DocBook chapters. Remove GPL_appendix.xml. We use the AsciiDoc version.
-    
-    Change-Id: I543fa2a92f2c735c5f00c97ec65cff2187e09e3a
-    Reviewed-on: https://code.wireshark.org/review/5216
-    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 055e476
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 9 14:00:01 2014 -0500
-
-    Add subdissector table for MPLS PW Associated Channel Type
-    
-    Change-Id: Id72fcbe74b91b4eb25fb4d3f3d47a1d53c2857b2
-    Reviewed-on: https://code.wireshark.org/review/5212
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3924310
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 11:39:15 2014 -0800
-
-    WSUG: Convert ``Command Line Tools'' to AsciiDoc.
-    
-    Move the idl2wrs section to the Developer's Guide. Leave most of the
-    other content intact for now.
-    
-    Change-Id: I98c6eeab62af5cc55e3ce23ab1107df02b1a22cf
-    Reviewed-on: https://code.wireshark.org/review/5214
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit c61df20
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 9 14:01:39 2014 -0500
-
-    Restore a "ti" assignment that slightly altered dissection.
-    
-    Change-Id: I94cd7893a2e6b3668499d41519649f6a7782aa60
-    Reviewed-on: https://code.wireshark.org/review/5213
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b41f0c3
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 10:20:26 2014 -0800
-
-    WSUG: Convert ``Troubleshooting'' to AsciiDoc.
-    
-    The chapter is disabled so its final output hasn't been checked. Leave
-    most of the content intact for now.
-    
-    Change-Id: I2147ee2863e7ededadf892794a836b4dc8055649
-    Reviewed-on: https://code.wireshark.org/review/5211
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f8f915c
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 10:07:46 2014 -0800
-
-    WSUG: Convert ``Protocols'',  ``Messages'', and ``How Wireshark Works''
-    to AsciiDoc.
-    
-    ``How Wireshark Works'' is disabled, so its final output hasn't been
-    checked.
-    
-    Leave most of the content intact for now.
-    
-    Change-Id: Ia78951faa3ffd9c6d2e23067dbfb954ab4042f60
-    Reviewed-on: https://code.wireshark.org/review/5210
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d8a0757
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Nov 8 22:05:52 2014 -0800
-
-    WSUG: Convert ``Files'' to AsciiDoc.
-    
-    Leave most of the content intact for now.
-    
-    Change-Id: I78f47b8310cb41ac5a07d352e56ec907b36665f8
-    Reviewed-on: https://code.wireshark.org/review/5209
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 2dda088
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 9 08:05:15 2014 -0800
-
-    [Automatic manuf, services and enterprise-numbers update for 2014-11-09]
-    
-    Change-Id: Icfdef00a4b9b303bde89bf57077817f25e47d190
-    Reviewed-on: https://code.wireshark.org/review/5206
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f7ac077
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 8 21:08:52 2014 -0500
-
-    Create a subdissector table for juniper payload protocols.
-    
-    Change-Id: I60fd9c6c486b9b3b90e32fb9ccce3973569cc2ee
-    Reviewed-on: https://code.wireshark.org/review/5204
-    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 8153cbc
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Nov 8 22:23:25 2014 -0800
-
-    Try to fix wsluarm dependency.
-    
-    Change-Id: I90f6a400bb5078c7719c3088d87c4632b810346b
-    Reviewed-on: https://code.wireshark.org/review/5205
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 04aad36
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 2 13:20:08 2014 -0800
-
-    Convert the Lua reference to AsciiDoc.
-    
-    Move it to the Developer's Guide while we're here.
-    
-    Nudge the markup in epan/wslua where needed. Note that we should
-    probably convert it to AsciiDoc (if we're going to keep it in the DG) or
-    Doxygen.
-    
-    Change-Id: Ie175111043f98b7a37eeeb8d185a833d8e866f8b
-    Reviewed-on: https://code.wireshark.org/review/5203
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 5020856
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Nov 8 18:03:23 2014 +0100
-
-    Fix error: parameter 'XX' not found in the function declaration (-Wdocumentation)
-    
-    Change-Id: I5850b813989bd6ed33263c0fae3aa29e977e82ec
-    Reviewed-on: https://code.wireshark.org/review/5195
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit d094ca8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Nov 8 18:01:25 2014 +0100
-
-    SNMP: Fix warning found by -Wunused-const-variable
-    
-    Change-Id: If3fcab128e3e6bce04f4922568ab7ff8575b01fe
-    warning: unused variable 'smux_types' [-Wunused-const-variable]
-    Reviewed-on: https://code.wireshark.org/review/5194
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit dea982b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Nov 8 11:14:27 2014 +0100
-
-    PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I4bfc67705ee824e68f14e4177a3194d66bbbe165
-    Reviewed-on: https://code.wireshark.org/review/5188
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit ae61a41
-Author: desolat <nuabaranda@web.de>
-Date:   Sat Nov 8 13:05:03 2014 +0100
-
-    BACAPP: fix dissection of event parameters for event notifications of Event_Type Change_of_Characterstring
-    
-    Implementation for this event parameter type was missing
-    
-    Bug: 9625
-    Change-Id: I575d387ec4764fa1ecd365624d13e3f41e2473c6
-    Reviewed-on: https://code.wireshark.org/review/5189
-    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 79d3c33
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 8 19:26:12 2014 +0100
-
-    simplify the while-loop in dissect_pmip6_opt_cr()
-    
-    Bug: 10676
-    Change-Id: I5614c640d3fd23196984eb2bb013ba15fb318305
-    Reviewed-on: https://code.wireshark.org/review/5200
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit ee1c74c
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 8 19:25:05 2014 +0100
-
-    simple fix for bug 10676
-    
-    Bug: 10676
-    Change-Id: I442aa2ce44309655190752e715279d7325647336
-    Reviewed-on: https://code.wireshark.org/review/5199
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 421913b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 7 07:47:43 2014 -0500
-
-    Create real subdissectors to the IGMP protocol.
-    
-    Change-Id: I79ee9413b87722bfe4782342737cff03cfc34495
-    Reviewed-on: https://code.wireshark.org/review/5179
-    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 bd5384c
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 8 15:50:26 2014 +0100
-
-    fix a copy&paste mistake: type -> length
-    
-    Change-Id: Ifafdc150c655caf4c7046e3038a6b5e4eeb3cf80
-    Reviewed-on: https://code.wireshark.org/review/5193
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 5844761
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 8 12:30:39 2014 +0100
-
-    fix a crash in the endpoint dialogue
-    
-    compile Wireshark with GeoIP enabled
-    load a USB capture
-    open Statistics / Endpoints
-       the tree is empty, USB is not amongst the selected Enpoint Types
-    select USB in the Endpoint Types list
-    -> crash
-    
-    to fix this, add a NULL check for cur_tree to EndpointDialog::tabChanged()
-    
-    Change-Id: I43d963ae5cd451120ac354e89e37ccbbbc2c5910
-    Reviewed-on: https://code.wireshark.org/review/5192
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 47909d3
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 8 12:12:36 2014 +0100
-
-    remove parent parameter from dissect_usb_setup_response()
-    
-    Change-Id: Ib4a5cc3b783d3a4a1477624678964a9627d582e6
-    Reviewed-on: https://code.wireshark.org/review/5191
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit f82b2f2
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 8 11:58:33 2014 +0100
-
-    remove parent parameter from dissect_usb_setup_request()
-    
-    Change-Id: I5a24de9a12e301d472e701140299304e2cb4fcfc
-    Reviewed-on: https://code.wireshark.org/review/5190
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 570df75
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 7 22:53:41 2014 -0500
-
-    Add checkfiltername.pl to pre-commit script
-    
-    Change-Id: I34d8aa7034a4aacc2a95b35a30f25356b33a51b9
-    Reviewed-on: https://code.wireshark.org/review/5187
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 48885cc
-Author: Sven Eckelmann <sven@open-mesh.com>
-Date:   Tue Sep 30 16:39:37 2014 +0200
-
-    batadv: Add missing padding to batadv_unicast_4addr_v14
-    
-    The already frozen packet format of batman-adv for Linux 3.5 was rejected by
-    David S. Miller. The 4addr format v14 was therefore changed after the freeze
-    and published in his final form in Linux 3.8.
-    
-    Change-Id: I519476c4c6d62b403e197fae6a853d9bbe61f9bc
-    Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
-    Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
-    Reviewed-on: https://code.wireshark.org/review/5174
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3428e80
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 7 15:16:17 2014 -0800
-
-    Don't forward-declare amqp_0_10_get_size_field(), as it no longer exists.
-    
-    Change-Id: I796826bafd0768b610c9afbde8407fd9d3cc775e
-    Reviewed-on: https://code.wireshark.org/review/5180
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8f62bb7
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Nov 7 15:59:17 2014 -0500
-
-    amqp: handle potential overflows when dissecting amqp_0_10 PDUs;
-    
-    Bug: 10582
-    Change-Id: I2fbb16b9d641dfe872aed468f8b944f7ef274261
-    Reviewed-on: https://code.wireshark.org/review/5176
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 848e24e
-Author: Masayuki Takemura <masayuki.takemura@gmail.com>
-Date:   Thu Nov 6 14:56:08 2014 +0900
-
-    dictionary: add missing TLV definition for WiMAX-Downlink-Granted-QoS
-    
-    The type of the value of the Downlink-Granted-QoS is defined as tlv, but the
-    TLV definition has not given in the file.
-    
-    This changeset adds the definition as per WiMAX Forum specification.
-    As per the spec, the TLV definition is same as the QoS-Descriptor TLV.
-    
-    <Reference>
-    
-    Section 5.4.2.29 QoS-Descriptor and 5.4.2.63 Downlink Granted-QoS in
-    WMF-T33-001-R010v05.
-    
-    Change-Id: I72d97ed6f7532239cba62cc4cd1b6693fcd43123
-    
-    dictionary: change type of WiMAX-Uplink-Granted-QoS VSA
-    
-    This changeset changes the type of WiMAX-Uplink-Granted VSA to tlv and
-    provides the TLV definition as per WiMAX Forum Specification.
-    
-    The TLV definition is same as the QoS-Descriptor VSA.
-    
-    <Reference>
-    
-    Section 5.4.2.30 Uplink Granted-QoS and 5.4.2.29 QoS-Descriptor in
-    WMF-T33-001-R010v05.
-    
-    Change-Id: If6b505bc985c0fb41b19cf2d2fc7b4f887c72b7a
-    Reviewed-on: https://code.wireshark.org/review/5158
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit aec5ffb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Nov 7 15:32:53 2014 +0100
-
-    DNS: WKS RR Protocol field is read as 4 bytes instead of 1
-    
-    In the attached pcap file, there's a single DNS packet with WKS RR in the Prerequisites section.
-    The Protocol field of this RR is read as if it is 4 bytes long instead of 1, which actually reads part of the bytes of the following RR.
-    
-    Found by boaz
-    
-    Bug:10675
-    Change-Id: Icf12c7f3864b629a242598373c06eee4de0ca098
-    Reviewed-on: https://code.wireshark.org/review/5170
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit de37217
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Nov 7 12:47:18 2014 +0100
-
-    DNS: fix name length and label count for a root server
-    
-    Bug: 10674
-    Change-Id: I44297bfa64c31ab53d2aa61b6e54253b7a5a1e27
-    Reviewed-on: https://code.wireshark.org/review/5167
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 14489d6
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Fri Nov 7 14:54:32 2014 +0000
-
-    Fixed hf field blurb values after changes from change 5166
-    
-    Change-Id: I1c32fb3629c714d72b5398ad82d219d8786980a1
-    Reviewed-on: https://code.wireshark.org/review/5171
-    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 43069c2
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 7 15:12:52 2014 +0100
-
-    GTPv2: Update Indication with Octet 8 and 9 dissection.
-    
-    Change-Id: Ifa18f31a98932236b102db0f4f28169a7eb72978
-    Reviewed-on: https://code.wireshark.org/review/5169
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 09cdfe8
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 6 22:10:11 2014 -0500
-
-    Fix all remaining filter name errors found with checkfiltername.pl
-    
-    This should make it possible to add checkfiltername.pl to the pre-commit script.
-    
-    Change-Id: Icdee7e4ea3381fa1467bb4b5caf0f60c255adec0
-    Reviewed-on: https://code.wireshark.org/review/5166
-    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 b5dead8
-Author: Lukas Emersberger <lukas.emersberger@br-automation.com>
-Date:   Thu Oct 23 09:13:39 2014 +0200
-
-    epl: Reassembly table fix
-    
-     Fixed an error that retransmitted frames were added to the
-     reassembly table.
-    
-    Change-Id: I314412cb8f2ce49142e4b7f001613948f5e03bf6
-    Reviewed-on: https://code.wireshark.org/review/4916
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 72c70b6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 6 16:46:31 2014 -0800
-
-    Call the default language preference setting "Use system setting".
-    
-    That more correctly describes it - it doesn't do any form of automatic
-    detection of anything, it just picks up the system settings from
-    wherever Qt picks them up.
-    
-    Change-Id: I62d40719728cc9735e3b8f3e4202b7e61fc3f43b
-    Reviewed-on: https://code.wireshark.org/review/5165
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 28e19b6
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Mon Apr 15 13:56:20 2013 -0400
-
-    nfs: parse full setclientid CLID_INUSE reply
-    
-    Note there can be some extra data in the CLID_INUSE case.
-    
-    (Future work: dissect_nfs_clientaddr4 could use some improvement.)
-    
-    Ping-Bug: 10649
-    Change-Id: I92f34c6cc7a9328458f1e4391b04009f5e47290b
-    Reviewed-on: https://code.wireshark.org/review/5141
-    Reviewed-by: Bruce Fields <jbrucefields@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 255f1c0
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Nov 6 08:27:55 2014 +0100
-
-    mrcpv2: Fixed a memory leakage.
-    
-    Moved mrcpv2_tcp_range to proto_reg_handoff and removed the unused
-    range_empty() init.
-    
-    Change-Id: I0bb704db62299c9b3f54e2924162738bf7290ab6
-    Reviewed-on: https://code.wireshark.org/review/5156
-    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 1c707b4
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Nov 6 08:30:01 2014 +0100
-
-    rtsp: Fixed a memory leakage.
-    
-    Moved rtsp_tcp_port_range to proto_reg_handoff and removed the unused
-    range_empty() init.
-    
-    Change-Id: I695bc5a78d8e6177f2b2847ecee58a0d973d7d1c
-    Reviewed-on: https://code.wireshark.org/review/5157
-    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0b9c5cd
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Thu Nov 6 13:21:03 2014 +0100
-
-    Improve error message by including the (expected) class information
-    
-    The code checks whether the tag AND class are matching with their expected values, but only the tag information is shown in the error message.
-    When the class is not matching, the error message shows the given and expected tags which are the same, confusing the user what is wrong with it.
-    
-    Furthermore, the messages for SEQUENCE and SEQUENCE OF are made the same/similar.
-    
-    Change-Id: I6c1d0968c903105ec7f6e0648d589a4263a8ca18
-    Reviewed-on: https://code.wireshark.org/review/5162
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 6e81b2d
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Nov 6 16:57:09 2014 +0100
-
-    BER: Fix offset and length of EOC in Sequence loop
-    
-    Change-Id: I4384339688c1dda5e011b7ff7772940fd61de8d1
-    Reviewed-on: https://code.wireshark.org/review/5164
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 883718c
-Author: Michael Tüxen <tuexen@wireshark.org>
-Date:   Thu Nov 6 13:46:24 2014 +0100
-
-    Always process the expert info for the new open request message.
-    
-    Change-Id: I38a4bee1b482f320c7e2fd685cf5823ddb4f8d36
-    Reviewed-on: https://code.wireshark.org/review/5163
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
-
-commit b479ab4
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Nov 6 08:25:55 2014 +0100
-
-    lbtrm: Use correct variable for outgoing_mc_address.
-    
-    Change-Id: I17e06e39de0de347926825741897646507691657
-    Reviewed-on: https://code.wireshark.org/review/5155
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit bb05124
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Nov 6 00:35:24 2014 -0500
-
-    coap: fix a bug; do some cleanup.
-    
-      Bug fix: do initial calls to col_...() *before* the dissection code so
-               that proper column info is displayed even if the dissector
-               exits early because of an exception, etc.
-    
-      Cleanup:
-        - Use wmem_strbuf instead of static fixed length char arrays;
-        - Create/use an extended value_string;
-        - Use %u (not %d) when formatting unsigned values;
-        - Use strchr() to search a string for a character;
-        - Misc ...
-    
-    Change-Id: I57ca584f989c3ab1cf141270cc50160f9fb980ae
-    Reviewed-on: https://code.wireshark.org/review/5153
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 3e34273
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Nov 5 14:48:43 2014 +0100
-
-    Lua: Fixed some memory leakages.
-    
-    Change-Id: I5e14c2e5a3868ec40d1989876b06919aa9ece4a1
-    Reviewed-on: https://code.wireshark.org/review/5138
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit c321dc3
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Nov 5 23:43:20 2014 -0500
-
-    rpc: fix regression in gbfc5483174d
-    
-    value can be NULL, in which case memduping it will crash
-    
-    Bug: 10667
-    Change-Id: I8950fae94d80a2f06f24a785532536ad73f1855d
-    Reviewed-on: https://code.wireshark.org/review/5152
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit d0c031f
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Fri Oct 31 12:43:07 2014 -0400
-
-    nfs: clean up fh_expire_type dissection
-    
-    This is a bit simpler and makes the field searchable.
-    
-    Ping-Bug: 10649
-    Change-ID: I68386f987c419c0b6cbc181f29c6bce6c04fcfdb
-    Reviewed-on: https://code.wireshark.org/review/5145
-    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 060cc68
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Wed Oct 29 09:00:07 2014 -0400
-
-    nfs: NFSv4.2 SEEK, ALLOCATE, DEALLOCATE support
-    
-    NFSv4.2 is still a draft, but these three ops are implemented at least
-    for Linux now and are very unlikely to change any further.
-    
-    Ping-Bug: 10649
-    Change-Id: Ia2917de59fb2b0ed7191c9f362b7eb60756d7634
-    Reviewed-on: https://code.wireshark.org/review/5143
-    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 67c9ff0
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Fri Oct 31 14:55:12 2014 -0400
-
-    nfs: interpret aclsupport attribute
-    
-    It's not an interesting attribute but I've occasionally been annoyed by
-    having to look it up just to verify a server isn't doing something nuts.
-    
-    Ping-Bug: 10649
-    Change-Id: I660b62039075a4044946e590ee75ed5690290bc5
-    Reviewed-on: https://code.wireshark.org/review/5146
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 5431032
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Mon Sep 30 17:54:42 2013 -0400
-
-    nfs: label NFSv4 CREATE symlink arguments more helpfully
-    
-    Currently it's hard to tell which field is the name of the symlink and
-    which is the target; both are labeled just "Name".
-    
-    Ping-Bug: 10649
-    Change-Id: I1322a3652ffbcee920a6808dcc5613cefe8d8588
-    Reviewed-on: https://code.wireshark.org/review/5142
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ed7b9e6
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Fri Oct 17 15:45:39 2014 -0400
-
-    nfs: fix open result_flags
-    
-    The protocol values here are all wrong, and miss new flags from rfc
-    5661.
-    
-    Ping-Bug: 10649
-    Change-Id: I03fb2b521b415dbca5d4b77eda609eb8084da57c
-    Reviewed-on: https://code.wireshark.org/review/5140
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 55fb7ea
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Nov 5 21:10:07 2014 +0100
-
-    Enable some runtime sanity checks when using at least gcc 4.9
-    
-    Change-Id: I33208d4c27a27fb9222577ca176357035eeb7ba1
-    Reviewed-on: https://code.wireshark.org/review/5150
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 80b36cd
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Nov 5 21:05:34 2014 +0100
-
-    Fix plugin search path: It was relative instead of absolute, resulting
-    in not found plugins (lib/wireshark/plugins/1.99.1).
-    
-    Change-Id: Ie81f3c4450789ff7e37c99e197b44e7df47d8df5
-    Reviewed-on: https://code.wireshark.org/review/5149
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 547323b
-Author: Stephen Fisher <stephenfisher@centurylink.net>
-Date:   Wed Nov 5 09:43:00 2014 -0700
-
-    Allow the environment variable RCC to set before running configure to
-    allow for unusual paths for Qt's rcc program (FreeBSD ports puts it in
-    /usr/local/lib/qt5/bin).  This matches the existing functionality of the
-    MOC and UIC variables/programs.
-    
-    Change-Id: I885d61bce54d9e893e0c2fc496a9ff767a096ae6
-    Reviewed-on: https://code.wireshark.org/review/5139
-    Petri-Dish: Stephen Fisher <stephenfisher@centurylink.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
-
-commit d2c0600
-Author: Ambarish Malpani <ambarish@defend7.com>
-Date:   Tue Nov 4 14:38:07 2014 -0800
-
-    Make SSL certificates available to tshark as bytes via the dtls/ssl.handshake.certificate key.
-    
-    Changed the entries so that users have access to the whole certificate in
-    tshark. This allows developers to process the certs in custom ways
-    
-    Change-Id: I113d60b2b3f12c6b15a644ec02bbebf7134f0ece
-    Reviewed-on: https://code.wireshark.org/review/5119
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 1af7c2b
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Nov 4 18:47:11 2014 +0100
-
-    Qt: Simplify disabling entries in ContextMenu
-    
-    We have direct access to every entry (action) in ContextMenu.
-    Use it instead of storing "actions" and checking its name.
-    
-    Change-Id: I97a1723898409faf13280c5655b7738661ab594b
-    Reviewed-on: https://code.wireshark.org/review/5135
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ce4be19
-Author: Matthieu Texier <matthieu@texier.tv>
-Date:   Mon Sep 15 16:10:51 2014 +0200
-
-    pim: BIDIR support (RFC 5015)
-    
-    Bug: 10231
-    Change-Id: Ia93fa76b8d381971f900de4a8ce591f03cd82da0
-    Reviewed-on: https://code.wireshark.org/review/5118
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 85aa1bc
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Nov 5 12:50:32 2014 +0100
-
-    ws_mempbrk_sse42.c: remove inclusion of stdint.h as it's no more required after g79e4da4
-    
-    Change-Id: I48776a286ba1d412ecda55857938d9daa77fd3f7
-    Reviewed-on: https://code.wireshark.org/review/5136
-    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 701f055
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 5 00:21:33 2014 -0500
-
-    mih: tvb_length() --> tvb_reported_length(); Fix some boolean bitfield displays.
-    
-    Change-Id: I52dd05842afdff4ffd8a70ff56d665ea28d0f63b
-    Reviewed-on: https://code.wireshark.org/review/5133
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit e8d375c
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 4 22:28:44 2014 -0500
-
-    mih: Fix some bugs; Add an XXX comment.
-    
-      One of the bugs: (2^32) is *not* 2 to the power of 32.
-    
-    Change-Id: Id4dab16380f757e89c05be4182da3ac92c92abd6
-    Reviewed-on: https://code.wireshark.org/review/5127
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 6aee9b1
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 4 22:34:51 2014 -0500
-
-    opensafety: Use 1<<10 (not 2^10) in a #define;
-    
-       Comment out the #define since it's not actually used. :)
-    
-    Change-Id: Ia34200d3eb705a74a33cbcf18175a7f780f2d2e2
-    Reviewed-on: https://code.wireshark.org/review/5128
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit dfb5ddb
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Nov 5 04:16:22 2014 +0100
-
-    Show the bit-encoding into the (shared) 2-Byte value for
-    fragment number and sequence number
-    
-    Change-Id: I38bb61471fe43c5cfa8274e728a56d4cdb132ec1
-    Reviewed-on: https://code.wireshark.org/review/5126
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit aae48be
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 3 23:32:47 2014 +0100
-
-    DNS: replace hash map by red-black tree to fix request/response tracking when transaction id is reused
-    
-    Bug: 10657
-    Change-Id: Id4356dcd6802da40b4a3e2e2095cc9d2932c2c68
-    Reviewed-on: https://code.wireshark.org/review/5100
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 2bd15c7
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Nov 4 21:31:17 2014 -0500
-
-    sigcomp-udvm: fix invalid access
-    
-    Way back in 2006, svn r20041 (now gd408f2f6fc) worked around a problem by
-    limiting the amount of buffer dealt with in the udvm_state_access call (changing
-    it from state_minimum_access_length_buff[n] to STATE_MIN_ACCESS_LEN).
-    
-    The very next line however, tries to read the same amount of buffer to display
-    to the user - since it seems nobody ever applied a proper fix for the original
-    case, just apply the same workaround to the second call.
-    
-    Bug: 10662
-    Change-Id: I32c81ee2a8eb7b30ff7ab1fbbb6ea5f206385d4b
-    Reviewed-on: https://code.wireshark.org/review/5124
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit bfc5483
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sat Nov 1 16:36:01 2014 -0400
-
-    rpc: take a file-scope copy of some RPC procedures
-    
-    The original may be freed out from underneath us if a duplicate is registered.
-    Thanks to Bruce Fields for pointing out one case of this I'd missed.
-    
-    Also replace a bunch of manual "foo.field = 0" with just wmem_new0() instead.
-    
-    Bug: 10636
-    Change-Id: I342bd732f062b0a191cbbf5ae417356385d2fd53
-    Reviewed-on: https://code.wireshark.org/review/5046
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit cd93af0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Nov 4 18:08:47 2014 -0800
-
-    Oops, we also need to worry about pcap_get_tstamp_precision().
-    
-    Change-Id: I60a1f671ba313c59ca1999ab703ee11370608758
-    Reviewed-on: https://code.wireshark.org/review/5123
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6f3fc0e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Nov 4 17:53:17 2014 -0800
-
-    Get rid of unused variable.
-    
-    Leftover crud before I notied that RTLD_NEXT would do what I want.
-    
-    Change-Id: I5e510e74c65b211e6cc6c300e760869abb399dc8
-    Reviewed-on: https://code.wireshark.org/review/5121
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 78492d9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Nov 4 17:49:29 2014 -0800
-
-    Cope with newer Xcode not having the 10.6 SDK.
-    
-    The latest Xcode, as of today, has only 10.9 and 10.10 SDKs, which means
-    that, if we build Wireshark and request a deployment minimum release of
-    10.6, we'll be building against an SDK in which libpcap has routines
-    that aren't available in 10.6 and that doesn't use weak linking for
-    them, so the resulting binary won't actually work on 10.6.
-    
-    Use the run-time loader to find those routines (currently, only
-    pcap_set_tstamp_precision()) and call them only if we find them.
-    
-    On other UN*Xes, we still assume that we'll be running only on the
-    release against which we were built and newer releases.
-    
-    Change-Id: Iab20d86fe3be4b299cfb6e25c1f95dc6e1581661
-    Reviewed-on: https://code.wireshark.org/review/5120
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 196d7b4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Nov 4 12:43:44 2014 -0800
-
-    Add the flag SVGs to the set of files we distribute.
-    
-    Change-Id: Ib6e9098a4b411eeb1e5f597f3ec5f55e98632ad3
-    Reviewed-on: https://code.wireshark.org/review/5117
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e65f581
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Nov 4 20:36:13 2014 +0000
-
-    Revert "Follow a suggestion from libtoolize:"
-    
-    Sadly, older versions of autoconf - such as the ones on the OS X buildbots - don't know about AC_CONFIG_MACRO_DIRS.
-    
-    This reverts commit 89291ad4f3293893387b385a0800cad42215ddd4.
-    
-    Change-Id: Ie4fa71062886f58c7f6014f6b7969921f0b824ae
-    Reviewed-on: https://code.wireshark.org/review/5116
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 79e4da4
-Author: Stephen Fisher <stephenfisher@centurylink.net>
-Date:   Tue Nov 4 12:58:48 2014 -0700
-
-    Fix compilation error on FreeBSD 10.0-RELEASE (with clang): change int8_t to
-    gint.
-    
-    Change-Id: I7974497a8f50e5d18ec74aa7554f058056a6022c
-    Reviewed-on: https://code.wireshark.org/review/5115
-    Petri-Dish: Stephen Fisher <stephenfisher@centurylink.net>
-    Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
-
-commit 89291ad
-Author: Stephen Fisher <stephenfisher@centurylink.net>
-Date:   Tue Nov 4 11:43:46 2014 -0700
-
-    Follow a suggestion from libtoolize:
-    
-    libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([./aclocal-fallback])' to
-    configure.ac
-    
-    This is explained in the libtool manual:
-    
-    "In the future other Autotools will automatically check the contents of
-    AC_CONFIG_MACRO_DIRS, but at the moment it is more portable to add the macro
-    directory to ACLOCAL_AMFLAGS in Makefile.am, which is where the tools currently
-    look. If libtoolize doesn't see AC_CONFIG_MACRO_DIRS, it too will
-    honour the first -I argument in ACLOCAL_AMFLAGS when
-    choosing a directory to store libtool configuration macros in. It is perfectly
-    sensible to use both AC_CONFIG_MACRO_DIRS and ACLOCAL_AMFLAGS, as long as they
-    are kept in synchronisation."
-    
-    Change-Id: Ic203b0b5104ea3423cf8c0042b2278e82bcea332
-    Reviewed-on: https://code.wireshark.org/review/5113
-    Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
-
-commit 8765fec
-Author: Stephen Fisher <stephenfisher@centurylink.net>
-Date:   Tue Nov 4 12:17:45 2014 -0700
-
-    Ignore additional generated files:
-    
-            aclocal-fallback/libtool.m4
-            aclocal-fallback/ltoptions.m4
-            aclocal-fallback/ltsugar.m4
-            aclocal-fallback/ltversion.m4
-            aclocal-fallback/lt~obsolete.m4
-    
-    Change-Id: I7c9bb5c383f44800345540ec05a67175bd7267cc
-    Reviewed-on: https://code.wireshark.org/review/5114
-    Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
-
-commit 6086885
-Author: Stephen Fisher <stephenfisher@centurylink.net>
-Date:   Tue Nov 4 10:11:40 2014 -0700
-
-    Fix some compilation errors (size_t to guint/gint) and an unused parameter
-    
-    Change-Id: I2d64d840c93f951dd5481ca5950ff5587da6843d
-    Reviewed-on: https://code.wireshark.org/review/5112
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9ac261f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 4 11:15:18 2014 -0500
-
-    amqp: Fix a number of bugs in dissect_amqp_0_10_map().
-    
-     (Among other things: "2 ^ xxx" is *not* 2 to the xxx'th power).
-    
-    Change-Id: I893b72e853ecbb5d7e6259e950fb347e89eed6c2
-    Reviewed-on: https://code.wireshark.org/review/5109
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit c3c59dc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Nov 4 04:36:23 2014 -0800
-
-    add the type dom_sid28 and call ad-hoc dissector
-    
-    Pick up change from Samba:
-    
-        commit 87fb54b77f4b9caaf2b25635b7813e29a448aaa6
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Tue Oct 1 12:04:02 2013 -0700
-    
-        pidl-wireshark: add the type dom_sid28 and call ad-hoc dissector
-    
-    Change-Id: Ide5041b901b5e1785b5cabd4b6320f830bbef2b8
-    Reviewed-on: https://code.wireshark.org/review/5108
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e38e828
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Nov 4 12:04:20 2014 +0100
-
-    Lua: Fix for register dissectors only once.
-    
-    The postdissector may be registered before adding the dissector function.
-    
-    Change-Id: I2285824835491ac91e00515bfb18eb471888eaf8
-    Reviewed-on: https://code.wireshark.org/review/5106
-    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>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit e41f088
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Nov 4 02:07:30 2014 -0800
-
-    SWITCH_TYPE is not always defined, SwitchType() will try to find a fallback
-    
-    Pick up change from Samba:
-    
-        commit 4b09df897803e78265fd19f6ff19be6e3d8a3944
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Tue Oct 1 12:10:18 2013 -0700
-    
-        pidl-wireshark: SWITCH_TYPE is not always defined, SwitchType() will try to find a fallback
-    
-        Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
-    
-    Change-Id: I1f41ece23e8fec30f9cd89a2203ad63ee6e21e36
-    Reviewed-on: https://code.wireshark.org/review/5105
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5025bc2
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Dec 21 17:55:43 2013 +0100
-
-    Qt: Dynamic languages
-    
-    - get language as soon as possible (before creating any Qt objects) to make all
-      translations working
-    - dynamic list of supported languages
-    - runtime change of GUI language (no need to restart application)
-    - add flags icons support
-    - search for *.qm languages in buildin resources, then
-      data dir called "languages" (main directory in sources or
-      /usr/share/wireshark/languages), then user directory
-      (UNIX: ~/.wireshark/languages); "languages" directory should contains
-      files wireshark_xx.qm where xx is language code (en, en_GB, etc.),
-      and optional xx.svg for flag icon
-    - try to fix some untranslated manually-created UI items
-      (need manual reset text of those components)
-    
-    Change-Id: I62ca8a8cddce47cec9dbcad6b0bd68b6cfd92229
-    Reviewed-on: https://code.wireshark.org/review/5041
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 15e78de
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Oct 31 13:21:46 2014 +0100
-
-    Lua: Register dissectors only once.
-    
-    Change-Id: I883e8560e9d101d34760d09715255e4fccc9eb98
-    Reviewed-on: https://code.wireshark.org/review/5022
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit e2f2e18
-Author: Stephen Fisher <stephenfisher@centurylink.net>
-Date:   Mon Nov 3 17:05:38 2014 -0700
-
-    Also ignore TAGS files in addition to the already ignored tags in .gitignore
-    
-    Change-Id: Id787cf8dfd3df5fac6d535422e00eff3788570b0
-    Reviewed-on: https://code.wireshark.org/review/5103
-    Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
-
-commit 3b5cb2a
-Author: Stephen Fisher <stephenfisher@centurylink.net>
-Date:   Mon Nov 3 16:39:16 2014 -0700
-
-    Update my e-mail address
-    
-    Change-Id: I46b03b15820c4d3df172528068317ae0ddc8fab2
-    Reviewed-on: https://code.wireshark.org/review/5102
-    Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
-
-commit 6167673
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 15:03:01 2014 -0800
-
-    Regenerate DCE RPC dissectors with the current pidl.
-    
-    Change-Id: I3cfb9399a9e5ed783083fa5b26a39646fb53875f
-    Reviewed-on: https://code.wireshark.org/review/5101
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1119eb6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 12:05:47 2014 -0800
-
-    generate ALIGN_TO_x_BYTES instructions if the element has the align_x flag
-    
-    Pick up change from Samba:
-    
-        commit 93f262ee6d162bf007b79d2daf9de6c49c6163d1
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Fri Oct 18 00:04:28 2013 -0700
-    
-        pidl-wireshark: generate ALIGN_TO_x_BYTES instructions if the element has the align_x flag
-    
-    Change-Id: I865eae69ea7a8200630d3ad69bda9ac7b1c12255
-    Reviewed-on: https://code.wireshark.org/review/5099
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 283b5cd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 12:03:32 2014 -0800
-
-    if the structure has the flag no_align then set also no_align in the dceprc_info structure
-    
-        commit 3f6ca430b067705d556031d52736d5a5d5ae8f55
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Fri Oct 11 13:18:37 2013 -0700
-    
-        pidl-wireshark: if the structure has the flag no_align then set also no_align in the dceprc_info structure
-    
-        Some dissection function will try to do alignment if the no_align flag
-        is not set.
-    
-        Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
-    
-    Change-Id: Ie2377f4d6c1c4f2fde7084ba666bd417568122dd
-    Reviewed-on: https://code.wireshark.org/review/5098
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9299bf4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 11:55:34 2014 -0800
-
-    Remove casts, make some whitespace changes in generated code.
-    
-    This is the part of this change from Samba:
-    
-        commit f0a6043fb201940f438f63c809df7186aa307f01
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Sun Oct 5 18:25:27 2014 -0700
-    
-        pidl-wireshark: handle 8 bits enum and change the signature of enum function to pass the exact type
-    
-        Instead of passing a uint32 in all cases we pass the exact type
-    
-        Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
-    
-    that wasn't already in our version.
-    
-    Change-Id: I7da99cb701c2eedadeb8acb68d32f657dfa85e5b
-    Reviewed-on: https://code.wireshark.org/review/5097
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 26d4fb0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 11:50:53 2014 -0800
-
-    add definition for IPV4/IPV6 types
-    
-    Pick up change from Samba:
-    
-        commit 49e0dc7ad0f3c29df20badacc4294f1adc375aaf
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Fri Oct 25 23:11:37 2013 -0700
-    
-        pidl-wireshark: add definition for IPV4/IPV6 types
-    
-    Change-Id: I514f855370c1d9355ffc6ff9b31f8aedd70b9122
-    Reviewed-on: https://code.wireshark.org/review/5096
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d993cdd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 11:46:18 2014 -0800
-
-    insure that we have an entire match for the variable name
-    
-    Pick up patch from Samba:
-    
-        commit fa331f64d1a40350496c7acf68c20cb3fead6eaf
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Thu Oct 3 09:45:19 2013 -0700
-    
-        pidl-wireshark: insure that we have an entire match for the variable name
-    
-    Change-Id: I1e730dfb3b9eb96a4cda34659297fddeac7801c8
-    Reviewed-on: https://code.wireshark.org/review/5095
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0139ac8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 11:44:05 2014 -0800
-
-    generate an error for the new Pipe type in typedef
-    
-    Pick up change from Samba:
-    
-        commit 5d0d45c9a71f137dc29ca79d49bd558f34bf1ff5
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Sun Sep 29 00:42:36 2013 -0700
-    
-        pidl-wireshark: generate an error for the new Pipe type in typedef
-    
-        Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
-    
-    Change-Id: I9e6da50b657f774fadf7c3777900d409999d4660
-    Reviewed-on: https://code.wireshark.org/review/5094
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 08a85b8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 11:34:29 2014 -0800
-
-    add a function to change the type of a hf_field
-    
-    Pick up change from Samba:
-    
-        commit 755bc4ed29c89fc15d4230ce8b828b3afcfa2912
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Thu Oct 3 01:10:48 2013 -0700
-    
-        pidl-wireshark: add a function to change the type of a hf_field
-    
-        We can use this to change the type FT_BYTE when we realize that the
-        object dissected is an array of bytes
-    
-    Change-Id: I1f24ce834b6a5be0d933b1fdfd9a0baa88c3761a
-    Reviewed-on: https://code.wireshark.org/review/5093
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit e0c7277
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 11:30:26 2014 -0800
-
-    Handle the case when the DATA_TYPE is not a simple type
-    
-    Pick up change from Samba:
-    
-        commit 343db5326b369cbdef4b723e3056acc2a866a887
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Tue Sep 23 01:28:40 2014 -0700
-    
-        pidl-wireshark: Handle the case when the DATA_TYPE is not a simple type
-    
-        Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
-    
-    Change-Id: I511a60beb392e5e92701d5ace1260397fb4be851
-    Reviewed-on: https://code.wireshark.org/review/5092
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 58a325e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 11:24:18 2014 -0800
-
-    Improve string delection in function ContainsString
-    
-    Pick up patch from Samba:
-    
-        commit 5740a06b320d56840439fb7fe3b8b27f341ddaa7
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Sat Oct 4 21:19:12 2014 -0700
-    
-        pidl: Improve string delection in function ContainsString
-    
-    Change-Id: I702c12e4275315511728d5ef6db07e03be9c2b38
-    Reviewed-on: https://code.wireshark.org/review/5091
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0713d35
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 11:20:27 2014 -0800
-
-    Make the compilation of PIDL produce the same results if the content hasn't changed
-    
-    Pick up change from Samba:
-    
-        commit 4986359816704f38d4fad3ddd0d07a0f0a25b335
-        Author: Matthieu Patou <mat@matws.net>
-        Date:   Mon Sep 22 21:52:14 2014 -0700
-    
-        pidl: Make the compilation of PIDL producing the same results if the content hasn't change
-    
-        Newer perl versions don't generate stable results anymore.
-    
-        Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
-    
-    Change-Id: Ifced47229b3033d1fae494adff0dee6671304812
-    Reviewed-on: https://code.wireshark.org/review/5090
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f2269b4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 11:07:54 2014 -0800
-
-    Pass di to one more call to PIDL_dissect_uint8().
-    
-    The case for type "char" wasn't fixed.
-    
-    Change-Id: Ia745263cd4d11a3c00b1ecc72e044f4e404da283
-    Reviewed-on: https://code.wireshark.org/review/5088
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7a78792
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 3 08:39:07 2014 -0800
-
-    Don't use -msse4.2 with MSVC.
-    
-    Change-Id: I457d45d9ad05e0eb851e78a7342e666ef9df8ffd
-    Reviewed-on: https://code.wireshark.org/review/5086
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bba77c3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Nov 3 16:19:10 2014 +0100
-
-    tvb_length -> tvb_reported_length
-    
-    Change-Id: I48b618008c8c8accd6f161bdc42e02906a4765b7
-    Reviewed-on: https://code.wireshark.org/review/5085
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7613327
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Nov 3 09:49:50 2014 +0100
-
-    Comment out
-     dictionary.rfc6929
-     dictionary.rfc6930
-     dictionary.rfc7155
-     dictionary.rfc7268
-     As they give errors in the test suit, something may have changed in the
-     free rasdius syntax,
-    
-    Change-Id: I27c2c4ea8b96601dfaf48b8dc29273fa6adca655
-    Reviewed-on: https://code.wireshark.org/review/5084
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f3cc900
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 2 17:07:41 2014 +0100
-
-    MIPv6: Mobility Header Link Layer Address is parsed incorrectly
-    
-    Looking at RFC 5568 (http://tools.ietf.org/html/rfc5568#section-6.4.3)
-    It says that the Link-Layer Address (LLA) Option, should have an address right after the option code
-    
-    Bug:10006
-    Bug:10627
-    Change-Id: I6fcd98a7c9896862e4c9547b945cf3848daaf474
-    Reviewed-on: https://code.wireshark.org/review/5075
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9b37e1e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 27 13:40:45 2014 +0100
-
-    HPSW: fix neighbor MAC Address
-    
-    Use the wrong length for display mac address (6 and no the length of option)
-    Also fix update of item (don't update the root item)
-    
-    Change-Id: I38cd1a6a045e797b01cd1a8de5add0949eaa0f01
-    Reviewed-on: https://code.wireshark.org/review/4950
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e4c257a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 2 12:59:47 2014 +0100
-
-    Qt: fix what seems to be a copy/paste error in MainWindow::loadWindowGeometry() (Coverity CID 1158563)
-    
-    Change-Id: Iaa2a6367fbb434514751e0ed4f273f883798ce8a
-    Reviewed-on: https://code.wireshark.org/review/5066
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 1a2fcc5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 2 12:58:26 2014 +0100
-
-    Qt: fix a potential memory leak FollowStreamDialog::follow() found by Coverity (CID 1159304)
-    
-    Change-Id: I53709c6729c6d9156d2ba5ccd83e92bc27433e26
-    Reviewed-on: https://code.wireshark.org/review/5065
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 7b4215d
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Mon Oct 27 01:12:21 2014 -0700
-
-    [Radius] Update dictionaries from freeradius 3.0.4
-    
-    Update includes all new/renamed dictionaries in radius, but does not cover any differences in already included dictionaries, which will be handled in  a separate update.
-    
-    Change-Id: I6d1e1cc1815423fb71ec940366964a366ab41a25
-    Reviewed-on: https://code.wireshark.org/review/4947
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit bea8299
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Aug 28 18:39:02 2014 +0200
-
-    remove parent parameter from try_dissect_next_protocol()
-    
-    Change-Id: Ib05b67c8741f90444e773e7c9e1378f00f41dad7
-    Reviewed-on: https://code.wireshark.org/review/5083
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 179a9b5
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Aug 28 18:24:19 2014 +0200
-
-    new function proto_tree_get_parent_tree()
-    it returns the parent tree of a given tree object
-    
-    Change-Id: I191e0221651ffb5b26df761e9a25075aa0eb2ad3
-    Reviewed-on: https://code.wireshark.org/review/4954
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 250c1ec
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Sun Nov 2 20:35:37 2014 +0100
-
-    Fix typo: Intrustion -> Intrusion
-    
-    Change-Id: Iea95556a4d77ff54d46a505903e50134f51d563a
-    Reviewed-on: https://code.wireshark.org/review/5082
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit dab9c85
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 2 11:26:15 2014 -0800
-
-    Fix syntax.
-    
-    Change-Id: Icc18cd7369bae21629aafd5631a373485ef75dea
-    Reviewed-on: https://code.wireshark.org/review/5081
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 66e204f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 2 10:37:31 2014 -0800
-
-    Handle packagemaker being an ordinary command in /usr/bin.
-    
-    Change-Id: Ic804a0fdb4dc450683f57be4814a347e20ecd401
-    Reviewed-on: https://code.wireshark.org/review/5079
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 70cab47
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 2 10:10:17 2014 -0800
-
-    Fix syntax, add a check for failure to find PackageMaker, make sure it's a file.
-    
-    Change-Id: Id5bb23a8c5ebd8a63a51029de541cd32e484029c
-    Reviewed-on: https://code.wireshark.org/review/5078
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4f94c9e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 2 09:25:11 2014 -0800
-
-    Handle PackageMaker a bit better.
-    
-    Look for the binary in various places, rather than looking for
-    particular directories and adding them to the path.  That lets us use
-    the PackageMaker binary from the PackageMaker.app bundle (it can either
-    be run as a GUI app or from the command line), so you don't have to have
-    a symlink to it from one of the directories in question.
-    
-    Change-Id: I1ad701291698544f96d419663f0b4a669876d2f1
-    Reviewed-on: https://code.wireshark.org/review/5077
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f968017
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 2 16:58:39 2014 +0100
-
-    RTPS: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
-    
-    Change-Id: I1943c1446a7bc3381d869514d7802bc0fbb1f6e3
-    Reviewed-on: https://code.wireshark.org/review/5072
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 232879a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 2 16:41:46 2014 +0100
-
-    gsm a dtap: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: Ifbe59a51e5fa6158f9073402f1a1ab63df2dfa42
-    Reviewed-on: https://code.wireshark.org/review/5071
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 3f38631
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 2 16:41:16 2014 +0100
-
-    fcels: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I1c351348399caea313abb94680a610073b3e5af7
-    Reviewed-on: https://code.wireshark.org/review/5070
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit f1bdcd9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 2 16:40:02 2014 +0100
-
-    lzxpress: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I028d8877a845af5830b17abfe7eb10d8528b334a
-    Reviewed-on: https://code.wireshark.org/review/5069
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 2899a6e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 2 08:06:55 2014 -0800
-
-    [Automatic manuf, services and enterprise-numbers update for 2014-11-02]
-    
-    Change-Id: Idc5360a39ab2f2f0b0827bc6c71f95e2f175d792
-    Reviewed-on: https://code.wireshark.org/review/5073
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit ba008bf
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 1 16:55:25 2014 -0400
-
-    Eliminate proto_tree_add_text from several dissectors.
-    
-    Change-Id: I6d3125f15d268edd47ef74dd655eb86cb25ee52d
-    Reviewed-on: https://code.wireshark.org/review/5047
-    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 f19c70c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 2 12:17:58 2014 +0100
-
-    DNS: fix Coverity CID 281285 and CID 1238867
-    
-    Change-Id: Ia5747a5d0c8c63b7471de624c96e546c7bbfbf57
-    Reviewed-on: https://code.wireshark.org/review/5064
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c49c775
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 2 13:27:37 2014 +0100
-
-    Add identification of Windows (Server) 10
-    
-    Change-Id: I5ab7a4dc67ceac644faead0d9e460e3babaf6355
-    Reviewed-on: https://code.wireshark.org/review/5067
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f8c3f15
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Nov 1 20:52:34 2014 -0700
-
-    WSUG: Convert ``Customizing'' to AsciiDoc.
-    
-    Leave most of the content intact for now.
-    
-    Change-Id: Id00d942f87e0a25e27333ac56eb9b99311694a13
-    Reviewed-on: https://code.wireshark.org/review/5063
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 2d8d217
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Nov 1 22:40:41 2014 +0100
-
-    DNS: fix dissection of ISDN RR Sub Address field
-    
-    Bug: 10650
-    Change-Id: I3411d4e5ef534a663940974d98c351976005ee8e
-    Reviewed-on: https://code.wireshark.org/review/5057
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 5e40aa4
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Nov 1 22:08:44 2014 +0100
-
-    print: do not try to add an empty hex stream to PDML output for a text only hf
-    
-    Bug: 10651
-    Change-Id: If38af2879b9a20f4755a7843f20c7327d66c95b1
-    Reviewed-on: https://code.wireshark.org/review/5054
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0af4395
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Oct 31 12:24:59 2014 -0400
-
-    Announce messages should only have a TLV if the message length is > 64.
-    
-    Also, cleaned up a unnecessary global variable.
-    
-    Bug: 10611
-    Change-Id: I8ef5658eeb1f7a240b508833baac64719af144d8
-    Reviewed-on: https://code.wireshark.org/review/5029
-    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 070165c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Nov 1 21:09:41 2014 +0100
-
-    Ethernet: fix a trivial typo
-    
-    Change-Id: Ibf623aa9e7153e7d54dda1000face1bac42a0088
-    Reviewed-on: https://code.wireshark.org/review/5045
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a162f5b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Nov 1 19:21:31 2014 +0100
-
-    DNS: fix display of A6 address suffix field
-    
-    Bug: 10652
-    Change-Id: Ibd119177feecd27d0c6baba255e7e3da37b131bd
-    Reviewed-on: https://code.wireshark.org/review/5043
-    Tested-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: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 20bac9d
-Author: Robert Grange <robionekenobi@bluewin.ch>
-Date:   Sat Nov 1 11:27:51 2014 +0100
-
-    packet-mq: Use value_string_ext  for big value string. more struct dissected
-    
-    Use of value_string_ext for big value_strign array, sort them, to force use the btree search
-    parse more integer value with value_string
-    
-    Bug: 9367
-    Change-Id: I49625cf2d46e0974cddde2c7b1767cb7d06ec47d
-    Reviewed-on: https://code.wireshark.org/review/5037
-    Petri-Dish: Bill Meier <wmeier@newsguy.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit cfdd207
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Nov 1 09:53:07 2014 -0700
-
-    Qt: Limit the amount of Follow Stream text.
-    
-    QTextEdit + QTextDocument don't handle large amounts of data very well.
-    Truncate our displayed text after 2 MB.
-    
-    Change-Id: I0b549a0b05a490272bc0d34af0f2c6661c548d0f
-    Reviewed-on: https://code.wireshark.org/review/5042
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 74e8613
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Fri Oct 31 14:16:11 2014 -0400
-
-    Don't check the checksum if we're encapsulated in an (ICMP) error packet.
-    
-    This is the case when an ICMP echo is returned (e.g., because it's too big).
-    
-    This effectively applies SVN rev 36193 to ICMPv6.
-    
-    Bug: 10620
-    Change-Id: I29aeaabc2467c818714df448e39b3a93027c8961
-    Reviewed-on: https://code.wireshark.org/review/5030
-    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>
-
-commit 6a37368
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Oct 15 11:54:05 2014 +0200
-
-    Validate no_of_bits in ws_sign_ext32 and ws_sign_ext64
-    
-    The result of the '<<' expression is undefined if no_of_bits - 1 is negative.
-    
-    Change-Id: I3fff09afe414bdd9d6736ee351f1c542c503b93d
-    Reviewed-on: https://code.wireshark.org/review/4698
-    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 54ae596
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Oct 24 15:48:35 2014 +0200
-
-    Translations: Update Polish translation
-    
-    Still not complete, but almost complete.
-    
-    Change-Id: I6e793c4f6648b423a42841347d22073c0b079767
-    Reviewed-on: https://code.wireshark.org/review/5040
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 6f3d91f
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Oct 25 18:59:41 2014 +0200
-
-    Qt: Fix build with Qt < 4.8
-    
-    Change-Id: I13d4addb16c5c2790703feb63666367d39f36682
-    Reviewed-on: https://code.wireshark.org/review/5039
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit ea7c867
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Oct 24 15:48:56 2014 +0200
-
-    Bluetooth: Fix AVRCP UUID
-    
-    Change-Id: Iaddde4a1ce49b46e4473c1a470760d9cbbe8000e
-    Reviewed-on: https://code.wireshark.org/review/5038
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 1f0a68d
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 31 10:10:38 2014 +0100
-
-    Missed cahnges from last commit:
-    - Replace some deprecated APIs
-    
-    Change-Id: If815e7191afb445c474a59cf1e3af603fc7b0b28
-    Reviewed-on: https://code.wireshark.org/review/5018
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 155fe6c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 31 19:50:42 2014 -0700
-
-    Set CXXFLAGS to include $VERSION_MIN_FLAGS.
-    
-    You never know when some library might start using C++, so set CXXFLAGS
-    everywhere.
-    
-    Change-Id: I7e49a3446bb6b587e20058be48e06a5f345679c3
-    Reviewed-on: https://code.wireshark.org/review/5036
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2bd1d46
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Oct 31 16:12:47 2014 -0700
-
-    Qt: Better Follow Stream hints.
-    
-    Show the client and server colors in the hint text.
-    
-    Change-Id: Iddcda8c3f4f7dc0d8919749aeffc8c09c6445c17
-    Reviewed-on: https://code.wireshark.org/review/5035
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 5a71cfd
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Oct 31 15:49:04 2014 -0700
-
-    Qt: Disable our widgets while tapping.
-    
-    Prevents a crash when changing the spinbox value during the middle of a
-    follow.
-    
-    Change-Id: I07cea883c72c5975633e4b7046155f9b6de9cc4a
-    Reviewed-on: https://code.wireshark.org/review/5034
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 065d2b7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 31 13:08:11 2014 -0700
-
-    Don't force a verbose build.
-    
-    That was probably something I put in while debugging.  It can be put
-    back - or added to some other make command - as necessary.
-    
-    Change-Id: I184a5b8537c43c87844e6e75f65dd3c0accde9ac
-    Reviewed-on: https://code.wireshark.org/review/5033
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 29fda99
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 31 12:27:30 2014 -0700
-
-    Undo my personal disabling of the Qt download/build/install.
-    
-    I did that because I didn't want to wait a day for Qt to build, but
-    didn't intend to make that change in the official source.
-    
-    In the longer term, we should perhaps change the script to download and
-    install a binary package; sadly, their installers can't be made 100%
-    command-line and automated, but, well, the CMake installer pops up a
-    dialog, too, and if you don't have Java installed, some of the configure
-    scripts that check for Java pop up non-blocking "do you want to install
-    Java?" dialogs from OS X.
-    
-    Change-Id: I99781d5e54529955bf9363a7ee9d4122403fa955
-    Reviewed-on: https://code.wireshark.org/review/5032
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3426ffa
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 31 12:11:22 2014 -0700
-
-    For OS X, don't rigidly tie the SDK version to the minimum target version.
-    
-    According to
-    
-       https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html#//apple_ref/doc/uid/10000163i-CH1-SW1
-    
-    the deployment target (minimum target OS version) and SDK version aren't
-    necessarily the same and, in fact, Apple typically only ship two SDKs
-    with each Xcode release, so if you want to build for 10.6 with the 10.6
-    SDK, you have to use a version of Xcode sufficiently old to have the
-    10.6 SDK.
-    
-    Here, we instead search for the oldest SDK for an OS whose version is
-    greater than or equal to the deployment target.  Note that this may not
-    work for X11-based Wireshark, as the X11 libraries can change
-    incompatibly between releases.  (Fortunately, our plan is to kick
-    X11-based Wireshark to the curb for OS X, removing a large pile of
-    aggravation for users.)
-    
-    This also requires some fixes when building Qt and gdk-pixbuf, as some
-    cases where we were using the minimum OS target version we needed to be
-    using the SDK version.
-    
-    For CMake, we're using its native "deployment target" support for OS X,
-    and hope that it will somehow do the right thing.
-    
-    Change-Id: Ie8f42c5e4719e7ebdc56b9ba5a330665bee06280
-    Reviewed-on: https://code.wireshark.org/review/5031
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d93be95
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 31 15:13:36 2014 +0100
-
-    Clean up handling of BDC coded numbers a bit.
-    
-    Change-Id: Ic3d523664e3c78b4ed289b7e5acf3f53614c6d54
-    Reviewed-on: https://code.wireshark.org/review/5027
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d821440
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Oct 31 08:58:52 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-gtpv2.c
-    
-    Change-Id: I127447941e4c926d9194373a405c82145b1392bb
-    Reviewed-on: https://code.wireshark.org/review/5025
-    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 54efe5d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Oct 31 09:01:57 2014 -0400
-
-    Improve the "guessing" of the hf_ field and encoding values.
-    
-    Change-Id: Iaa042ef8b794c265870a04f6659720c321978697
-    Reviewed-on: https://code.wireshark.org/review/5026
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c6feecf
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Oct 31 13:25:14 2014 +0100
-
-    Lua: Only register postdissectors once.
-    
-    Change-Id: Id41e4ebd19e0b80faa06f628d689bdb77f2b84c9
-    Reviewed-on: https://code.wireshark.org/review/5023
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 0347ff9
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Fri Oct 31 13:03:08 2014 +0100
-
-    Remove unused RA_PYTHON_REGISTER and RA_PYTHON_HANDOFF.
-    
-    Change-Id: Ia2bccb46be79a934dce447ec04dd81e12df9e131
-    Reviewed-on: https://code.wireshark.org/review/5021
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit 96aa60a
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 31 13:06:47 2014 +0100
-
-    CAMEL: tvb_length... -> tvb_reported_length...
-    
-    Change-Id: Ia9013127d72f9228b8151338429d9f612ba9a1f4
-    Reviewed-on: https://code.wireshark.org/review/5020
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0c97281
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 31 10:48:47 2014 +0100
-
-    BER: tvb_length... -> tvb_reported_length...
-    
-    Change-Id: I4868223ab54046977dbe833e6d1a2078d8d2c6d9
-    Reviewed-on: https://code.wireshark.org/review/5019
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c427839
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 31 09:58:47 2014 +0100
-
-    Fix:
-    - packet-dcerpc.c:4664:51: error: unused parameter 'pinfo' [-Werror=unused-parameter]
-    - packet-dcerpc.c:5083:83: error: unused parameter 'offset' [-Werror=unused-parameter]
-    - Replace some deprecated APIs
-    
-    Change-Id: I12cbc92a1f07252ebc3ff638b0a8436b2e226a18
-    Reviewed-on: https://code.wireshark.org/review/5017
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 31e3fc0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 31 01:50:43 2014 -0700
-
-    Fix name of C-Ares source directory & make the name of the -done file match it.
-    
-    The directory's name begins with "c-ares-", not "cares-".  Fix that, and
-    make the -done file's name begin with "c-ares-" as well.
-    
-    Change-Id: Ifa178c638ca634ca6b762b12290ccfcc4fa928f9
-    Reviewed-on: https://code.wireshark.org/review/5015
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d93bf88
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 31 00:36:39 2014 -0700
-
-    The C-Ares "done" file should have a name beginning with cares-.
-    
-    Fix a presumed copy-and-pasteo.
-    
-    Change-Id: I6953bfb46741923507bb58b4e48a72d92313e07c
-    Reviewed-on: https://code.wireshark.org/review/5012
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2717766
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Oct 24 22:47:22 2014 -0400
-
-    Use tcp_dissect_pdus in DCE/RPC dissector when running atop TCP.
-    
-    Yes DCE/RPC runs on top of many dissectors, all which need their own fragmentation support, but TCP can give it to you "for free".  DCE/RPC protocol format is also very conducive to it.
-    
-    Ping-Bug: 6392
-    Change-Id: I0d16854fed3d9c4229c3d2973782f676a51dd719
-    Reviewed-on: https://code.wireshark.org/review/4923
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 47ff5bb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Oct 30 17:08:04 2014 -0400
-
-    Sync debian symbol files to current API.
-    
-    Change-Id: I64b18ac20401f93b6162ecc7ec4935f8b78508f7
-    Reviewed-on: https://code.wireshark.org/review/5009
-    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 2787a93
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 30 09:33:36 2014 +0100
-
-    HTTP2: Update to draft-15
-    
-    * Add new error code (HTTP_1_1_REQUIRED)
-    * Use hexa value for error code (like the spec)
-    * Add reference to Alt-SVC spec
-    
-    Change-Id: Ifbcb32e97168440cb34f59740871b6c896e90461
-    Reviewed-on: https://code.wireshark.org/review/4992
-    Reviewed-by: Daniel Stenberg <daniel@haxx.se>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 618560a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Oct 30 08:43:24 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-fcels.c
-    
-    Change-Id: Iac322d7c7d66d90994bce377dd8c7e39a36466cf
-    Reviewed-on: https://code.wireshark.org/review/5003
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 93d5bb3
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Oct 30 23:13:44 2014 +0100
-
-    temporary workaround to stop the fuzz failures
-    
-    Bug: 10635
-    Change-Id: I2132119710392e077f74c92e737e4edce4fcc295
-    Reviewed-on: https://code.wireshark.org/review/5011
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 2e31475
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Oct 30 14:36:02 2014 -0700
-
-    Add a missing backslash.
-    
-    Change-Id: Iac79c885fe10805b61512ed2c02cd652f1c3fd7a
-    Reviewed-on: https://code.wireshark.org/review/5010
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 7665ac5
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Oct 30 13:42:31 2014 -0700
-
-    OS X: Don't add libtool control files to the app bundle.
-    
-    According to https://developer.apple.com/library/mac/technotes/tn2206
-    the Contents/PlugIns directory should *only* contain executable files.
-    Only copy .so (and in case we need them) .dylib files.
-    
-    Change-Id: I01f077735018733926db92e7576f6f4fecb68862
-    Reviewed-on: https://code.wireshark.org/review/5008
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f5ed47d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Oct 29 17:33:12 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-q933.c
-    
-    Change-Id: If5b85609d3daaf66cbcc15e3127af4e7f5736e52
-    Reviewed-on: https://code.wireshark.org/review/4995
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3d9b35f
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Oct 30 14:16:06 2014 -0400
-
-    Fix a typo: Unidirected -> Undirected
-    
-    As reported in https://ask.wireshark.org/questions/37462/possible-mistake-in-bluetooth-low-energy-hci-event-type
-    
-    Change-Id: Ia6217531208b00c52c89bcb279cbbe67b5163e96
-    Reviewed-on: https://code.wireshark.org/review/5004
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit a683dd3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 30 12:13:21 2014 -0700
-
-    Make the data rate field float, and calculate it for 802.11n.
-    
-    Bug: 10637
-    Change-Id: Ifd4094f308246e92500cc7149c0d42c8496fb9f4
-    Reviewed-on: https://code.wireshark.org/review/5005
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit cc640f0
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Oct 30 11:56:30 2014 -0400
-
-    Prohibit ctype APIs (except toupper() which is still used by file.c - make
-    that deprecated).
-    
-    Also remove a few tabs that were in there.
-    
-    Change-Id: I1bb2ad726828366a9f7d1a4064b1215b743ad3b5
-    Reviewed-on: https://code.wireshark.org/review/5000
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4210a8c
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Oct 30 11:45:20 2014 -0400
-
-    Replace one more isprint() with g_ascii_isprint().
-    
-    Change-Id: I7d49b0d250a5918a7437a524492e834588c6c8cf
-    Reviewed-on: https://code.wireshark.org/review/4999
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 066a334
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Oct 30 17:40:20 2014 +0100
-
-    Add casts to try to please the OSX buildbot.
-    
-    Change-Id: I66d546ef2dd276bf151b2956ccbe1f2b6c5cb2f5
-    Reviewed-on: https://code.wireshark.org/review/5002
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e0a3526
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Oct 30 12:01:43 2014 -0400
-
-    Tell the user which file __func__ was found in.
-    
-    Change-Id: Ia69ceaf320cb97447f80a7c090efe6d36262a1c1
-    Reviewed-on: https://code.wireshark.org/review/5001
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 62831ba
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Oct 30 11:35:47 2014 -0400
-
-    convert_proto_tree_add_text.pl - missed adding an else statement to logic.
-    
-    Change-Id: I7f31e9ba47d2e94887bd01a84bab356c0c835d92
-    Reviewed-on: https://code.wireshark.org/review/4998
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cda985d
-Author: Matthieu Patou <mat@matws.net>
-Date:   Fri Oct 10 16:53:20 2014 -0400
-
-    Create the compress module for compression functions.
-    
-    For the moment there is only the lzxpress compression used by DRS
-    
-    Bug: 10546
-    Change-Id: Ifc7e1767934224c0198f0b09caa3efbad979ca1f
-    Reviewed-on: https://code.wireshark.org/review/4600
-    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 fea733e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Oct 30 11:19:30 2014 -0400
-
-    Add logic to determine if a "tvb get" call is used as a parameter to a proto_tree_add_text call. convert_proto_tree_add_text.pl has an easier time determining hf_ field values with a "tvb get" call present, so it's more likely those dissectors will be picked first in eliminating their proto_tree_add_text calls.
-    
-    Change-Id: I3dd57a73c8e60d8075a6bb987efd52b96b38445c
-    Reviewed-on: https://code.wireshark.org/review/4997
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f8c7a5b
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Oct 30 15:58:58 2014 +0100
-
-    Add an RFC reference and fix deprecated API.
-    
-    Change-Id: I8dcddc6bcbaf462a6e74b76764ea26b7f5b08920
-    Reviewed-on: https://code.wireshark.org/review/4996
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 79c977c
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Oct 28 21:43:12 2014 -0400
-
-    Remove the optional strncasecmp.{h,c} target (for systems that don't have that API).
-    
-    strncasecmp() has been prohibited for years (in favor of the g_ascii_ version).
-    
-    Change-Id: I64b7c29099b1c5240757e2026fe3490096a84755
-    Reviewed-on: https://code.wireshark.org/review/4980
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit c0a4a91
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 30 02:03:28 2014 -0700
-
-    Dataflow analysis is hard, let's go shopping!
-    
-    Another case where the compiler didn't figure out that the variables
-    aren't used if they're not set.
-    
-    Change-Id: I70bfb06c6d86d41a266a087ece971c40cd697ee9
-    Reviewed-on: https://code.wireshark.org/review/4994
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fdb3ea5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 30 01:58:15 2014 -0700
-
-    Squelch some used-but-not-set warnings (one legitimate, others not).
-    
-    Also, we don't care how much tagged value data we've read, we just care
-    whether we've read any or not (EOF reading the first one means "end of
-    file", EOF reading any of the subsequent ones means "short read").
-    
-    Change-Id: I2edc54494967b3a88bcc2c79d97eedfded00150d
-    Reviewed-on: https://code.wireshark.org/review/4993
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit aac8daa
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 30 00:59:31 2014 -0700
-
-    Use correct variable.
-    
-    To check whether data_rate_or_mcs_index is set, check
-    saw_data_rate_or_mcs_index; we might see a value of 0 for that field
-    (it's a valid MCS index), so we can't use it as an out-of-band value
-    meaning "not set".
-    
-    Change-Id: I75d7fdb4a90836538c82f56f2afb05c0603278a5
-    Reviewed-on: https://code.wireshark.org/review/4991
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d2ee010a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 30 00:06:48 2014 -0700
-
-    Extract the center frequency from Peek tagged files.
-    
-    Change-Id: I44bc278f563264ca20f0250fc3376b6741bdcbfa
-    Reviewed-on: https://code.wireshark.org/review/4990
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ec33c3d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 29 23:52:13 2014 -0700
-
-    Support the bandwidth and "short GI" fields from Peek tagged files.
-    
-    Add a number of fields corresponding to components of the radiotap MCS
-    field, add presence bits for them, and set and dissect the fields
-    supported by Peek tagged files.
-    
-    Change-Id: I3fc801a3bc180e1c174d074a794af0f3d338f249
-    Reviewed-on: https://code.wireshark.org/review/4989
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit aff087a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 29 17:08:56 2014 -0700
-
-    Handle the MCS index in Peek tagged files.
-    
-    Use the "MCS index used" extended flag bit to indicate whether the "data
-    rate or MCS index" field is a data rate or MCS index.
-    
-    Display the MCS index value if it's present.
-    
-    (More to come - MCS indices, plus other information, should be used to
-    calculate the data rate for 11n and beyond.)
-    
-    Get rid of the hdr_info_t structure while we're at it; just use local
-    variables for each of the fields.
-    
-    Change-Id: I546f53a8ebd89078d5f23e1290557b97348aff38
-    Reviewed-on: https://code.wireshark.org/review/4988
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8165448
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 29 16:03:08 2014 -0700
-
-    Expand the 802.11 pseudo-header and support new radio metadata.
-    
-    Add a set of presence bits, so we can indicate which bits of radio
-    metadata we do and don't have.
-    
-    Fill in more radio metadata from capture files, and display it.
-    
-    (More to come.)
-    
-    Change-Id: Idea2c05442c74af17c14c4d5a8d8025ab27fbd15
-    Reviewed-on: https://code.wireshark.org/review/4987
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4acf495
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 29 10:53:49 2014 -0700
-
-    Rename the strnatcmp.c routines and make them use the g_ascii_XXX() routines.
-    
-    Rename strnatcmp()/strnatcasecmp() to ws_ascii_XXX(), and make them use
-    the g_ascii_XXX() routines rather than ctype.h routines, to eliminate
-    locale-dependent behavior.
-    
-    (If you want locale-dependent "natural order" sorting, you probably want
-    "dictionary order" sorting, which is more complicated than just natural
-    order sorting.)
-    
-    Change-Id: I837f2776b2a909b547dc9a6072e497911b5380e5
-    Reviewed-on: https://code.wireshark.org/review/4985
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d2f4b6f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Oct 29 16:43:43 2014 +0100
-
-    Replace isalpha() with g_ascii_isprint().
-    
-    Change-Id: I416fd36f65ee80a0b17939bc081ddae0f3f72a32
-    Reviewed-on: https://code.wireshark.org/review/4984
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 065d5c8
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Oct 29 16:27:42 2014 +0100
-
-    Don't include ctype.h and replace isascii() with _ascii_isprint().
-    Remove deprecated APIs while at it.
-    
-    Change-Id: I002ed4a696782caaeeb70a3e4ced4ae81f3d5372
-    Reviewed-on: https://code.wireshark.org/review/4983
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 79f878f
-Author: Alex Tessmer <dev@tessmer.me>
-Date:   Wed Oct 29 01:57:17 2014 -0700
-
-    VXLAN: Fix flag bitmasks
-    
-    Fix bitmask for flags bits 0-2.
-    
-    Change-Id: Id7c42a79f0524eae103a586a16b89ccecf031d6f
-    Reviewed-on: https://code.wireshark.org/review/4982
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit b8df934
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Oct 29 09:36:06 2014 +0100
-
-    Add missing stuff for custom plugins.
-    
-    Change-Id: I34a35fe789d473b630b80c4f8f30833e0e04d188
-    Reviewed-on: https://code.wireshark.org/review/4981
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 451f7f0
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 28 17:10:45 2014 -0700
-
-    Qt: Better protocol highlight colors.
-    
-    Use the "Window" palette colors for protocol-level highlighting.
-    
-    Change-Id: Ife55d70041aa12110a00782d790be0d747b32562
-    Reviewed-on: https://code.wireshark.org/review/4979
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 0b03183
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 28 12:00:44 2014 -0700
-
-    Qt: Add a set of 2x 16-pixel toolbar icons.
-    
-    Optimize the toolbar PNGs.
-    
-    To do: The rest of the PNGs.
-    
-    Change-Id: Ieed8b0d099655994d43cdc9cf6c9a094d84c1802
-    Reviewed-on: https://code.wireshark.org/review/4978
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit e86553e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 28 12:02:46 2014 -0700
-
-    Get rid of unnecessary include of <wsutil/strnatcmp.h>.
-    
-    Change-Id: I60d5630478ccc185b9eed8066a902c6599421fad
-    Reviewed-on: https://code.wireshark.org/review/4977
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 417c181
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 28 11:36:38 2014 -0700
-
-    Use guint8 for 8-bit unsigned numeric values.
-    
-    That slightly better expresses the intent.
-    
-    Also, fix the message printed for bad bytes in a field name to handle
-    bytes that are bad because they don't correspond to printable ASCII
-    characters.
-    
-    Change-Id: I01f232c35bbbe30286999b6c607bfcf3d491453d
-    Reviewed-on: https://code.wireshark.org/review/4976
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8ea4df9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 28 11:18:40 2014 -0700
-
-    Use g_ascii_isalnum() rather than isalnum().
-    
-    Only *ASCII* alphanumerics are allowed in filterable field names, so use
-    g_ascii_isalnum() to check for them.  That avoids issues with characters
-    with the 8th bit set and avoids locale-dependent behavior.
-    
-    Change-Id: I4e3c4eec907f5e576629229fcf154fcf728b7a2e
-    Reviewed-on: https://code.wireshark.org/review/4973
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit bab44ad
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Oct 28 11:15:57 2014 -0400
-
-    Add some new features to the list and regenerate NEWS.
-    
-    Change-Id: I8d0897e63b44c8077b7488b8c8b7a3df0adf37a1
-    Reviewed-on: https://code.wireshark.org/review/4971
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0011fc4
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Oct 28 11:19:23 2014 -0400
-
-    Add GPLv2+ license header to keep license-check happy.
-    
-    This change must be reviewed/approved by the script's author (Gerald).
-    
-    Change-Id: Id89c1d05bf43cdd2d6823b5ef46162a9f11fb263
-    Reviewed-on: https://code.wireshark.org/review/4972
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit e8d2ba9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 28 00:02:16 2014 +0100
-
-    Pref: Remove unsued function
-    
-    Fix also warning: no previous prototype for 'prefs_get_uint_preference' [-Wmissing-prototypes]
-    
-    Change-Id: I4626372a9c131584c515a43e73aa019e2f696d29
-    Reviewed-on: https://code.wireshark.org/review/4960
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 9056eb9
-Author: alage <sphinxs1988@googlemail.com>
-Date:   Mon Oct 20 14:12:59 2014 +0200
-
-    Patch for KNXnet/IP dissector
-    
-    -removed some proto_tree_add_bits_itemand used bitmaks instead
-    -fixed KNX Groupaddress decoding
-    -improved apci decoding
-    -filternames changed
-    
-    Change-Id: I2593d54c5e94141445e9e8f32204848e9f48ff6a
-    Reviewed-on: https://code.wireshark.org/review/4874
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 422e1d9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 28 00:24:49 2014 -0700
-
-    Add a comment showing mapping to radiotap.
-    
-    Useful if we try to provide some "standard" 802.11 metadata header that
-    can support both radiotap and Peek tagged (and perhaps others).
-    
-    Change-Id: Ibac9829e3411670a439db7cb77e1694a5641b0a5
-    Reviewed-on: https://code.wireshark.org/review/4970
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3d359da
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Oct 22 08:53:07 2014 -0400
-
-    Refactor pinfo->circuit_id from H.223 dissector.
-    
-    Change-Id: Id63e0088047c7948fd190ba4dd5fbcb536e0cc6b
-    Reviewed-on: https://code.wireshark.org/review/4921
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 09957ca
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 26 11:08:35 2014 +0100
-
-    DNS NXT RR is parsed incorrectly
-    
-    The queries RRs and answers RRs are parsed fine.
-    However, only the first 2 authoritative RRs are parsed and none of the 3 additional RRs are parsed.
-    The second authoritative RR is of type NXT, and even though it has data length of 9, Wireshark reads all the bytes until the end of the packet as if they are part of bitmap in this RR (it reads 317 bytes too many).
-    This causes it to not parse the rest of the RRs correctly.
-    
-    Found by boaz
-    
-    Bug:10615
-    Change-Id: I22e5987c44a11399b07c3106fbb70c6e9e867afe
-    Reviewed-on: https://code.wireshark.org/review/4940
-    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 25448b0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Aug 20 12:40:16 2014 +0200
-
-    ISIS: Display code/type and length for unknown code/type
-    
-    Change-Id: Idb70d571ae7d7f5fc87c08012ab380d35b2856a0
-    Reviewed-on: https://code.wireshark.org/review/4961
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 960ddb0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 27 13:42:37 2014 +0100
-
-    HPSW: Fix display of wrong length
-    
-    Change-Id: Iaa0cff55b4f8bbdd50eec665c134a2f21e21f9d4
-    Reviewed-on: https://code.wireshark.org/review/4951
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit a2b9b90
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 27 23:49:28 2014 -0700
-
-    Some additional information from bug 10637.
-    
-    That bug includes a capture and a screendump of OmniPeek's dissection of
-    the packet in that capture; this lets us identify some tags as the
-    center frequency of the 802.11 channel and a set of extended flags used
-    for 802.11n and 802.11ac.
-    
-    Show some flags from bug 9586, under the assumption that certain fields
-    in the Peek tagged header correspond to certain fields in the remote
-    Peek protocol.
-    
-    Change-Id: I0f3c2e6638d6cf5f6ec470d65bd574171a2d958d
-    Reviewed-on: https://code.wireshark.org/review/4969
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7e6b029
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 27 23:41:13 2014 -0700
-
-    Bug 9586 says bit 0x00000100 in the "802.11n flags" means "802.11ac".
-    
-    Also, the 0x00000100 flag is "MCS index used", if a dissection of an
-    802.11n frame by OmniPeek is to be believed and if the "802.11n flags"
-    have the same meaning in Peek tagged files and in the Peek remote
-    protocol.
-    
-    Rename that field to "extended flags", as it's not just for 802.11n, add
-    the "802.11ac" flag, and rename the "future use" flag.
-    
-    Change-Id: I605622801450d5d114c3c971c98960b198346bdd
-    Reviewed-on: https://code.wireshark.org/review/4968
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0a5d6a1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 28 00:01:08 2014 +0100
-
-    MAUSB: fix warning: no previous prototype for 'proto_register_wfa_oui' [-Wmissing-prototypes]
-    
-    Change-Id: I86cc9f6f9cd50a6e081aabc10bce077281eb2d76
-    Reviewed-on: https://code.wireshark.org/review/4959
-    Reviewed-by: Sean Stalley <seanstalley@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6369b8e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Oct 27 20:59:31 2014 -0700
-
-    Try to fix dist.
-    
-    Change-Id: I1802fd4e53132e76534b6dadbaa9713249af42e5
-    Reviewed-on: https://code.wireshark.org/review/4966
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 6055f35
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 27 20:59:53 2014 -0700
-
-    The "data rate" field in the 11n version of the header is an MCS index.
-    
-    Change-Id: I5f23bec128444b6590b5fc938bbe0e8a679cd31b
-    Reviewed-on: https://code.wireshark.org/review/4965
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5bed338
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 27 13:43:15 2014 +0100
-
-    HPSW: Fix soft-deprecated APIs warning
-    
-    Change-Id: I2f69781972fe2737e09d275dc842c4ea744e7fb1
-    Reviewed-on: https://code.wireshark.org/review/4952
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 7ff0860
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 27 23:59:37 2014 +0100
-
-    Knxnetip: fix warning: ISO C does not allow extra ';' outside of a function
-    
-    Change-Id: I43da305fcf7b8a18699ab1c14ba2b7868aa8897b
-    Reviewed-on: https://code.wireshark.org/review/4958
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit f62d60b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 27 23:57:59 2014 +0100
-
-    Infiniband: fix warning: C++ style comments are not allowed in ISO C90
-    
-    Change-Id: I706d6b7cf4c8d0367f485b55fa11a905bff426d1
-    Reviewed-on: https://code.wireshark.org/review/4957
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 55cc577
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 27 23:57:05 2014 +0100
-
-    Couchbase: fix no previous prototype for ... [-Wmissing-prototypes]
-    
-    Change-Id: Ieaefb9d50bf0224f4e90585d138867d0b88d5814
-    Reviewed-on: https://code.wireshark.org/review/4956
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 2418d06
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 27 23:56:14 2014 +0100
-
-    AllJoyn: fix warning: no previous prototype for 'add_padding_item' [-Wmissing-prototypes]
-    
-    Change-Id: Id18ac125390efa22638845083f7d0d5eaf71cb97
-    Reviewed-on: https://code.wireshark.org/review/4955
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 309840f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 28 00:10:46 2014 +0100
-
-    TN5250: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: Ida9f7198d6e3ef7bab5d787883116600019180ec
-    Reviewed-on: https://code.wireshark.org/review/4963
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 60172fa
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 28 00:10:24 2014 +0100
-
-    ADB_cs: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I88e191c9eaf5f81b3d6d905ec9e7b7d27f0d21a3
-    Reviewed-on: https://code.wireshark.org/review/4962
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit c5e66b1
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Oct 27 17:32:26 2014 -0700
-
-    Qt: Add a set of 2x 24-pixel toolbar icons.
-    
-    Add a script to create each PNG from its source SVG using Inkscape
-    (which can conveniently be run from the command line).
-    
-    Change-Id: Ief7410cf76fb1553ce56f1c6bc1ade03ab5db1d6
-    Reviewed-on: https://code.wireshark.org/review/4964
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 84f0ce4
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Oct 27 10:28:45 2014 -0700
-
-    Qt: Add bits display support to the byte view.
-    
-    Add todo items for showing and hiding the offset, hex/bits, and
-    ASCII/EBCDIC sections and adding UTF-8 support.
-    
-    Change-Id: Ia40faf3f939ef1a8fca6fac827057bd89045482a
-    Reviewed-on: https://code.wireshark.org/review/4949
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit ee72432
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Oct 26 23:16:30 2014 -0400
-
-    Add enumerated value 639 to vals_parm_PID.
-    
-    Per http://www.nowsms.com/discus/messages/1/EMI_UCP_Specification_40-8156.pdf
-    
-    Bug: 10463
-    Change-Id: I55957f7b77b3dcf8c65c288791fed6428a1f4ba5
-    Reviewed-on: https://code.wireshark.org/review/4944
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1c15981
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Oct 26 18:48:14 2014 -0700
-
-    Qt: ByteViewText hover information.
-    
-    When the user hovers over a byte view field, highlight it and show a
-    description in the status bar.
-    
-    Add a "byte" status bar context and fix a label stack pop bug.
-    
-    Keep proto_find_field_from_offset from matching generated items.
-    Otherwise hovering and selecting finds things like GeoIP entries and
-    checksum validation information. This affects the GTK+ UI as well.
-    
-    Change-Id: Ic81c0d8159510a72d30c41f961807d8a48d05e16
-    Reviewed-on: https://code.wireshark.org/review/4943
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit c33deaa
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Oct 26 23:27:22 2014 +0100
-
-    SSL 3.0 and TLS ciphersuite values are two bytes long
-    
-    Change-Id: I3ea2846fd4273efe654358ad4a317cb9b3670181
-    Reviewed-on: https://code.wireshark.org/review/4942
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 3ac46ed
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Oct 26 23:24:28 2014 +0100
-
-    add TLS_FALLBACK_SCSV
-    
-    Change-Id: I02ef08b6726f935d79cd3ca4f10ead5f1d18ee20
-    Reviewed-on: https://code.wireshark.org/review/4941
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 079a017
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Oct 26 08:06:15 2014 -0700
-
-    [Automatic manuf, services and enterprise-numbers update for 2014-10-26]
-    
-    Change-Id: If2287edfd2a5b1ddcb6e365485020805aaf9cd88
-    Reviewed-on: https://code.wireshark.org/review/4937
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 803a2f9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Oct 25 19:44:56 2014 -0400
-
-    Various Mobile IPv6 bugfixes
-    
-    Most of this was found by Boaz Brickner, but to prevent a few more bug reports, I tried to find any remaining MIPv6 options that used -1 to read until "end of packet" instead of "end of option"
-    
-    1. Option-Code and Reserved fields should be 1 byte, not 2 in Local Mobility Anchor Address mobility option
-    2. IPv6 AUTH mobility option parses Mobility SPI
-    3. IPv6 MESG-ID (should just be a timestamp field)
-    4. IPv6 Redirect Mobility Option K and N bits are parsed incorrectly
-    
-    5. The following options had a field that read until the end of the packet instead of the end of the option:
-    DNS-UPDATE-TYPE
-    AUTH Authentication Data
-    Care Of Test
-    Permanent Home Keygen Token
-    CGA Parameters
-    Signature
-    Experimental Mobility Option
-    
-    Bug: 10630
-    Bug: 10629
-    Bug: 10626
-    Bug: 10625
-    Bug: 10624
-    Bug: 10622
-    Bug: 10619
-    Change-Id: I14c984a237efc1d1a09618d9a4a1caef1eaf8df0
-    Reviewed-on: https://code.wireshark.org/review/4932
-    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 3ffd8c5
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Mon Oct 13 16:09:09 2014 -0700
-
-    Use Wifi Alliance OUI for MA USB packets over SNAP
-    
-    Change-Id: Icf4c995c8fbdb886e8b4e79a1fc7b62ac7137a07
-    Reviewed-on: https://code.wireshark.org/review/4667
-    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 155c939
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Oct 25 17:19:38 2014 -0700
-
-    Use better theme-derived colors. Switch back to AlternateBase for
-    protocol-level highlighting.
-    
-    Change-Id: I3de3442885b93093c3a4f5341080713a2039cd4c
-    Reviewed-on: https://code.wireshark.org/review/4933
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 6e5784d
-Author: Joseph Huffman <jhuffman@codeaurora.org>
-Date:   Tue Oct 21 11:23:45 2014 -0700
-
-    Added support for AllJoyn Reliable Datagram Protocol.
-    
-    Change-Id: I3ec37d7aec0c51f9bd0791c8fa0c5ef3dabc9fbf
-    Signed-off-by: Joseph Huffman <jhuffman@qce.qualcomm.com>
-    Reviewed-on: https://code.wireshark.org/review/4414
-    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 30742dd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 25 16:08:02 2014 -0700
-
-    Expand comments.
-    
-    Change-Id: I92348f98cd04ff0e7fc05e472075315ca0fd260e
-    Reviewed-on: https://code.wireshark.org/review/4931
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6ebb50c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 25 15:40:50 2014 -0700
-
-    Get rid of a trailing blank.
-    
-    Change-Id: I7963f05a78ec764a21d388fcdba618ffbcf935e4
-    Reviewed-on: https://code.wireshark.org/review/4930
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f36bbff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 25 15:38:27 2014 -0700
-
-    Update a comment.
-    
-    Change-Id: I55002477a416710592a482725af68cdf2511e063
-    Reviewed-on: https://code.wireshark.org/review/4929
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 1a45f18
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Oct 25 13:06:05 2014 -0700
-
-    More offset color adjustments.
-    
-    Change-Id: I52cf406443988624fb0e4a9e180963c599c8b91d
-    Reviewed-on: https://code.wireshark.org/review/4928
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 3d2ec16
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Oct 25 12:36:32 2014 -0700
-
-    Qt: ByteViewText fixups.
-    
-    Calculate our X coordinate using floating point arithmetic. This should
-    hopefully fix the wierd subpixel text shifting for some font sizes.
-    
-    Add alpha blending convenience routines to ColorUtils. Use them to
-    create the offset colors. The button color palette wasn't working very
-    well under Ubuntu.
-    
-    Use QFontMetricsF::lineSpacing for our line height.
-    
-    Note that we don't support the BOLD gui.hex_dump_highlight_style
-    preference. Leave a hint for anyone wishing to do so. Comment out
-    related code for now.
-    
-    Change-Id: Ief77c9c8d00e05560cae6ecd781bd309027f6f5a
-    Reviewed-on: https://code.wireshark.org/review/4927
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 41f6923
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sat Oct 25 14:08:57 2014 -0400
-
-    ncp2222: initialize buffer in build_expert_data
-    
-    We do a bunch of conditional logic to fill in the buffer, and then were checking
-    strlen(buffer) to see if we'd actually filled it in or not, but if we hadn't
-    then the buffer was garbage and strlen(buffer) was throwing valgrind warnings.
-    Ensure this works as intended by setting the first byte of the buffer
-    unconditionally at the beginning, so strlen(buffer) returns 0 as expected in
-    that case.
-    
-    Bug: 10628
-    Change-Id: I6f6c29fbbcb601b6ebccb3a4b312f0fa72c169ae
-    Reviewed-on: https://code.wireshark.org/review/4924
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 88d1bba
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Oct 21 16:52:21 2014 +0200
-
-    Italian translation fixes
-    
-    Change-Id: I1dec07f6a3e721a4f35c8cde2da136e34d8e4cb2
-    Reviewed-on: https://code.wireshark.org/review/4915
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ceff4ed
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Oct 24 13:24:23 2014 -0700
-
-    Qt: Refactor ByteViewText.
-    
-    Instead of subclassing QTextEdit and filling it with the entire contents
-    of our tvbuff, subclass QAbstractScrollArea and draw text by hand only
-    when needed. The new code should be *much* faster.
-    
-    Some code based on QHexView by Even Teran
-    (https://code.google.com/p/qhexview/).
-    
-    To do:
-    - Finish the bit view implementation.
-    
-    Change-Id: Ie44de6870d80711cd44324521a17ab76bcefe5e5
-    Reviewed-on: https://code.wireshark.org/review/4922
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 001dbaf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Oct 21 19:38:25 2014 +0200
-
-    ESP: honor enable_null_encryption_decode_heuristic preference when the ESP packet does not match any known SA
-    
-    Otherwise checking the enable_encryption_decode preference will completely ignore enable_null_encryption_decode_heuristic
-    
-    Change-Id: I34744ddb2080453dab7cd7d34f47b4984969993c
-    Reviewed-on: https://code.wireshark.org/review/4897
-    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 48da429
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Oct 22 09:02:46 2014 -0400
-
-    Add a "placeholder protocol" for H.223 to avoid confusion when using Decode As.
-    
-    The Decode As dialog presents two H.223 options and only "trial and error" can determine if you want bitswapping or not.
-    
-    Change-Id: I9303c73375d130d3097d347bb374019dfc714068
-    Reviewed-on: https://code.wireshark.org/review/4909
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d2bb61a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Oct 23 08:41:39 2014 -0700
-
-    OS X: Integrate CMake and osx-app.sh
-    
-    Add a -cb/--create-bundle option to osx-app.sh which builds the
-    application bundle. Use it in Autotools. (CMake does this by default.)
-    
-    Copy over linker flags from configure.ac to CMakeLists.txt to support
-    rpathification and code signing.
-    
-    Add an osx-app custom target to CMake.
-    
-    Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803
-    Reviewed-on: https://code.wireshark.org/review/4918
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 97a920c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 23 03:27:15 2014 -0700
-
-    Don't free global_capture_opts.ifaces_err_info.
-    
-    Leave it around in case InterfaceTree::display() gets invoked without an
-    intervening call to scan_local_interfaces() (that would cause a
-    double-free) or in case scan_local_interfaces() gets called afterwards
-    (as it frees global_capture_opts.ifaces_err_info before setting it
-    again, so there's no leak there, but there would be a double-free).
-    
-    This should prevent at least one crash I've seen.
-    
-    Change-Id: Iedd3959b420c09971557c473cc87aefd4454078c
-    Reviewed-on: https://code.wireshark.org/review/4917
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a0d5ef8
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Oct 21 13:36:16 2014 +0200
-
-    Lua: Added support for FT_EUI64.
-    
-    Bug: 10603
-    Change-Id: I21da496834b83466585f5b77f87970e3fab28b12
-    Reviewed-on: https://code.wireshark.org/review/4894
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit e6750fe
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Oct 22 19:48:34 2014 +0200
-
-    Couchbase: fix some warnings found by the pre-commit hook
-    
-    Change-Id: I16c8f5690973465728071abdf85c0f275433951e
-    Reviewed-on: https://code.wireshark.org/review/4913
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e2bece7
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Oct 22 10:05:35 2014 -0700
-
-    Qt: Show / hide main widgets.
-    
-    Remove existing code which uses the visibilityChanged signal. It exists
-    in QToolbar but not QWidget. Use the actions to drive visibility
-    instead.
-    
-    Update MainWindow::layoutPanes to respect "recent" settings.
-    
-    Move the show / hide actions to the top of the View menu to match GTK+.
-    
-    Change-Id: I670682e2a094945dbd36c80f43cd14515bbca5a6
-    Reviewed-on: https://code.wireshark.org/review/4911
-    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 c5a8876
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Oct 22 19:45:36 2014 +0200
-
-    Couchbase: fix FSF address and reorder opcode_vals array
-    
-    Change-Id: I41448f9a111dde24c29984d8e4f053fc2a668c9e
-    Reviewed-on: https://code.wireshark.org/review/4912
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 58304b9
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Oct 22 16:14:03 2014 +0200
-
-    S1AP: Add an S1AP context to be able to determine which message and
-    message type an IE was sent in. Needed to dissect proprietarry data.
-    
-    Change-Id: Ie75a2f6a544cb33e22c42457b0edd83e6456bfe5
-    Reviewed-on: https://code.wireshark.org/review/4910
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 589db1c
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Wed Jul 9 15:58:13 2014 +0300
-
-    Add Couchbase dissector (binary protocol)
-    
-    Include new Couchbase Server 3.0 DCP support
-    
-    Change-Id: I38d0edd7d135a92c130a60dab650aef0ab1205be
-    Reviewed-on: https://code.wireshark.org/review/2956
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 2dbc852
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Oct 22 14:39:59 2014 +0200
-
-    Add packet-adb_service.h to epan/dissectors/Makefile.common
-    
-    Change-Id: Idfcd18d09cc5aa2572a47117d3788bc3c0368fb3
-    Reviewed-on: https://code.wireshark.org/review/4908
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit fc4471f
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Oct 16 12:34:39 2014 +0200
-
-    Bluetooth: A2DP: APT-X does not use RTP while there is no content protection
-    
-    Change-Id: I5ff8ffdda827b08ee7e284c15e70dadc368b009e
-    Reviewed-on: https://code.wireshark.org/review/4906
-    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 c2f58d3
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Feb 2 19:12:55 2014 +0100
-
-    Android: Add ADB dissector
-    
-    Previoulsy added "adb_cs" is only for adb client <-> adb daemon communication
-    by loopback interface (by TCP). But there is also communication between
-    adb daemon and device (by TCP or USB). This transport protocol is different, but
-    now support is done.
-    
-    ADB services are shared between ADB and ADB_CS so put them into "adb_service"
-    dissector. There is still some services to be added.
-    
-    Change-Id: I754331d3dc6ccf3c17445f5563d01cf2fe1489c7
-    Reviewed-on: https://code.wireshark.org/review/4651
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 0ce3640
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Oct 21 17:14:07 2014 -0400
-
-    Replace pinfo->circuit_id will passing data through functions.
-    
-    Change-Id: I5b35ad57c5c40a1393cbc174384b8a275abd763c
-    Reviewed-on: https://code.wireshark.org/review/4903
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 527796b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Oct 21 21:45:51 2014 -0400
-
-    Refactor pinfo->circuit_id behavior for ISUP dissector
-    
-    Change-Id: Idf6e68c53a0a2126f3906bbfa16166821735fc1b
-    Reviewed-on: https://code.wireshark.org/review/4904
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 0c444f3
-Author: Gerald Combs <gerald@zing.org>
-Date:   Tue Oct 21 20:51:34 2014 -0700
-
-    OS X: Fix osx-dmg.sh bundle binary path.
-    
-    Change-Id: Ia7c59de4f8b59dda9dbc484b8fa9ae0c3d88d594
-    Reviewed-on: https://code.wireshark.org/review/4905
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit fc75085
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 19 15:35:47 2014 +0200
-
-    libnghttp2: Update to 0.6.4
-    
-    Change-Id: Ic8878f818a89ebc1056777a5b0838e8a5b1215d5
-    Reviewed-on: https://code.wireshark.org/review/4834
-    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 9ddbc8d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 21 13:36:10 2014 -0700
-
-    Qt: Fill in time display menu items. Other fixes and updates.
-    
-    Reselect the current packet when we redraw the packet list.
-    
-    Don't crash if we try to mark when no frame is selected. Try to
-    invalidate cached packet list strings when needed. Rename
-    PacketList::updateAll to redrawVisiblePackets so that its purpose is
-    more clear. When changing the font size, call redrawVisiblePackets
-    instead of rebuilding the entire list of visible rows.
-    
-    Change-Id: I6e7a15067e7063d0efc26082170e1795ae3c0779
-    Reviewed-on: https://code.wireshark.org/review/4901
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit e5d967b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 21 16:30:24 2014 -0700
-
-    osx-app.sh: Add verbosity.
-    
-    Change-Id: I3cd1c49909af34badd0d5c5f29bfcddb753ef2bf
-    Reviewed-on: https://code.wireshark.org/review/4902
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 24f0888
-Author: Michael Tüxen <tuexen@wireshark.org>
-Date:   Tue Oct 21 22:26:15 2014 +0200
-
-    Fix the condition for an expert info
-    
-    The condition triggering an expert info if the reliability
-    parameter is non-zero, but a reliable data channel is
-    negotiated was wrong. Now the type field is considered
-    correctly.
-    While there, update the reference.
-    
-    Change-Id: I1f2f78861d6a44c5334fd44e2038bbfdc52fa919
-    Reviewed-on: https://code.wireshark.org/review/4900
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
-
-commit 4664ac6
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Oct 21 20:03:03 2014 +0200
-
-    fix wrong offset for ID Capability Flags 1
-    reported by Jean-Marc Lamond
-    
-    Bug: 10597
-    Change-Id: I481fad9cd0b8d55e3dd3af00cde2897105547f13
-    Reviewed-on: https://code.wireshark.org/review/4898
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 1463db3
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Oct 20 22:56:34 2014 +0200
-
-    tn5220: prevent another potential endless loop
-    exit the loop if dissect_unknown_data() returns 0
-    
-    Change-Id: I681d170d4daf8efb06231790652ff7c941b46d89
-    Reviewed-on: https://code.wireshark.org/review/4882
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit b757038
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Oct 21 19:39:39 2014 +0200
-
-    no need for if(tree)
-    
-    Change-Id: I529a601ce83c446247cee1e87386622462f24f56
-    Reviewed-on: https://code.wireshark.org/review/4896
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 5f6be84
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Oct 20 23:01:22 2014 +0200
-
-    no need for continue at the end of a while loop, we loop anyway
-    
-    Change-Id: I96ff9ee0967fcdb2c8122649a2363a36ea2a2882
-    Reviewed-on: https://code.wireshark.org/review/4884
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 8638624
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Oct 17 18:56:58 2014 -0700
-
-    Make the "-qt" option the default in the OS X packaging scripts.
-    
-    Change-Id: I1e404c342d06381be71735ff6fbc47e9b2b13899
-    Reviewed-on: https://code.wireshark.org/review/4895
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 39b631d
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Oct 21 11:00:40 2014 +0200
-
-    Add OID callback for private IEs making it possible to call a dissector
-    for the private OID.
-    
-    Change-Id: Ibb86d8523f1aee14ba1a843ec3ad4becc7729013
-    Reviewed-on: https://code.wireshark.org/review/4893
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 750d377
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 17 16:54:28 2014 +0200
-
-    Add OID dissector table for PER based dissection.
-    
-    Change-Id: Iaf789017e997eddf7d6dc596eb40fdef413bfd68
-    Reviewed-on: https://code.wireshark.org/review/4778
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit c4dc9ed
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 21 00:51:17 2014 -0700
-
-    Handle an hfindex of -1.
-    
-    Code generated by the current version of Pidl dissects bitset fields
-    twice - once with proto_tree_add_item(), which puts the actual item into
-    the tree, so that we can create a subtree under it, and once with a
-    dissect_dcerpc_{type}() routine, to fetch the value and step past the
-    field.  The second call passes an hf_ index value of -1; interpret that
-    as meaning "don't put this into the protocol tree", rather than just
-    blindly calling proto_tree_add_XXX with -1 and getting a dissector
-    assertion.
-    
-    Change-Id: I42fc023e77514a8a8a25d5c9db11fa3ef053babf
-    Reviewed-on: https://code.wireshark.org/review/4892
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7522497
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 22:29:11 2014 -0700
-
-    With CMake, define WANT_PACKET_EDITOR in config.h.
-    
-    Just as we do with autotools and nmake, define it in config.h, so it's
-    defined the same for every single file, rather than defining it in one
-    particular directory's Makefiles, so that it's defined for some code but
-    not all.
-    
-    Change-Id: Ic41cd10f2b502e0be76c134cbeaad94dff7623f8
-    Reviewed-on: https://code.wireshark.org/review/4891
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8dd032e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 18:25:10 2014 -0700
-
-    file.c isn't in a DLL, so what it exports shouldn't be WS_DLL_PUBLIC.
-    
-    Change-Id: I1fcd0422703d21ce3d0764a23bd491708ffc6785
-    Reviewed-on: https://code.wireshark.org/review/4890
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 8868cf1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 18:23:32 2014 -0700
-
-    Fix the earlier checkin.
-    
-    Remove some trailing white space while we're at it.
-    
-    Change-Id: If399077a799e24302640776760b4388687ecad4f
-    Reviewed-on: https://code.wireshark.org/review/4889
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 29ab967
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 17:57:08 2014 -0700
-
-    Fix a number of what appear to be errors.
-    
-    Add checks for too-short length fields.
-    
-    Increment the offset after some proto_tree_add_item() calls to skip past
-    the item.
-    
-    Make some other length calculations use the start of the item to which
-    the length applies, not the start of the *list* of items.
-    
-    Fix a double-digit field to be 2 bytes long (as the documentation says
-    it is).
-    
-    Add a comment about a field that isn't always present but that's
-    specified in a tn5250_add_hf_items() list.
-    
-    Fix DEFINE PITCH TABLE to match what the documentation appears to say it
-    is.
-    
-    Change-Id: Ibcdc580045c68e8d0d8f35011dfe72b9c245e157
-    Reviewed-on: https://code.wireshark.org/review/4888
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a19825b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Oct 20 16:11:48 2014 -0700
-
-    CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.
-    
-    Have FindWSWinLibs check for WIRESHARK_LIB_DIR before WIRESHARK_BASE_DIR
-    to match the behavior of config.nmake and the Windows buildbots, which
-    set the former but not the latter.
-    
-    It looks like the latest GLib DLL contains GThread. Adjust
-    FindGTHREAD2.cmake accordingly.
-    
-    Change-Id: I0232b1819eca9ba2c39ae6834daddf65af979d7d
-    Reviewed-on: https://code.wireshark.org/review/4887
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit f66e45b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 16:36:19 2014 -0700
-
-    Export cf_set_frame_edited().
-    
-    Change-Id: I6569b020ff00d6748840a00ca418653d9e3fdb9b
-    Reviewed-on: https://code.wireshark.org/review/4886
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 43a21c8
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Oct 20 16:32:42 2014 -0400
-
-    kafka: summarize number of messages in a set
-    
-    Change-Id: I62873a147426079aa4890289320c43ef7f1b26dc
-    Reviewed-on: https://code.wireshark.org/review/4877
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 77f9699
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 14:36:52 2014 -0700
-
-    Fix support for writing out edited records.
-    
-    Add a cf_set_frame_edited() routine to set the record header and data
-    for a record; have it do all the non-GUI work, and have it set the
-    file's "unsaved changes" flag.
-    
-    Have the GUI code just call that routine and then update the title bar
-    to reflect the unsaved changes.
-    
-    While we're at it, unmark a no-longer-unused argument to save_record().
-    
-    Change-Id: Ieb513fdf423b388519527621ecec4cf634b98caf
-    Reviewed-on: https://code.wireshark.org/review/4885
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0bbe483
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Oct 20 22:44:25 2014 +0200
-
-    Proto: Fixed proto_unregister_field()
-    
-    This function did not work after svn revision 51396.
-    This fix affects http, imf and ldap preferences.
-    
-    Change-Id: I6fcb24c968d03c7d1fdc018cfa907f9cfd8809bb
-    Reviewed-on: https://code.wireshark.org/review/4881
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit bc27265
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Oct 20 22:37:51 2014 +0200
-
-    tn5250: fix an endless loop, exit when offset is not incremented
-    
-    Bug: 10596
-    Change-Id: I64509aa49fce4893dee4e7a74a560e09a98830f6
-    Reviewed-on: https://code.wireshark.org/review/4878
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit a2508bd
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Oct 20 11:20:54 2014 -0700
-
-    OS X: Add retina / hidpi support to Info.plist.
-    
-    This should partially fix the problem described at
-    https://ask.wireshark.org/questions/37177/pixelated-ui-on-mac-os-x-with-development-1990
-    
-    Change-Id: I436aae0d5b681e9ff549d257c2244ee67448ab07
-    Reviewed-on: https://code.wireshark.org/review/4876
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit d86b308
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Oct 20 10:08:56 2014 -0400
-
-    kafka: compression codec is unsigned
-    
-    Change-Id: I238e93dd035caa359fed768aa2aac4df5a0ef47e
-    Reviewed-on: https://code.wireshark.org/review/4875
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit c3f14ab
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 02:03:21 2014 -0700
-
-    Don't use toupper() in the test program.
-    
-    We're not including ctype.h in the test program, so don't use toupper().
-    The test program might not be built with GLib, so don't use
-    g_ascii_toupper(), either.  Just compare against both 'Y' and 'y'.
-    
-    Change-Id: Iabc04a5fecb04110c0d16b24a047de72eabbb2bc
-    Reviewed-on: https://code.wireshark.org/review/4870
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 991743b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 01:48:56 2014 -0700
-
-    Get rid of another toupper() call in favor of g_ascii_toupper().
-    
-    Change-Id: If527af69ec96a91c4127c95307c3b93b79b53e2f
-    Reviewed-on: https://code.wireshark.org/review/4865
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9eb0080
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 01:08:19 2014 -0700
-
-    Sign, Flex strikes again; it generates code that produces warnings.
-    
-    Change-Id: Ibd92bd07e537a4ac19e2a5b159ece0e25aa366b1
-    Reviewed-on: https://code.wireshark.org/review/4861
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 091aea8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 00:59:26 2014 -0700
-
-    And some more comment cleanup.
-    
-    Change-Id: Idfc541a08de2ed9e1ca8bccca366612830213ead
-    Reviewed-on: https://code.wireshark.org/review/4858
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 700bfdc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 00:45:26 2014 -0700
-
-    More comment cleanup.
-    
-    Change-Id: Ifa65c3090e204b93ec526358b863fdf9bafc6a03
-    Reviewed-on: https://code.wireshark.org/review/4857
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 9ffb72b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 20 00:41:35 2014 -0700
-
-    Clean up some comments.
-    
-    Change-Id: Ibe96878ba9ae94f9f22a221797fb36d713286d32
-    Reviewed-on: https://code.wireshark.org/review/4856
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 80e6f62
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 19 23:14:50 2014 -0700
-
-    Get rid of calls to ctype.h functions.
-    
-    They don't handle values outside the range -1 to 127, and their behavior
-    is locale-dependent.  Use g_ascii_isXXX() and g_ascii_toXXX() instead of
-    isXXX() and toXXX().
-    
-    If you're checking for printable ASCII, don't use isascii() and don't
-    use iscntrl(), use g_ascii_isprint().  If you're checking for graphical
-    ASCII, i.e. printable ASCII except for a space, use g_ascii_isgraph().
-    
-    Use ws_xton() to convert a hex digit character to the corresponding
-    numeric value.
-    
-    Change-Id: Id3039bc586fbf66d8736c2df248c790c0d7a2330
-    Reviewed-on: https://code.wireshark.org/review/4851
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 0b9eb9f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 19 23:01:17 2014 -0700
-
-    Get rid of unnecessary includes of ctype.h.
-    
-    Change-Id: I2cf49f808558147ce77e7d086558966cfb2defca
-    Reviewed-on: https://code.wireshark.org/review/4850
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 39c3a79
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Oct 16 14:04:57 2014 +0200
-
-    Check if mask_greatest_bit_offset is within limits.
-    
-    The result of the '>>' expression is undefined if mask_greatest_bit_offset = 0.
-    
-    Change-Id: I15b094a5220a5075878bad65ab0b8c5279e80e8a
-    Reviewed-on: https://code.wireshark.org/review/4723
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    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>
-
-commit 4963d99
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Oct 19 19:41:32 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-cdp.c
-    
-    Change-Id: I77e1f5788e0567dcaef9f75e1f45e61c63d54b4e
-    Reviewed-on: https://code.wireshark.org/review/4849
-    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 c9b84a5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 19 16:08:46 2014 -0700
-
-    This appears to be clean with my build; see if it needs work with others.
-    
-    Change-Id: I2c3e3ce8e29b26958d42b66eca3c7539b65695ab
-    Reviewed-on: https://code.wireshark.org/review/4848
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4d6b3db
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 19 16:00:41 2014 -0700
-
-    Eliminate a use of a ctype.h function.
-    
-    That way, we avoid locale-dependent behavior.
-    
-    Change-Id: I429fde961dc7cb61013756a663d6cd511f19ca70
-    Reviewed-on: https://code.wireshark.org/review/4845
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 2b6c267
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 19 15:41:04 2014 -0700
-
-    Eliminate use of ctype.h routines.
-    
-    That way, we don't do locale-sensitive case-insensitivity (yes, the
-    locale can affect case-mapping - in a Turkish locale, "I" isn't the
-    upper-case version of "i", for example).
-    
-    Change-Id: I5f7663e85160558ff3769617f924e45049c9c384
-    Reviewed-on: https://code.wireshark.org/review/4843
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit ac55a6d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Oct 19 15:39:12 2014 -0700
-
-    Get rid of unnecessary include of ctype.h.
-    
-    Change-Id: I30c4d75e16e1816c4a792e023ffe04f5a970b6d3
-    Reviewed-on: https://code.wireshark.org/review/4842
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5e4e17c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Oct 19 00:29:35 2014 -0400
-
-    Remove unnecessary tvb_ensure_bytes_exist calls.
-    
-    All of the calls removed are followed by proto_tree_add_xxx calls of the same offset/length of the tvb_ensure_bytes_exist call.  The proto_tree_add_xxx calls should throw the exception, so we don't need the "double check".
-    There are probably more calls that can be removed, these were just obvious as first glance, spurred mostly by noticing the (ab)use in packet-wsp.c
-    
-    Change-Id: I37cee347c8cf8ab0559e21562c802d3b37f4871e
-    Reviewed-on: https://code.wireshark.org/review/4833
-    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 1427a8e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Oct 19 08:05:58 2014 -0700
-
-    [Automatic manuf, services and enterprise-numbers update for 2014-10-19]
-    
-    Change-Id: Ifc13fdb5898cad85ba7cd35c28024f3d4fefe70a
-    Reviewed-on: https://code.wireshark.org/review/4839
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit db316c9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 19 16:18:29 2014 +0200
-
-    TDS: Make buildbot happy
-    
-    Fix Field 'Server Version' (tds.server_version) is an integral value (FT_UINT32) but is being displayed as BASE_NONE
-    
-    Change-Id: I601e71ac8e7928ef90fdd16956af3a34bca269a9
-    Reviewed-on: https://code.wireshark.org/review/4836
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8def8ef
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Oct 19 10:04:39 2014 -0400
-
-    packet-amqp.c: Temporary/preliminary fix for Bug #10582 (crash)
-    
-    This is a temporary/preliminary fix to prevent the buildbot fuzz-test
-     failures seen when testing the capture file attached to Bug #10582.
-    
-    As noted in the bug, a complete fix will require some reworking of
-      the amqp dissector.
-    
-    Change-Id: I2571f1eeb46a7eede04b8d809e87b95f1ff529df
-    Reviewed-on: https://code.wireshark.org/review/4835
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 8842e2e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Oct 17 10:11:22 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-tds.c
-    
-    Change-Id: Ib3dc7f8a87e55ef34d4847f4837d645e418607a3
-    Reviewed-on: https://code.wireshark.org/review/4826
-    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 ec5159b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Oct 18 15:48:28 2014 +0200
-
-    PCAPNG (wiretap): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I6337fe88bbfd76161abc3b51c70402e7e63a435e
-    Reviewed-on: https://code.wireshark.org/review/4813
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 54dfe3b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Oct 18 20:45:30 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-smpp.c
-    
-    Change-Id: I6e1e62ff7910be535229d7e1a15557879a5cee1f
-    Reviewed-on: https://code.wireshark.org/review/4832
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 7f53986
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Oct 18 20:45:12 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-nhrp.c
-    
-    Change-Id: I51702e9372551a28ea604d21d4bbf0eb4d9588ae
-    Reviewed-on: https://code.wireshark.org/review/4831
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 6720c80
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Oct 18 18:09:57 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-ismp.c
-    
-    Change-Id: Ie2a395b808a8879625185a6de458f61d386cff55
-    Reviewed-on: https://code.wireshark.org/review/4830
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit e0e03ee
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Oct 18 09:26:52 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-arp.c
-    
-    Change-Id: Ie9596df97a135b411693eefc39fdbd03316166a0
-    Reviewed-on: https://code.wireshark.org/review/4828
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit c347eb9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Oct 18 13:23:28 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-ipx.c
-    
-    Change-Id: Ie084a33be94d91eec7f5f70ef31fcb0835ad266c
-    Reviewed-on: https://code.wireshark.org/review/4829
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 283f478
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Oct 18 09:25:33 2014 -0400
-
-    Eliminate proto_tree_add_text from packet-igrp.c
-    
-    Change-Id: If73e3bb924036b7746d15058e9fca6f551f9538c
-    Reviewed-on: https://code.wireshark.org/review/4827
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 147e7fe
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Oct 9 10:10:36 2014 +0200
-
-    Lua: Added ProtoField.none
-    
-    This field can be used for adding filterable subtree entries.
-    
-    Change-Id: Id395c9a8194dc00e6544170631b48d71ae9dd33e
-    Reviewed-on: https://code.wireshark.org/review/4573
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-
-commit e7b07ae
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Oct 18 16:08:58 2014 +0200
-
-    IPv6: QuickStart option Nonce is read incorrectly
-    
-    In Wireshark, the option's TTL field looks ok, but the [TTL diff] field points to the byte after the TTL field, which is part of the nonce field.
-    The nonce field is being read one byte after where it should be read and so the value being read is incorrect.
-    Moreover, the option data length says 6 but because of the extra byte being read 7 bytes are being read for this option data and the next option is read one byte later incorrectly so the options after the QuickStart option are being read incorrectly.
-    
-    Found by boaz
-    Bug:10575
-    
-    Change-Id: Icd836b2a5c2f92cef7b6fea61957a85fca5e3352
-    Reviewed-on: https://code.wireshark.org/review/4815
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 51f4962
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Oct 18 16:55:46 2014 +0200
-
-    MIPv6: Mobility Option Mobile Node Link Layer Identifier Link-layer Identifier field is read beyond the option data
-    
-    there's a single IPv6 packet with Mobile Node Link Layer Identifier mobility option.
-    The option's data length is 9 but and since the Reserved field takes 2 bytes, the Link Layer Identifier field should take 7 bytes.
-    However, the Link Layer Identifier field is read until the end of the packet, which is 519 bytes.
-    
-    Bug:10578
-    Change-Id: I518de7f6b75e5b749cb029845fd4846954ca6d0e
-    Reviewed-on: https://code.wireshark.org/review/4818
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8a10f77
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Oct 18 16:45:01 2014 +0200
-
-    MIPv6: Mobility Option Binding Authorization Data for FMIPv6 Authenticator field is read beyond the option data
-    
-    There's a single IPv6 packet with Binding Authorization Data for FMIPv6 mobility option.
-    The option's data length is 14 but and since the SPI takes 4 bytes, the Authenticator field should take 10 bytes.
-    However, the Authenticator field is read until the end of the packet, which is 178 bytes.
-    
-    Found by boaz
-    Bug: 10577
-    Change-Id: Ia79c5131d8477c1a7c111c47c2a94e990bbeae4d
-    Reviewed-on: https://code.wireshark.org/review/4817
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 31c119f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Oct 18 16:31:01 2014 +0200
-
-    MIPv6: Mobility Option IPv6 Address/Prefix marks too many bytes for the address/prefix field
-    
-    One of the mobility options is the IPv6 Address/Prefix.
-    The prefix length of this option is 52.
-    Note that according to RFC 5568, the prefix length is in bits and not in bytes.
-    The IPv6 Address/Prefix field of this option marks 52 bytes.
-    
-    In addition, I'm not sure that the IPv6 Address/Prefix field is a variable size field.
-    RFC 5568 section 6.4.2 has a diagram of this options that shows this field as if it always takes 128 bits, and the prefix length field just says the length of the prefix (not the length of the field).
-    
-    Found by boaz
-    
-    Bug:10576
-    Change-Id: I2a9a35cb7c537ec3b91c9a089f14fa31f41d8c80
-    Reviewed-on: https://code.wireshark.org/review/4816
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 8d6fd8d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Oct 18 15:50:32 2014 +0200
-
-    GSM(_a_rr): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Change-Id: I07fe19af11bff3d001193e4af472c05090728392
-    Reviewed-on: https://code.wireshark.org/review/4814
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 27e4ac8
-Author: Mikael Kanstrup <mikael.kanstrup@gmail.com>
-Date:   Sat Oct 11 22:59:14 2014 +0200
-
-    Add support for split wiphy dump to Wireless Toolbar
-    
-    To populate the Wireless Toolbar menu the NL80211_CMD_GET_WIPHY
-    command is used. Some network interfaces must use split wiphy dump
-    feature for this command to function properly. One such example is the
-    D-Link DWA-160 USB adapter that does not show up when used without.
-    
-    Make use of split wiphy dump feature whenever kernel supports it
-    to populate the list of monitor interfaces for the Wireless Toolbar.
-    
-    Bug: 10564
-    Change-Id: Idc28e92f91a2488fa48eeb282a0ef1e2bd40a5f0
-    Reviewed-on: https://code.wireshark.org/review/4611
-    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 85e7c15
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Thu Oct 16 19:25:08 2014 +0200
-
-    Use proto_tree_add_expert_format instead of proto_tree_add_text
-    
-    Change-Id: Ia017fa9535cbc7570ce6bd442972eedd2143825a
-    Reviewed-on: https://code.wireshark.org/review/4729
-    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 975b02f
-Author: David Ameiss <netshark@ameissnet.com>
-Date:   Tue Oct 14 09:14:41 2014 -0500
-
-    Converted numerous proto_tree_add_none_format() calls for bitmask/flag items to proto_tree_add_bitmask().
-    Correctly set the length of LBT-RM and LBT-RU header blocks.
-    Various other cosmetic cleanups.
-    
-    Change-Id: If19bbdeb10176b8059fd4cf657719b3b9817bc6a
-    Reviewed-on: https://code.wireshark.org/review/4776
-    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 01cf7fe
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sat Oct 18 08:45:14 2014 +0200
-
-    Add URL to a description of the attributes
-    Add comments about additional attributes
-    
-    Change-Id: Ic73039ee6fde954e147a44e0f98def76a7e88fb3
-    Reviewed-on: https://code.wireshark.org/review/4812
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit ed676ca
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sat Oct 18 08:39:20 2014 +0200
+commit 30919f7
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 19 15:18:00 2016 -0700
 
-    Commit 54b733ce9a0d1cd4ab9b142479368a5e696360be broke compilation of
-    echld by removing TS_PREC_AUTO_USEC. Replace its use by TS_PREC_AUTO.
-    No idea whether that's correct but it compiles again.
-    Trying to commit this brought complaints by checkapi, so fixed them as
-    well.
+    Don't assume we have an array of GeoIP databases.
     
-    Maybe the echld code should be removed, it seems to be unmaintained.
+    The attempt to open them might fail; if geoip_dat_arr is null, just
+    return 0 as the number of databases, don't crash.
     
-    Change-Id: Id9a0a6fc129abd1b8c93629c31a89c2d9ea2243f
-    Reviewed-on: https://code.wireshark.org/review/4811
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Change-Id: I967d863d328a42d7dce79f58d4fa67d922d0cb2c
+    Reviewed-on: https://code.wireshark.org/review/16025
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 77acaa1
+commit 234d8ea
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 18:22:05 2014 -0700
+Date:   Sun Jun 19 14:12:30 2016 -0700
 
-    Get rid of unnecessary includes of ctype.h.
+    Pass the info strings directly to commandline_early_options().
+    
+    Just pass them directly as arguments, don't stuff them into a structure.
     
-    Change-Id: I9e2cd7a9fed33fc2f4b0c0da3603690450f6952d
-    Reviewed-on: https://code.wireshark.org/review/4809
+    Change-Id: Iac84226f54898bc953011bca64795e9049762905
+    Reviewed-on: https://code.wireshark.org/review/16022
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1de3a5b
+commit 85c805d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 17:22:30 2014 -0700
+Date:   Sun Jun 19 13:21:17 2016 -0700
 
-    Check for printable ASCII in an ENBName.
+    Handle capture options in pcap-less Wireshark in the commandline_ routines.
     
-    I'm not sure why the check is only for alphabetical characters; if
-    that's correct, change this to use g_ascii_isalpha, and change
-    is_printable_ascii to is_ascii_alpha or something such as that.
+    Get rid of the capture_option_specified and arg_error members of the
+    commandline_capture_param_info_t and commandline_param_info_t
+    structures, and have them be local variables in
+    commandline_early_options() and commandline_other_options().  Have
+    commandline_early_options() print the "sorry, Wireshark wasn't built
+    with pcap" and exit if -D was specified but Wireshark wasn't built with
+    pcap.
     
-    Don't use ctype.h routines, as they are locale-dependent.
-    
-    Change-Id: I61d0672350d35ad918e95d7e96ed5dd263102da9
-    Reviewed-on: https://code.wireshark.org/review/4805
+    Change-Id: I0efcdea89d9585af8f3c0a28aee060f33d3ec5fd
+    Reviewed-on: https://code.wireshark.org/review/16021
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 9f2a878
+commit 0ca9fc1
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 17:05:51 2014 -0700
+Date:   Sun Jun 19 13:00:13 2016 -0700
 
-    Get rid of unnecessary includes of ctype.h.
+    Fix indentation.
     
-    Change-Id: Ibf9385715b85186f5c7289165acea7233b3fabde
-    Reviewed-on: https://code.wireshark.org/review/4804
+    Change-Id: I71332dc35047e7d8d32b428fb99b8b9368c41de6
+    Reviewed-on: https://code.wireshark.org/review/16020
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e3477bd
+commit 42985f4
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 16:57:28 2014 -0700
+Date:   Sun Jun 19 12:55:48 2016 -0700
 
-    Get rid of some no-longer-necessary casts.
+    Those aren't capture options, they're the options we must process early.
+    
+    The only one of those options that has anything to do with packet
+    capture is -i, and all we do there is check for an argument of "-"; the
+    rest are either
+    
+       1) options that affect your preference settings (-C to select
+          the profile, -P to set the personal file directory path);
     
-    g_ascii_isXXX() can be handed a char value safely; they won't try to use
-    it as an index into a table before checking it.
+       2) options that just print something to the standard output or
+          error and exit, before firing up the GUI;
     
-    Change-Id: Icf80163fb5f9dccd0b97917e318b1db0bf3e0cf8
-    Reviewed-on: https://code.wireshark.org/review/4801
+       3) extension command line options (-X).
+    
+    Change-Id: Iba9b8b14fe468e2ca9d4c67e1a9b8103603678d9
+    Reviewed-on: https://code.wireshark.org/review/16019
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a91799e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 16:42:40 2014 -0700
+commit 147b3d5
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 19 02:33:13 2016 -0400
 
-    Don't use ctype.h routines.
+    Ability to invoke "Decode As..." as command-line argument for GUIshark.
     
-    That avoids locale dependency and handles possibly-signed chars(which
-    we weren't always doing before).
+    TShark has had the functionality for awhile. While the GUI version
+    still has ways to change and persist Decode As functionality, adding
+    command line functionality gives the Decode As from initial launch
+    of the GUI.
+    Was also an excuse to refactor a bunch of code out of tshark.c
     
-    Change-Id: I89e50678abb8c3e535081c92ca25bc1bab672c68
-    Reviewed-on: https://code.wireshark.org/review/4798
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 5143
+    Change-Id: Ie67007d75e897bc06cc9afd9b84372a96b93778c
+    Reviewed-on: https://code.wireshark.org/review/16008
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 19b7819
+commit f4fc03d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 16:30:56 2014 -0700
+Date:   Sun Jun 19 09:52:55 2016 -0700
 
-    Get rid of unnecessary includes of ctype.h.
+    Get rid of an unused variable.
+    
+    There's no need for the capture_option_specified variable; it's now in a
+    structure.
     
-    Change-Id: Ibb194cd839d174af9c96f7bb1e2941b3dd6c1ce1
-    Reviewed-on: https://code.wireshark.org/review/4797
+    Change-Id: Ic2f1faee4666eea7ae91fd6899cecaa76d0ceb9f
+    Reviewed-on: https://code.wireshark.org/review/16018
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 033f096
+commit 6febf9b
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 16:10:53 2014 -0700
+Date:   Sun Jun 19 09:29:21 2016 -0700
 
-    Don't use ctype.h routines.
+    Get rid of an unused variable; set a structure member.
     
-    That avoids locale dependency and handles possibly-signed chars (which
-    we weren't always doing before).
+    There's no need for the capture_option_specified variable, but we *do*
+    need to initialize the capture_option_specified member of *param_info
+    before parsing the flags.
     
-    Change-Id: Ieceb93029252f646397b6488f2df8a57c6d2a23d
-    Reviewed-on: https://code.wireshark.org/review/4794
+    Change-Id: I89d0b8c338c2784742b21ba4e854f702ce491849
+    Reviewed-on: https://code.wireshark.org/review/16017
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 344c2bb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 14:59:09 2014 -0700
+commit bb44b48
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 19 08:10:58 2016 -0700
 
-    strptime.c needs ctype.h.
+    [Automatic update for 2016-06-19]
     
-    Change-Id: Icf4020426d3a5e0a6bd2012a266cf07be9928abf
-    Reviewed-on: https://code.wireshark.org/review/4793
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: Idd2d53a32188f2e607351da874b1a68a4811ed57
+    Reviewed-on: https://code.wireshark.org/review/16014
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 214a78c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 14:27:07 2014 -0700
+commit a383e69
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jun 19 11:01:56 2016 +0200
 
-    Get rid of unnecessary include of ctype.h.
+    Revert "tap: change glib functions to wmem."
     
-    Change-Id: Ib83e707ebbbb420ce269a652ede6b7366d24240e
-    Reviewed-on: https://code.wireshark.org/review/4792
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985.
+    
+    It breaks the registration of codec, dissector and libwiretap plugins.
+    
+    Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
+    Reviewed-on: https://code.wireshark.org/review/16012
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit e304f6d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 14:22:24 2014 -0700
+commit ff84512
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sun Jun 19 10:33:59 2016 +0200
 
-    Get rid of unnecessary includes of ctype.h.
+    Add modelines
     
-    Change-Id: Ic23203f13fd6627b664e8ed1438d328c46328b9f
-    Reviewed-on: https://code.wireshark.org/review/4790
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3d5ed2e671ec761f3628fb8de6f393fdc915165e
+    Reviewed-on: https://code.wireshark.org/review/16011
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 5fc398c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 14:10:52 2014 -0700
+commit 51ceb6d
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Fri Jun 17 20:28:58 2016 +0200
 
-    Don't use ctype.h routines.
+    Calculate and print CWmin and CWmax in addition to ECWmin and ECWmax
     
-    That avoids locale dependency and handles possibly-signed chars (which
-    we weren't doing before).
+    This also changes the summary presentation to make it more compact
     
-    Change-Id: I189222eff624ad2d2e960bc0b69f3f22d35f351f
-    Reviewed-on: https://code.wireshark.org/review/4787
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I27ef8b2da280e36cff84dcb97d6d40dc0015a74b
+    Reviewed-on: https://code.wireshark.org/review/16000
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 36e4e6f
+commit f4fd1a3
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 14:04:37 2014 -0700
+Date:   Sun Jun 19 00:49:42 2016 -0700
 
-    Get rid of unused includes of <ctype.h>.
+    Fix problems when compiling without pcap.
     
-    Change-Id: Iab9eaeb0f5765748b2582177396264e4e69bc6d1
-    Reviewed-on: https://code.wireshark.org/review/4786
+    Change-Id: Id682a76ac561f92f65638bbdfcd4236eb92e46b7
+    Reviewed-on: https://code.wireshark.org/review/16010
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5bfde7c
+commit 8634cee
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 13:37:11 2014 -0700
+Date:   Sun Jun 19 00:38:41 2016 -0700
 
-    Don't use ctype.h routines.
+    Put #ifdef/#endif around a variable used only on Windows.
     
-    That avoids locale dependency and handles possibly-signed chars (which
-    we weren't doing before).
-    
-    Change-Id: I70f3d993c9a8fbf870901f12b430d733968c3fa8
-    Reviewed-on: https://code.wireshark.org/review/4781
+    Change-Id: Ia6fed6db03cb88433469e758693fcc72c4bd9071
+    Reviewed-on: https://code.wireshark.org/review/16009
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 35a9b98
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Thu Oct 16 20:02:51 2014 +0200
+commit 9b5b444
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jun 18 16:49:23 2016 -0400
 
-    Use proto_tree_add_bitmask for ExpandedNodeId EncodingMask
+    Refactor command-line handling of GUI options.
     
-    Instead of adding the items using proto_tree_add_item, use proto_tree_add_bitmask in parseExpandedNodeId(). Also, the redundant 'NodeId ' text is removed from hf_opcua_nodeid_... items for better readability.
+    Both GTK and Qt both use the same command-line options, so refactor
+    the parsing and (possibly) applying of those arguments to a single
+    location.
     
-    Change-Id: Ie68f1d280dd733fd2eede0b2b73ad8d7f28396b3
-    Reviewed-on: https://code.wireshark.org/review/4730
+    Ping-Bug: 12546
+    Change-Id: Ib31e576c509c5d3d21c33d3247640d9f9c68661b
+    Reviewed-on: https://code.wireshark.org/review/16006
     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 17a1a0d
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 17 16:48:48 2014 +0200
+commit deef1dc
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Thu Jun 16 14:58:19 2016 -0700
 
-    SGsAP Update to V12.6.0 except for IE TMSI based NRI container.
+    cmake: add PIDL dissector generation support
+    
+    The dissectors list is generated based on regex magic on pidl/Makefile.
+    A dssetup.cnf file is added because all other protocols already have
+    this file. The srvsvc and wkssvc protocols cannot be built for some
+    reason, so just disable it (this mirrors the original Makefile).
+    
+    Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing
+    compared to autotools.
+    
+    Tested with an out-of-tree and in-tree build with cmake (make and ninja):
     
-    Change-Id: Iafb62a27589de1810d4d3bd1e32f1c89898e9171
-    Reviewed-on: https://code.wireshark.org/review/4777
+        cmake -GNinja && ninja -v pidl-dissectors
+        touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs
+        cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs
+    
+    Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03
+    Reviewed-on: https://code.wireshark.org/review/15962
+    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 e5bbfa0
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Thu Oct 16 19:06:31 2014 +0200
+commit c07fd44
+Author: Binh Trinh <beango@gmail.com>
+Date:   Fri Jun 17 21:46:11 2016 -0400
 
-    Add argument 'packet_info *pinfo' to all dissecting functions
+    DCE/RPC: fix array of pointers with NULL
     
-    Change-Id: Ie02326e365ee3f620fcbe3f2e8e45dc5300d3418
-    Reviewed-on: https://code.wireshark.org/review/4728
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ie89f8fd4ec744d427d41866206d5a6784c5b224f
+    Reviewed-on: https://code.wireshark.org/review/16004
+    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 0ceedde
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 17 13:57:56 2014 +0200
+commit a7aaf0b
+Author: Chris Brandson <chris.brandson@gmail.com>
+Date:   Fri Jun 17 11:38:15 2016 -0700
 
-    Dissect CDMA2000 PDU if GCSNA dissector exists.
+    ZigBee dissector added support for the Power Negotiation bit
     
-    Change-Id: I866fb9bbc3e94df63231959d6745f3d45ca84020
-    Reviewed-on: https://code.wireshark.org/review/4772
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    An update to R22 adds the Power Negotiation bit to the Parent
+    Information of the End Device Timeout Response
+    
+    Change-Id: I3d423e1088821ccaba98183e2be7f2152bd659d1
+    Reviewed-on: https://code.wireshark.org/review/16001
+    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 9d1afef
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 17 10:49:58 2014 +0200
+commit 631b9c4
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jun 17 10:58:32 2016 -0400
 
-    isdigit -> g_ascii_isdigit to make the build work.
+    GTPv2: Use proto_tree_add_bitmask
     
-    Change-Id: I670b7b83976a9db9491e017015d570a4dc8f433d
-    Reviewed-on: https://code.wireshark.org/review/4771
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I236a3513237a7a977389438adaf381542281943d
+    Reviewed-on: https://code.wireshark.org/review/15997
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 4416988
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 17 00:02:08 2014 -0700
+commit 2dc3e52
+Author: Samiran Saha <ssahasamiran@gmail.com>
+Date:   Fri Jun 17 18:20:04 2016 +0530
 
-    Eliminate include of <ctype.h>.
+    MKA: tvbrange for all subtrees corrected
     
-    This is not built if we have glibc (as we already have getopt() from
-    it), and it's not part of glibc, so....
+    * Incorrect tvbrabge was affecting highlight on selection.
     
-    Change-Id: Iae4ff944c78fc55a8cd2eaf523a3696c47b741d7
-    Reviewed-on: https://code.wireshark.org/review/4769
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    * AN & Confidentiality Offset dissection fixed.
+    
+    Change-Id: Ibc4422322b765b0073471345f6e0bc3b1aeba2f9
+    Reviewed-on: https://code.wireshark.org/review/15996
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 87545f3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 23:57:03 2014 -0700
+commit 5a85add
+Author: Kenny Root <kenny@the-b.org>
+Date:   Thu Jun 16 00:12:53 2016 -0700
 
-    Remove unnecessary includes of <ctype.h>.
+    ssh: add RSA host key printing
     
-    Change-Id: I8eacec5fa8d57b10d40a3627197461dae89c6cb2
-    Reviewed-on: https://code.wireshark.org/review/4768
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Adds a dissector for the ssh-rsa type of public key where the modulus
+    and public exponent are extracted out.
+    
+    Change-Id: I10b1f2d6f41878d9f7ffe5d399b9b7d4f69ad96e
+    Reviewed-on: https://code.wireshark.org/review/15975
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f90d8dc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 23:53:21 2014 -0700
+commit e600526
+Author: Kenny Root <kenny@the-b.org>
+Date:   Wed Jun 15 17:05:54 2016 -0700
 
-    Use g_ascii_isspace() instead of isascii() && isspace().
+    ssh: add hostkey information
     
-    This eliminates one more use of <ctype.h> macros; we're using
-    g_ascii_isXXX() instead of isXXX() elsewhere.
+    Adds a framework for hostkey to be printed out separately from the rest
+    of the key exchange. This will allow for individual key information to
+    be presented separately in subsequent changes.
     
-    Change-Id: I184caeefab95dda2cf207acf9539eabbd7c32a51
-    Reviewed-on: https://code.wireshark.org/review/4767
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I27433772ef1a9e1c45f388809017ed07cf6e41fa
+    Reviewed-on: https://code.wireshark.org/review/15974
+    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 63ab36b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 23:41:29 2014 -0700
+commit ecd4120
+Author: Binh Trinh <beango@gmail.com>
+Date:   Thu Jun 16 23:51:14 2016 -0400
 
-    Don't use <ctype.h> macros, and eliminate an include of <ctype.h>.
+    Diameter-3GPP: add AVP 21 RAT-Type decoding
     
-    This avoids locale-dependent tests, and fixes cases where we passed
-    signed char values to those macros (which is not safe with char being
-    signed, as it is on most, but not all, platforms).
-    
-    Change-Id: Iea962cd7e4dfaf33c3c873ba43814cc6ed298d94
-    Reviewed-on: https://code.wireshark.org/review/4764
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ibede796a52bb382525bc1f430d5fdecd555c233f
+    Reviewed-on: https://code.wireshark.org/review/15993
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 23b233d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 23:29:07 2014 -0700
+commit e912db4
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Fri Jun 17 17:45:28 2016 +0200
 
-    Remove unnecessary include of <ctype.h>.
+    Add an expert item to asure that aifsn is at least 2
     
-    Change-Id: I596b252d5fb41e654961483cb530754442f25bc7
-    Reviewed-on: https://code.wireshark.org/review/4763
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: If7105ba2e476acca8a02ce740decc4966b0af1bb
+    Reviewed-on: https://code.wireshark.org/review/15998
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 44d4339
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 23:20:52 2014 -0700
+commit 2e9f3c5
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue May 3 18:40:17 2016 +0200
 
-    Don't use <ctype.h> macros, and eliminate an include of <ctype.h>.
+    tap: change glib functions to wmem.
     
-    This avoids locale-dependent tests, and fixes cases where we passed
-    signed char values to those macros (which is not safe with char being
-    signed, as it is on most, but not all, platforms).
+    Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf
+    Reviewed-on: https://code.wireshark.org/review/15270
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 2aa55a3
+Author: Binh Trinh <beango@gmail.com>
+Date:   Fri Jun 17 01:21:19 2016 -0400
+
+    GTPV2: add decoding of ECI into enodebid and cellid
     
-    Change-Id: I51d9716fe3eb02a6e98208334285c07597a6be79
-    Reviewed-on: https://code.wireshark.org/review/4761
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: If46cc354e202ff9a126580bf742d747e42678f83
+    Reviewed-on: https://code.wireshark.org/review/15994
+    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 25d9a7b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 23:08:42 2014 -0700
+commit a6da022
+Author: Jens Kilian <jens.kilian@advantest.com>
+Date:   Fri Jun 17 12:39:09 2016 +0200
 
-    Don't use <ctype.h> macros, and eliminate an include of <ctype.h>.
+    Qt: Fix a compile error occurring on RedHat Enterprise Linux.
     
-    This avoids locale-dependent tests.
+    Another missing Qt #include; probably caused by commit 157721c.
     
-    Change-Id: I709ff6b1a837fb0390b29f911d3b9ef1015a2d1e
-    Reviewed-on: https://code.wireshark.org/review/4758
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8ab4be9f18dffde7159debd842201e2a67230ec8
+    Reviewed-on: https://code.wireshark.org/review/15995
+    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 762b8d7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 23:01:14 2014 -0700
+commit a4f5802
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 00:04:21 2016 +0200
 
-    Don't use ctype.h routines.
+    autotool: Add -Wc99-extensions CFLAGS
     
-    That avoids locale dependency and handles possibly-signed chars (which
-    we weren't doing before).
+    See with CMake (ga9070e1a90)
     
-    Change-Id: I2afab254044e0d39dfa67acd840b9fe4ff1e6d08
-    Reviewed-on: https://code.wireshark.org/review/4756
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: If768b663f9ed032503fc121785b078c0107cdadc
+    Reviewed-on: https://code.wireshark.org/review/15909
+    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 0d9b449
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 18:26:03 2014 -0700
+commit 42b0609
+Author: Martin Kacer <kacer.martin@gmail.com>
+Date:   Mon Jun 13 15:47:44 2016 +0200
 
-    Don't use <ctype.h> macros.
+    tshark JSON and Elasticsearch output
     
-    They're locale-dependent (although those *particular* ones might not
-    be).
+    Added ouput -T for json|ek
+    Added -j switch fo filter EK json|ek fields.
+    Added -x switch to work with json|ek to insert raw fields.
     
-    Remove no-longer necessary (or not-even-necessary-before-this-change)
-    includes of <ctype.h>
+    Bug: 11754
     
-    Change-Id: I1384e3ae4ccba6af9220a08773abcde7ea320573
-    Reviewed-on: https://code.wireshark.org/review/4755
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iad5a9092b843c074b0b774d1745fa14fca09f6b7
+    Reviewed-on: https://code.wireshark.org/review/15869
+    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 359a32f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 18:21:20 2014 -0700
+commit 0aa5f6c
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Thu Jun 16 15:23:59 2016 -0700
 
-    No need for our own wrappers around tolower() and toupper().
+    idl2wrs: fix more bad strndups
     
-    We can just use g_ascii_tolower() and g_ascii_toupper();
+    Fixed another g_strndup case that truncated the name and replaced more
+    by strdups when possible.
     
-    Change-Id: I8a88a096d16ce8c60dd9151e5bdddf6747702145
-    Reviewed-on: https://code.wireshark.org/review/4754
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id7ce4d82da9fb1d0071bc7a6b4e7c2062bf77f55
+    Reviewed-on: https://code.wireshark.org/review/15988
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e6fcff1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 16:41:59 2014 -0700
+commit 22fb7a5
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 16 23:26:58 2016 +0100
 
-    Use g_ascii_isalnum() rather than isalnum().
+    mswsp: Remove null check (CID1355407)
     
-    That way, we don't have to worry about casting the argument (which, in
-    one place, was done wrong - casting to int preserves the sign-extension
-    done with signed chars), and don't have to worry about a locale in which
-    particular 8-bit byte values are considered alphanumeric characters.
+    value->type is already asserted as not null (and probably shouldn't be).
     
-    Change-Id: I129b4bfdad70ade4ab6e0a1d2c13d59ae9e6f524
-    Reviewed-on: https://code.wireshark.org/review/4751
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I574d3e7e0d5c636e6b731c1c817f2e457447afc1
+    Reviewed-on: https://code.wireshark.org/review/15990
+    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 f249589
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 16:03:58 2014 -0700
+commit 0ca6a6d
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Jun 15 02:20:11 2016 +0100
 
-    Just have get_mac_lte_rapid_description() return the description string.
-    
-    If get_mac_lte_rapid_description() returned FALSE, we always used "" as
-    the description string; just have it return the string, or return "" if
-    rapid ranges haven't been configured, and just use the string.
+    Align AUTHORS.src column
     
-    (If the code ever needs to determine in other places whether rapid ranges
-    have been configured, it can check s_rapid_ranges_configured, or
-    get_mac_lte_rapid_description() could return NULL in that case and the
-    code using the string can check for a null value.)
+    Change-Id: I17ed5e0be356666e9b29490ce43deb357fe177ff
+    Reviewed-on: https://code.wireshark.org/review/15991
+    Reviewed-by: João Valverde <j@v6e.pt>
+
+commit f9c2a2e
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 16 10:38:33 2016 +0100
+
+    LDSS: Add an assertion (CID280539,CID280540)
     
-    This should squelch some incorrect used-but-not-set warnings from at
-    least one compiler.
+    Change-Id: I18082a4d45f0c320b8ee0e11139295eb1aee2c89
+    Reviewed-on: https://code.wireshark.org/review/15968
+    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 157721c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 16 14:09:28 2016 -0700
+
+    Qt: Add "Copy As…" to VoIP Calls.
     
-    Change-Id: I3ed495a4beb4a553e453e7bca764d1d8a07c5e53
-    Reviewed-on: https://code.wireshark.org/review/4750
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 4389
+    Change-Id: I88dba82bd63e8c3be2b6fac3eca88f810c62d8bd
+    Reviewed-on: https://code.wireshark.org/review/15985
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit a517d50
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 14:55:06 2014 -0700
+commit ee6e89d
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Jun 16 10:18:07 2016 +0100
 
-    Make sort_alphabet() not fail too badly with characters in [128,255].
+    CANopen: Check array bounds for untrusted index (CID 1356262)
     
-    Treat all values in the alphabet as unsigned.
+    Change-Id: If5ca51e5703fa4137ab9f388a99d613752d3b0d0
+    Reviewed-on: https://code.wireshark.org/review/15983
+    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: João Valverde <j@v6e.pt>
+
+commit 99e2466
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jun 16 13:31:47 2016 -0700
+
+    Add a sequence analysis wishlist item.
     
-    Change-Id: I4476c75352f32673a9cd131ea233465f3376fa25
-    Reviewed-on: https://code.wireshark.org/review/4747
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Idea0bab80c7c05e3ad9f8591904e882df69a17ff
+    Reviewed-on: https://code.wireshark.org/review/15984
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit aa1f2c5
+commit c269684
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Oct 16 23:23:20 2014 +0200
+Date:   Thu Jun 16 10:20:40 2016 -0700
 
-    use supported/unsupported for the bitfield elements
-    order them from MSB to LSB
+    lemon: use a define for fseek()'s whence parameter
     
-    Change-Id: Ie758285c2cf5d19e00d6d256c49acca15ce81168
-    Reviewed-on: https://code.wireshark.org/review/4746
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    for people who don't immediately understand what fseek(fp, 0, 2) does
+    
+    Change-Id: I297ba6fd718ef0f09c4d0b29bf433262c3c38435
+    Reviewed-on: https://code.wireshark.org/review/15976
+    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 ee56b72
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Oct 16 21:58:59 2014 +0200
+commit 0600f92
+Author: Victor Barratault <victor.barratault@gmail.com>
+Date:   Thu Jun 16 14:06:32 2016 -0400
 
-    smartcard descriptor: start a bitfield for the features
+    ldap: added modify-increment operation identification in packet dissection and generate the modified dissector dissector
     
-    Change-Id: I636cfdfcd61d6d5dc041f9dbc657244d94e88b7f
-    Reviewed-on: https://code.wireshark.org/review/4745
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Iad745b9e0e8ab0bc055da7f26ec0822433897db7
+    Reviewed-on: https://code.wireshark.org/review/15977
+    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 b641832
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Thu Oct 16 22:28:43 2014 +0200
+commit 86a7ab1
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jun 16 20:51:24 2016 +0200
 
-    GTPv2 in Complete Request Message call the NAS dissector with a tvb only
-    containing the IE not the rest of the tvb.
+    DEC DNART: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: I3eead5047b4f8de47e280ac447c66b110592bccd
-    Reviewed-on: https://code.wireshark.org/review/4744
+    Change-Id: Ic2d333b418928351f32673890c9c432c7bfa0f16
+    Reviewed-on: https://code.wireshark.org/review/15982
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 71a42e0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 13:03:52 2014 -0700
+commit c1626db
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jun 16 20:48:58 2016 +0200
 
-    Oops, I missed one "cast a char to int and use it as a subscript" case.
+    SITA: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Casting a signed char with a negative value to int will preserve the
-    value, so it'll still be a negative subscript.  Cast to guchar instead,
-    to make sure 0x80 through 0xFF are treated as 128 to 255, not -128 to
-    -1.
+    Change-Id: I2565b0bee66f934561df506e87a35fdd14590f92
+    Reviewed-on: https://code.wireshark.org/review/15981
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 13c0136
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 15 18:54:07 2016 -0400
+
+    DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_value
     
-    Change-Id: I1f0b33ba3686e963d45317b45465ff335431d17f
-    Reviewed-on: https://code.wireshark.org/review/4742
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I88398aa1923e86bb83b97cc3904529a5810f6c40
+    Reviewed-on: https://code.wireshark.org/review/15978
+    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 f6bc6f9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 12:05:26 2014 -0700
+commit c98b0d5
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Tue Jun 14 23:59:12 2016 +0200
+
+    Add Cisco ttag dissector
+    
+    Add dissector for Cisco ttag protocol.
+    
+    Bug: 12518
+    Change-Id: Id17293a80b2b6827fd2d5c7ead098784c35a28ef
+    Reviewed-on: https://code.wireshark.org/review/15964
+    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>
 
-    Better fix - just check that the upper and lower nibbles are >= 0xA.
+commit 0e8fef5
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jun 16 12:43:24 2016 -0400
+
+    Finish getting making the Diameter XML valid XML.
     
-    An unsigned 8-bit integer is always <= 0xFF; that was the cause of the
-    warning.
+    ... Except for the fact that many AVP names start with "3GPP".
     
-    To see whether a byte, when represented as hex, has letters for its
-    upper and lower nibbles, just check whether both nibbles are >= 0xA.
-    Cast the extracted nibbles to make sure there's no sign-extension.
+    Make the AVP names XML IDs again.
     
-    Change-Id: If4c7717a5d2fe341c02e9309ee6b89973a6ac292
-    Reviewed-on: https://code.wireshark.org/review/4739
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Fix all the grouped AVPs that reference AVPs (by name) or vice-versa.  This
+    includes:
+     * Fixing a bunch of typos (including type mismatches).
+     * Commenting out a number of references to vendor AVPs for which we don't have
+       the specs.
+     * Adding a few missing AVPs.
+    
+    Change-Id: Ic2ddb50cc947877de9086be51f7813e8f9be02b4
+    Reviewed-on: https://code.wireshark.org/review/15973
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7f74471
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Oct 16 09:12:25 2014 +0200
+commit 4ad428d
+Author: Kenny Root <kenny@the-b.org>
+Date:   Wed Jun 15 23:53:49 2016 -0700
 
-    Added italian translation to qt.
+    ssh: set packet lengths correctly
     
-    Change-Id: If58ed29e78a9994fc488a4d01cf665f7e8d82830
-    Reviewed-on: https://code.wireshark.org/review/4707
+    Each SSH packet was being set to be the remaining length of the frame.
+    This change sets the packet lengths correctly for each SSH packet.
+    
+    Change-Id: Id9c2331d875465cd5e6bb788d420e0025f5d496e
+    Reviewed-on: https://code.wireshark.org/review/15966
+    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 0db468e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 11:44:06 2014 -0700
+commit b22e1ae
+Author: Kenny Root <kenny@the-b.org>
+Date:   Wed Jun 15 23:54:43 2016 -0700
 
-    gchar is not guaranteed to be signed; use gint8.
+    ssh: packets after SSH_MSG_NEWKEYS are encrypted
     
-    C does not guarantee that char is signed (that's why there's a keyword
-    "signed").  Use gint8, to indicate that it's not a character, it's an
-    8-bit signed integer.
+    According to RFC 4253 section 7.3, once the SSH_MSG_NEWKEYS is received
+    all packets after that will be encrypted using the negotiated keys. This
+    can happen in the middle of a frame, so account for the offset in the
+    frame where this happens.
     
-    Change-Id: Id632df23352840cbc86a4d88f4c7dade95ab7837
-    Reviewed-on: https://code.wireshark.org/review/4736
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ibc3b06a4bdfe38ae15b0e65afac6f5d3646cb58d
+    Reviewed-on: https://code.wireshark.org/review/15965
+    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 50add40
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 11:16:11 2014 -0700
+commit 9a5e6a6
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Jun 15 15:35:51 2016 -0400
 
-    Fix some more "char is unsigned" issues, and a possible "char is signed" one.
+    DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_with_flags
     
-    C neither guarantees that char is signed nor that it's unsigned.  Make
-    the str_to_nibble tables arrays of gint8, to make sure they can hold
-    numbers between 0 and 15 as well as -1.  Cast gchar to guchar, not int,
-    when using it as a subscript into that array, so that the subscripts are
-    in the range 0 to 255, not -128 to 127.
+    Change-Id: I8891ec90244ffd9609d8443df631a7c8e6453b7e
+    Reviewed-on: https://code.wireshark.org/review/15942
+    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 946b037
+Author: Samiran Saha <ssahasamiran@gmail.com>
+Date:   Thu Jun 16 17:15:06 2016 +0530
+
+    MKA: Fix for GCM-AES-256 dissection & Added Enumeration for macsec-cipher-suite
     
-    Change-Id: Ib85de5aa4e83ae9efd808c78ce3f86f45b4a3f2a
-    Reviewed-on: https://code.wireshark.org/review/4734
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ief38f949d3e30754a65fbfeaa64cbbd2f5646a9b
+    Reviewed-on: https://code.wireshark.org/review/15969
+    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 353f625
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 11:06:06 2014 -0700
+commit 7d6e3e0
+Author: Thomas Shen <thomashen@gmail.com>
+Date:   Wed Jun 15 14:26:02 2016 -0700
+
+    NSH: Correct the display of the NSH header fields
+    
+    Change-Id: I3be75d20a3f00091aa3077e475f9ddb00eeca06c
+    Reviewed-on: https://code.wireshark.org/review/15963
+    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>
 
-    Fix issues in some ARM compilers, due to char being unsigned?
+commit 44ba346
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Jun 16 14:32:58 2016 +0200
+
+    gtk: Check chunk before g_string_chunk_clear
     
-    I'm not 100% certain the comparisons were right even with signed char;
-    make the comparisons unsigned vs. unsigned, regardless of whether char
-    is signed or not.  (No, C doesn't require it to be signed; that's why
-    there's a "signed" keyword.)
+    Avoid this warning from wireshark-gtk:
+     (wireshark-gtk:39505): GLib-CRITICAL **: g_string_chunk_clear: assertion
+     'chunk != NULL' failed
     
-    Change-Id: Icbbd1019a2f7d4ebb40d821255834f825cd7c5a7
-    Reviewed-on: https://code.wireshark.org/review/4731
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I413b3435a1ac595236dd1c4e619e3af1543b6a91
+    Reviewed-on: https://code.wireshark.org/review/15970
+    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 d3bb3a0
+Author: Victor Barratault <victor.barratault@gmail.com>
+Date:   Tue Jun 14 12:17:54 2016 -0400
+
+    Typing error line 4928 of packet-dns.c
+    
+    Change-Id: I1a6409262614a87c159236375223707c85114650
+    Reviewed-on: https://code.wireshark.org/review/15972
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 381966b
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Thu Oct 16 14:59:53 2014 +0200
+commit 44e3212
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Wed Jun 15 22:23:46 2016 -0700
 
-    Replace proto_tree_add_text in non-generated files
+    gitignore: updated cmake paths
     
-    As requested by Michael Mann, most of the occurences of proto_tree_add_text/proto_item_add_subtree are replaced with proto_tree_add_subtree(_format) or proto_tree_add_item/proto_item_append_text in the non-generated files.
+    * files.txt: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.")
+    * epan: v2.1.0rc0-2202-g6b54fbf ("CMake: Add more structure to
+      libwireshark build")
+    * asn1: v2.1.0rc0-2330-g54a520d ("Move /asn1 to /epan/dissectors")
     
-    Change-Id: I27cccde88780adef43c78efd26333f47af098ad6
-    Reviewed-on: https://code.wireshark.org/review/4726
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I0ef590de7d262d96c011be360b958fbda72a61fa
+    Reviewed-on: https://code.wireshark.org/review/15961
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit dabbaaf
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sat Feb 28 17:44:27 2015 +0100
+
+    filesystem: Fix build dir detection when using cmake
+    
+    Fixes loading of plugins by detecting the build output directory of
+    cmake. This requires a "CMakeCache.txt" file to be present in the parent
+    directory (above run/).
+    
+    Change-Id: I297432cdcd0981646058410f3eadf5f73b5248c8
+    Reviewed-on: https://code.wireshark.org/review/7453
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 14b75d8
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Oct 16 17:58:05 2014 +0200
+commit 897f9f7
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 15 13:17:41 2016 -0700
 
-    ETSI CAT: fix a typo and remove deprecated API call
+    Add a note about the new intelligent scroll bar.
     
-    Change-Id: I7df02d6a605ca0912c179caa04a405c5c18eb552
-    Reviewed-on: https://code.wireshark.org/review/4727
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Should we call it the intelligenter scroll bar?
+    
+    Change-Id: I67e76c1aabeb4b2e87e38815fe4ab120f0869b25
+    Reviewed-on: https://code.wireshark.org/review/15936
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a34b252
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Thu Oct 16 14:35:10 2014 +0200
+commit 50591ac
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Jun 15 19:53:45 2016 -0700
 
-    Replace proto_tree_add_text with proto_tree_add_subtree(_format) in generated files
+    CID 1250642: check the return value of dup()
     
-    As requested by Michael Mann, all occurences of proto_tree_add_text/proto_item_add_subtree are replaced with proto_tree_add_subtree(_format) in the generated files. Our generator templates have also been updated accordingly.
+    abort if it is -1
     
-    Change-Id: I49ddd664dffef4b3ceda77edd1b2d7e01da363f3
-    Reviewed-on: https://code.wireshark.org/review/4725
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ie14c18679ff74529731558d6742f63ebfb9fe97b
+    Reviewed-on: https://code.wireshark.org/review/15958
+    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 d347b72
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 03:01:28 2014 -0700
+commit b223d64
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jun 16 00:04:36 2016 -0400
 
-    Don't try to compute time stamps for files from Packet Builder.
+    Make the rest of the Diameter AVP names unique.
     
-    I don't trust Packet Builder's ability to convert time stamps between
-    Capsa format and pcap.
+    In most cases this means prepending the application- or vendor-name to force
+    uniqueness.  A few vendors have duplicates within their namespace--append the
+    AVP code to these.
     
-    Change-Id: I0ac2e14216e37127d81d5bf1c6d48a2c20841a8e
-    Reviewed-on: https://code.wireshark.org/review/4721
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Also fix a few other invalid names (with spaces or parentheses in the names).
+    
+    Change-Id: I5bb78d31526122dd5782055638af410cc497e49d
+    Reviewed-on: https://code.wireshark.org/review/15960
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c74cefb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 16 00:00:45 2014 -0700
+commit f749a64
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Tue Jun 14 22:29:34 2016 -0700
 
-    Fix a debugging printout.
+    cmake: Detect proper large file defines even with -Wno-error
     
-    Change-Id: I06bc40bece3ea98578a252217c9de4748276a440
-    Reviewed-on: https://code.wireshark.org/review/4720
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Without this change large file support was detected as available
+    even when it was not without additional flags on 32 architectures.
+    
+    As a result mergecap and other programs are built without large
+    file support causing mergecap not being able to write files
+    bigger than 2GB on i386 systems. This used to work properly
+    with autotools builds, but not with CMake ones.
+    
+    Change-Id: Ibfd043342b2a48310d2ac9d760e6404a701c5808
+    Reviewed-on: https://code.wireshark.org/review/15937
+    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
 
-commit 377a486
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 15 23:53:45 2014 -0700
+commit 4962ea6
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Jun 15 00:47:44 2016 +0200
 
-    Get rid of some set-but-no-longer-used variables.
+    qt: move free_stat_tables from SimpleStatisticsDialog::fillTree to ~SimpleStatisticsDialog.
     
-    Change-Id: Iaf7267b6ee3d4ab288c8ffa487f5de736bc4aead
-    Reviewed-on: https://code.wireshark.org/review/4719
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Add a reference count to stat_tap_table_ui to prevent bad deallocations.
+    
+    Bug: 12437
+    Change-Id: Ib9b1f929d08a574c306dc755ec416ab94a3fd6d3
+    Reviewed-on: https://code.wireshark.org/review/15920
+    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 df83895
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 15 18:15:15 2014 -0700
+commit a38db78
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 13:25:44 2016 -0400
+
+    Update the X11 dissector to use the latest mesa and xcbproto.
+    
+    Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821
+    Reviewed-on: https://code.wireshark.org/review/15923
+    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>
 
-    Make sure *err and *err_info are set when returning PCAPNG_BLOCK_NOT_SHB.
+commit d1d27bd
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Wed Jun 15 19:16:42 2016 -0700
+
+    Qt: Clarify follow stream dialog's format button
     
-    Clean up a comment and indentation while we're at it.
+    The stream is not just shown, but also saved in ASCII, EBDIC, Raw, etc.
     
-    Change-Id: Ia2b0a3f642849dcd464e04cdca13ff05c2fbe2e6
-    Reviewed-on: https://code.wireshark.org/review/4717
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic29e3273ebb9a3eca0fe791bdd48606c4be3b828
+    Reviewed-on: https://code.wireshark.org/review/15957
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9cfab55
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 15 17:55:04 2014 -0700
+commit 8b94a66
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 23:35:58 2016 +0200
 
-    The record offset block begins with a 1-byte(!) header.
+    X11: Fix last indent issue on X11 generator
     
-    Clean up the code to read the block according to that description.
+    and regenerate X11 dissector
     
-    Change-Id: Icb332e293c4b41d91989aa17a7546f298068e908
-    Reviewed-on: https://code.wireshark.org/review/4716
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: If2c781d346713f5a2a2e97de84c0fedcfd1958af
+    Reviewed-on: https://code.wireshark.org/review/15944
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit fa8d236
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 15 17:19:33 2014 -0700
+commit a9d9d4f
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 22:52:18 2016 +0200
 
-    Get rid of another unused variable.
+    x11: Regenerate dissector after indent change on g2b8caf31cca
     
-    Change-Id: Id3e9bdd9308342460f84b5d4aeb13e9d6d52616c
-    Reviewed-on: https://code.wireshark.org/review/4715
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iac1522998c5983b417a0083b9c607a60e7f66e8c
+    Reviewed-on: https://code.wireshark.org/review/15943
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7bca912
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 15 16:55:54 2014 -0700
+commit b5a8c4f
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 16 01:25:03 2016 +0200
 
-    Don't allocate the interfaces array until we've read the SHB.
+    randpktdump: fix a crash.
     
-    Nothing from the SHB gets stored in the interfaces array - it's filled
-    in from IDBs - so it doesn't need to exist when we read the first SHB,
-    and thus doesn't need to be freed if the attempt to read the SHB gets an
-    error or a "this isn't a pcap-ng file" indication.
+    Randpktdump requires the init the wtap opttypes.
+    Fixed making the init function public and calling it.
     
-    Update a comment while we're at it.
-    
-    Change-Id: Ie67edb52dcf13c974607e95e290661bf48be68ae
-    Reviewed-on: https://code.wireshark.org/review/4711
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 12539
+    Change-Id: I02585c41012deacff1526b51ed09ab555cbfc8ce
+    Reviewed-on: https://code.wireshark.org/review/15951
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f518089
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 15 16:45:51 2014 -0700
+commit 79aab92
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Jun 15 23:57:39 2016 +0200
 
-    Clean up the read routines.
-    
-    The block read routines don't need to return a "bytes read" amount any
-    more.
-    
-    Have pcapng_read_block() just return an indication:
+    Don't call g_ascii_strcasecmp() with an NULL string.
     
-       PCAPNG_BLOCK_OK - the read succeeded;
-    
-       PCAPNG_BLOCK_NOT_SHB - the read failed in a fashion that
-           indicates that we might just not be reading a pcap-ng file;
-    
-       PCAPNG_BLOCK_ERROR - the read failed in some other fashion
-           (i.e., we already have concluded that the file is a pcap-ng
-           file, or we got an I/O error).
-    
-    In the cases where it needs to know whether it's reading the first block
-    for an open, have it check the shb_read flag, rather than being passed a
-    separate Boolean argument.
+    Change-Id: I6efbdcb51efe5f2db233827e32e2105db6322d6c
+    Reviewed-on: https://code.wireshark.org/review/15946
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 83b2d5e
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jun 16 02:34:27 2016 +0200
+
+    gtk: add initializer (CID 1362745).
     
-    This means that pcapng_read_section_header_block() should return such an
-    indication as well.
+    Change-Id: Ib1bc11e905b0a4e84302e3f9ac43f3a87afd6edf
+    Reviewed-on: https://code.wireshark.org/review/15954
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit 66d26d7
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 22:01:31 2016 -0400
+
+    Remove a bunch of unassigned ETSI AVPs.
     
-    Make the other block-reading routines return a Boolean success/failure
-    indication.
+    These were presumably there to allow indexed search of the AVP list but it
+    wasn't working anyway (binary search was used).  And the expert info for
+    "unknown" (to Wireshark) AVPs is a good thing.
     
-    Change-Id: Id371457018a008ece9058d6042da44d631e51889
-    Reviewed-on: https://code.wireshark.org/review/4710
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id6b9e5c90b8a2a6e3cf4415cd1b6114308c74440
+    Reviewed-on: https://code.wireshark.org/review/15956
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 371e4ae
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Oct 15 12:55:08 2014 -0400
+commit 38afb1d
+Author: Rudra Rugge <rudrarugge@gmail.com>
+Date:   Wed Jun 15 15:22:25 2016 -0700
 
-    Eliminate some proto_tree_add_text from GSM dissectors (so now there are no dissectors with 100+ proto_tree_add_text calls).
+    ip-over-ib description entry was missing
     
-    Add tfs_allocated_by_receiver_sender to tfs.h because it seems "popular" enough.
+    Description entry was missing in the list.
     
-    Change-Id: I478461d9b951a2c3e3aec6aaf996d95ba2c0feee
-    Reviewed-on: https://code.wireshark.org/review/4708
+    Change-Id: Ia8f8bd4608ee6800a352f4979752b5c45c4a5086
+    Reviewed-on: https://code.wireshark.org/review/15947
     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 9b7ee18
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Fri Oct 10 11:30:59 2014 +0200
+commit 37c40bd
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 15 18:06:04 2016 -0700
 
-    Typos in source code and in README.qt
+    Export wtap_optionblock_copy_options() symbol
     
-    Change-Id: I5aef31ef7ad604352f6e108835f0e9c2d10cdf8a
-    Reviewed-on: https://code.wireshark.org/review/4706
+    It can be useful for wiretap plugins
+    
+    Change-Id: Ic56e4357ba3bfcef30d13615efc1361399c3133e
+    Reviewed-on: https://code.wireshark.org/review/15955
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 0444c47
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 15 09:37:21 2014 +0200
+commit 60578aa
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 15 13:42:56 2016 -0700
 
-    IPv6: Calipso option length is not used properly
-    
-    This field indeed indicates the length of the Compartment Bitmap but *in 32-bit words*, which means that the value of 12 means the compartment bitmap is 48 bytes long.
+    file_util.c: do not search in Npcap installation folder when calling ws_load_library()
     
-    Issue found by boaz
-    Bug:10561
+    ws_load_library() is not used to load packet.dll or wpcap.dll (we use ws_module_open() for this).
+    Let's not lose time checking the folder content.
     
-    Change-Id: I6c6ac25d0680837594d7cc6d2e4807a60a523b80
-    Reviewed-on: https://code.wireshark.org/review/4697
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ibd4a71b8b0c5ffc0c4c146eca51ad9f20964515b
+    Reviewed-on: https://code.wireshark.org/review/15938
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 5cdb032
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Oct 15 08:22:09 2014 -0400
+commit b2c7e8e
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Jun 15 13:02:39 2016 -0700
 
-    smb2: fully initialize dummy session
+    mongo: return the number of bytes we actually consumed
     
-    A few fields weren't being zeroed and were causing valgrind warnings.
+    even if the document length is 0, we consumed at least 4 bytes for the
+    length field
     
-    Bug: 10569
-    Change-Id: I30e1e70c9445376806f385f3578b65bf6e320f8b
-    Reviewed-on: https://code.wireshark.org/review/4702
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    bug: 12534
+    Change-Id: I2f1612bf575b558c1bcc0afe8202b202747846e3
+    Reviewed-on: https://code.wireshark.org/review/15934
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 38ffca5
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Oct 15 14:18:21 2014 +0200
+commit c5528d0
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 18:40:53 2016 -0400
 
-    WSUG: Fixed some typos.
+    Make some more Diameter AVP names unique.
     
-    This was reported by Emre Baris.
+    In some cases this means using the correct (updated?) name from the
+    specification. In others it means prepending the application- or vendor-name
+    to force uniqueness.
     
-    Change-Id: Ia37527e2a612fcbabd3ce7c6d8faf33905bbe52d
-    Reviewed-on: https://code.wireshark.org/review/4701
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Remove a few more "Unassigned" AVPs from the XML files.
+    
+    Change-Id: I61d55ef97ff8efc3317c91bf79e73031735f740a
+    Reviewed-on: https://code.wireshark.org/review/15949
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1a652bd
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Oct 15 13:12:24 2014 +0200
+commit e551731
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Wed Jun 15 14:06:23 2016 -0700
 
-    GTPv2: Fully dissect Presence Reporting Area Action.
+    idl2wrs: fix code generation
+    
+    Fixes a regression from v1.99.9rc0-470-g87f2bd4 which truncated function
+    names to 26 characters.
+    
+    Test:
+    
+        cd epan/dissectors/dcerpc/budb
+        make IDL2WRS=/tmp/wsbuild/run/idl2wrs
+        diff packet-dcerpc-budb.c ../../packet-dcerpc-budb.c
+    
+    While at it, replace all g_strndup(X, strlen(X)) occurrences with
+    g_strdup(X) since that is the same thing and less redundant.
     
-    Change-Id: If38f639049bd897587ed61cc2d94f974131ccd20
-    Reviewed-on: https://code.wireshark.org/review/4700
+    Change-Id: Id8da45792c830e2287cf8f14ff6245149751afd2
+    Reviewed-on: https://code.wireshark.org/review/15939
+    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 a25ae55
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Oct 15 11:58:40 2014 +0200
+commit 1708e2e
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Wed Jun 15 15:40:15 2016 -0700
 
-    LDAP: Improved a if-check to avoid a analyzis warning.
+    gtk: Fix null dereference in stats
     
-    Change-Id: Iceeaa94a80543570a720281ac39d3ccd9ac924fa
-    Reviewed-on: https://code.wireshark.org/review/4699
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    This fixes the bug reported to Debian:
+    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786704
+    
+    Change-Id: Iabe19c11067318d78664a17fa00d6a4d1998250c
+    Reviewed-on: https://code.wireshark.org/review/15948
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
 
-commit bf5b872
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 14 21:52:15 2014 -0500
+commit fb38049
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 15 14:50:03 2016 -0700
 
-    CMake: When creating a bundle add convenience symlinks.
+    proto.c: allow calling proto_item_add_bitmask_tree() with a length set to 0
     
-    Change-Id: Ic6c02c8879e406b733d834e895a3ccb1e9322a9d
-    Reviewed-on: https://code.wireshark.org/review/4696
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    This is required for the flags from packet-frame.c
+    
+    Bug: 12536
+    Change-Id: I60bfe671687bcd3a9b5c997ba62bed563e890548
+    Reviewed-on: https://code.wireshark.org/review/15945
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 6206fa5
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Oct 14 21:12:13 2014 -0400
+commit c3190ad
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 20:35:47 2016 +0200
 
-    raknet: fix two checkfiltername errors;  mcpe,raknet: minor cleanup;
+    capture info (wslua): Dereference of null pointer
     
-    Change-Id: Ieac370d232c6349f7acc45f4817637a80915e315
-    Reviewed-on: https://code.wireshark.org/review/4695
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Iced579d5acaefa9d1c8e3775a53916773bf87659
+    Reviewed-on: https://code.wireshark.org/review/15929
+    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 60e738c
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Oct 14 20:10:13 2014 -0400
+commit a8f73e9
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Wed Jun 15 14:14:23 2016 -0700
 
-    packet-raknet.c: value_string array (created at runtime) must be terminated with {0, NULL}.
+    documentation: Suggest using prefixed public symbols
     
-    This should fix crash in 'tshark -G values' seen on 64 bit tshark.
-    
-    Change-Id: Ia183fc5d5604f71b824cf4f758c18ff1ccd4540f
-    Reviewed-on: https://code.wireshark.org/review/4694
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I9153756b0e921fd74d7df9d119337f5484856ba0
+    Reviewed-on: https://code.wireshark.org/review/15940
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0ac9449
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 14 16:53:03 2014 -0700
+commit 04058b8
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 15 11:27:53 2016 -0700
 
-    We can't check the length of an SHB until we determine the byte order.
+    Qt: Adjust the search frame layout.
     
-    Don't check a possibly-byte-swapped length against the minimum SHB size;
-    it'll probably look huge if it's byte-swapped, so the test won't fail
-    even if it is too small, and a really huge SHB's length could look too
-    small if it's byte-swapped.
+    Add padding on the left side of the search frame in order to reduce the
+    amount of mousing required on large screens.
     
-    Do the check *after* we've read the fixed-length portion of the block;
-    yes, that means we've read past the purported size of the block at that
-    point, but if that read succeeds, that doesn't matter, and if that read
-    fails, it just means we'll report "file cut short" rather than "bad SHB
-    length", *both* of which are problems with the file.
-    
-    Change-Id: Ie3b5700662f2a6da40d373a84f00a8fc2cf0ce1b
-    Reviewed-on: https://code.wireshark.org/review/4692
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I1dcd8c4a103f4a462f4ab60a22a93b8c0f28b055
+    Reviewed-on: https://code.wireshark.org/review/15928
+    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 4420461
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 14 16:39:17 2014 -0700
+commit 66efbdb
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 16:01:05 2016 -0400
 
-    Don't assume pcap_read_block() returns the number of bytes read.
-    
-    Recent changes must have made it not do so in some cases, and
-    our current version of file_tell(), unlike ftell() around which the
-    older file_tell() was a wrapper, is known to be cheap (ftell() would
-    make a system call to get the position).  Just use file_tell() before
-    each read.
+    Make some Diameter AVP names unique.
     
-    (Further cleanup is called for.)
+    In some cases this means using the correct (updated?) name from the
+    specification. In others it means prepending the application name to force
+    uniqueness.
     
-    Bug: 10568
-    Change-Id: Ib92057b2b87ec6eb16fd612bc91baeb668d1e1c7
-    Reviewed-on: https://code.wireshark.org/review/4691
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8301c769af2b2279c0be7c1bc65e99fe25c1cc80
+    Reviewed-on: https://code.wireshark.org/review/15935
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4a6e313
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 14 13:41:36 2014 -0700
+commit 1b0d51f
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Wed Jun 15 19:45:50 2016 +0300
 
-    Don't log warnings if no block-type handlers are registered.
+    ZigBee: decode ZBOSS traffic dump and Interpan frames as ZigBee.
     
-    Check whether the block-type hash table exists before trynig to look
-    up anything in it.
+    If decoded ZBOSS traffic dump, sure this is ZigBee, so bypass heuristic.
+    If decoding air sniffer dump, try to go thru heuristic by checking for ext address src mode required for interpan.
     
-    Change-Id: I0aeb7f6454903bfcbdd0716909a0b72851d87233
-    Reviewed-on: https://code.wireshark.org/review/4689
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iddf799400a4cf0fd73714f06b99e3d11c8cb2e60
+    Reviewed-on: https://code.wireshark.org/review/15921
+    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 bfe3706
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Oct 14 15:58:21 2014 -0400
+commit 561a063
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jun 10 15:26:57 2016 -0700
 
-    Always put editor-modelines at the end of the file ...
+    Pass "/utf-8" to Visual C++ 2015.
+    
+    Many projects (Qt[1] and GNOME[2] in particular) either recommend, use,
+    or at least allow for UTF-8 in source and header files. Pass /utf-8 to
+    Visual C++ 2015 so that it will behave itself around UTF-8 and be more
+    like that nice compiler down the street.
     
-    ... to ensure that there are no potential issues with respect to
-    editors limiting the number of lines scanned at the end of the file
-    when checking for editor modelines.
+    [1] https://wiki.qt.io/Strings_and_encodings_in_Qt
+    [2] https://bugzilla.gnome.org/show_bug.cgi?id=767218
     
-    Change-Id: Ic85cbb108bb5159d6ec4116fea11f5eebb4e44a4
-    Reviewed-on: https://code.wireshark.org/review/4688
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ibc90d235742134cb42dd796ba529699bcbbe3ad0
+    Reviewed-on: https://code.wireshark.org/review/15821
+    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 71c5ac0
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Oct 14 14:19:59 2014 -0400
+commit ca1c5f5
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 15 20:14:18 2016 +0200
 
-    packet-assa_r3.c: Use editor modelines from http://www.wireshark.org/tools/modelines.html
+    diameter (3GPP): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: I2d9accd2336448ced30dca1878a3e27cdba29566
-    Reviewed-on: https://code.wireshark.org/review/4687
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Iaa74265df66455528c86658a26812876574a904a
+    Reviewed-on: https://code.wireshark.org/review/15927
+    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 0ce5b8c
-Author: Nick Carter <ncarter100@gmail.com>
-Date:   Tue Oct 7 19:21:46 2014 +0100
+commit 6d89f3b
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jun 15 13:31:41 2016 -0400
 
-    Add RakNet protocol dissector
+    Update to the latest config.guess and config.sub
     
-    Bug: 10534
-    Change-Id: Id56008da0c21a5f3a0309cdf21aff287c7820dcf
-    Reviewed-on: https://code.wireshark.org/review/4372
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Id493fb3b79326b522a3a11c3258531683f159187
+    Reviewed-on: https://code.wireshark.org/review/15924
+    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 64169e3
+Author: dsrsupport <eugene.exarevsky@dsr-company.com>
+Date:   Wed Jun 15 18:48:01 2016 +0300
+
+    ZigBee: add support for inter-pan transmissions.
+    
+    Added dissection of inter-pan nwk and aps stub to be used to decode ZLL commissioning cluster.
+    
+    Change-Id: I871016a93854f1caf2f14f2f84e5397de5f1e2ff
+    Reviewed-on: https://code.wireshark.org/review/15918
     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 74a8ad7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 14 12:31:49 2014 -0700
+commit 6baa1b5
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 8 15:57:00 2016 +0200
 
-    Get rid of no-longer-used #define.
+    Remove Nmake build system
     
-    Change-Id: Ibaebda819094f09610dc9cf8a303440b93bf2da0
-    Reviewed-on: https://code.wireshark.org/review/4686
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
+    Reviewed-on: https://code.wireshark.org/review/15777
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
 
-commit a18c9c5
+commit 88bd50c
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 14 12:30:00 2014 -0700
+Date:   Wed Jun 15 12:15:54 2016 -0700
 
-    Don't supply time stamps for Capsa packets for now.
+    Don't map the interface ID for records that don't pertain to an interface.
     
-    The time stamps aren't known to be right, so don't provide them - that
-    way, instead of users reading Capsa files and getting the wrong idea
-    about the time stamps, they'll get no time stamps and have to ask for
-    our help, at which point we can ask them for *their* help in seeing what
-    Capsa thinks the time stamps are.  (The joys of reverse-engineering.)
+    And revert to the previous behavior of map_phdr_interface_id(); that
+    change broke the mergecap tests when it was merging pcap files into a
+    pcapng file.
     
-    Change-Id: I77e12c09f2bc74b50a1b2b226fa6da3e8c0fedf9
-    Reviewed-on: https://code.wireshark.org/review/4685
+    Change-Id: I2e079b0e87dce06e98faa9ab7615f9b9b2701b77
+    Reviewed-on: https://code.wireshark.org/review/15932
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 87ea03b
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Oct 14 12:54:34 2014 -0400
+commit 5a73176
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 15 11:46:53 2016 -0700
 
-    packet-gvsp.c: removed an unused #define
+    Win: convert atkversion.h to UTF-8
     
-    Change-Id: If330124cdc459867b33e1bbbe960c969deb85b10
-    Reviewed-on: https://code.wireshark.org/review/4684
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I7bfa9be11596cc9a3e1b0226c6865edf47e96782
+    Reviewed-on: https://code.wireshark.org/review/15931
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 10b83e6
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Oct 14 11:12:16 2014 -0400
+commit edf0b5c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Jun 15 20:05:32 2016 +0200
 
-    Add editor-modelines; adjust whitespace.
+    qt: add initializer to ExpertPacketTreeWidgetItem (CID 1362746).
     
-    Change-Id: I8cad872cee972a6d22a72852dac57fd188daca84
-    Reviewed-on: https://code.wireshark.org/review/4683
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I8ca154907e01fb40affb9e5f5a0aaf55921c95db
+    Reviewed-on: https://code.wireshark.org/review/15926
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 2359e67
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Oct 14 15:56:49 2014 +0200
+commit de23fbc
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Jun 15 10:53:43 2016 -0700
 
-    GTPv2 Dissect more bits in IE Indication.
+    zbee-nwk: don't THROW() an exception from a dissector
+    
+    we already have an expert info, so we can just return the number of
+    bytes in the tvb
     
-    Change-Id: I19d0b67e06ec22bfc5bafc58fdeb445e30e25f95
-    Reviewed-on: https://code.wireshark.org/review/4682
+    Change-Id: I6199760316d7ef141877bc8f65012d36e4dd357b
+    Reviewed-on: https://code.wireshark.org/review/15925
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3ec9ddc
+commit ec5acbc
 Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Oct 14 10:56:02 2014 +0200
+Date:   Fri Mar 11 18:42:49 2016 +0100
 
-    PIM: Disable unused pimbdirdfvals.
+    wtap: Make default_filter static
     
-    Change-Id: I2b023868d9f84e891e36f2cfcfd4ad25e1e43592
-    Reviewed-on: https://code.wireshark.org/review/4681
+    Address of stack memory associated with local variable 'default_filter'
+    is still referred to by the global variable 'filter_option' upon returning
+    to the caller.  This will be a dangling reference.
+    
+    Change-Id: I6160a37f05b8aea245b723ec50803e4062886738
+    Reviewed-on: https://code.wireshark.org/review/14427
+    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 0e2f128
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Oct 14 10:54:57 2014 +0200
+commit 9ba9a05
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Sep 30 14:34:39 2015 +0100
 
-    Add new Event-Trigger values.
+    Display "IP DSCP" column as short text
     
-    Change-Id: Idd18a710fd8630d5b50c5ac180d7aa45a40596d7
-    Reviewed-on: https://code.wireshark.org/review/4680
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Ping-Bug: 12429
+    Change-Id: I618b2017e161d89f0efa25ce2fb82a1808e8d315
+    Reviewed-on: https://code.wireshark.org/review/10701
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 0cbaae4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 14 01:47:37 2014 -0700
+commit babb9e3
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Wed Jun 15 08:45:54 2016 -0700
 
-    Fix return values.
+    androiddump: fix leak on --extcap-interfaces
     
-    Change-Id: I3f11d48f74d71367cc76c76dfc88763894f23f2c
-    Reviewed-on: https://code.wireshark.org/review/4679
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    extcap_base_register_interface duplicates the memory, so there is no
+    need to keep it around.
+    
+    Change-Id: I2bac8be519b659504c512d4eb29be8f7ef6dbd59
+    Reviewed-on: https://code.wireshark.org/review/15919
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9cba3b6
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Oct 14 03:29:58 2014 -0400
+commit 95a0579
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 15 08:24:48 2016 -0700
 
-    packet-gvsp.c: sort pixeltypenames[] for extended value-string use.
+    win-setup.ps1: stop downloading user-guide; with CMake it is generated from source code
     
-    Change-Id: Iaf753d432603422922ad7ef4ba7a2c2b3cd84136
-    Reviewed-on: https://code.wireshark.org/review/4678
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I3b015594bd6a6b0c41938ba17d5690c08e04f490
+    Reviewed-on: https://code.wireshark.org/review/15917
+    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 e70db8e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 14 00:11:16 2014 -0700
+commit 525fd71
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 14 23:17:25 2016 -0400
 
-    And another warning.
+    proto_tree_add_boolean -> proto_tree_add_bitmask_list_value
     
-    (So why can't GCC or Clang be taught to warn about *all* implicit
-    shortenings, as MSVC does, not just 64-bit-to-32-bit shortenings?)
-    
-    Change-Id: I88c0b0aa2f1b306f58952589ff8bcae17bc29768
-    Reviewed-on: https://code.wireshark.org/review/4676
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic644042d238b5f2abcd874bca92c6dea55804ba9
+    Reviewed-on: https://code.wireshark.org/review/15913
+    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 abd657f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 14 00:08:45 2014 -0700
+commit d25a60c
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sun Apr 24 11:21:50 2016 -0700
 
-    Squelch another warning.
+    More Sysdig / system event support.
     
-    (Yes, we should, on platforms with a 32-bit time_t, check to make sure
-    the time stamp fits and do something if it doesn't.  Or we should make
-    the seconds part of an nstime_t be 64-bit and handle overly-large values
-    when converting them to year/month/day/hour/minute/second.)
+    Add REC_TYPE_SYSCALL to wiretap and use it for Sysdig events. Call the
+    Sysdig event dissector from the frame dissector. Create a "syscall"
+    protocol for system calls, but add "frame" items to it for now.
     
-    Change-Id: If219534985dce29d00754ff151f6c4b5893080d8
-    Reviewed-on: https://code.wireshark.org/review/4675
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7d28a56
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 14 00:07:16 2014 -0700
-
-    Squelch a compiler warning.
+    Add the ability to write Sysdig events. This lets us merge packet
+    capture and syscall capture files.
     
-    Change-Id: I5b383c967c465882819ac449fbd54915bc692687
-    Reviewed-on: https://code.wireshark.org/review/4674
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I12774ec69c89d8e329b6130c67f29aade4e3d778
+    Reviewed-on: https://code.wireshark.org/review/15078
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a5d35a2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 13 23:55:08 2014 -0700
+commit b26e757
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Wed Jun 15 08:53:14 2016 +0200
 
-    Clean up comment.
+    Let the calculated window scale be 16 bit wide.
     
-    Change-Id: I9a620da95c1dd9b173cebe28f790eeb50e3f9a8f
-    Reviewed-on: https://code.wireshark.org/review/4673
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 4495753
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 13 23:47:24 2014 -0700
-
-    Get rid of out-of-date comment.
+    Even though TCP window scale shift is only 8 bits, the scale
+    calculated from it is max 16384. therefor a 16 bit value.
+    Let the tree item map to the single byte in the TVB, while
+    allowing the value to be 16 bit.
     
-    Change-Id: I68e85e2e29e1154170ccc50488ec943958978150
-    Reviewed-on: https://code.wireshark.org/review/4672
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 12525
+    Change-Id: I41cebc62f6b8b09e13efa5f3b7432001e8d994e1
+    Reviewed-on: https://code.wireshark.org/review/15914
+    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 fa6e907
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Oct 13 23:45:05 2014 -0700
+commit 0ef1d94
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 14 11:55:08 2016 -0400
 
-    Initial version of support for Colasoft Capsa files.
+    Allow control of individual columns to be (un)writable.
     
-    The time stamp origin is not correct.  Capsa's absolute time stamp for
-    the sample captures from their Web site would be helpful.
+    Most protocols just want to limit COL_INFO or COL_PROTOCOL
+    so give that level of granularity.
     
-    Change-Id: I365daf7b42240e33f54df76939254f41ed57a9b2
-    Reviewed-on: https://code.wireshark.org/review/4671
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 12144
+    Bug: 5117
+    Bug: 11144
+    Change-Id: I8de9b7d2c69e90d3fbfc0a52c2bd78c3de58e2f8
+    Reviewed-on: https://code.wireshark.org/review/15894
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    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 0149015
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Oct 14 02:02:10 2014 -0400
+commit c19e6c2
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Tue Jun 14 14:52:01 2016 -0700
 
-    packet-gvsp.c: Fix license; Remove unneeded code from proto_reg_handoff..(); adjust whitespace.
+    cmake: fix ENABLE_ASAN detection
+    
+    Do not add -fsanitize=undefined when ASAN is requested, UBSAN is a
+    different feature (which could be added later as desired). This makes
+    the -DENABLE_ASAN=1 option match the autotools --enable-asan option.
+    
+    Fail hard if ASAN support is requested but not supported, this avoids
+    surprises when something is wrong. Fix ASAN detection by setting the
+    linker option too.
     
-    Change-Id: I24a9033bbed3d50daf886f3d00239c1580894c35
-    Reviewed-on: https://code.wireshark.org/review/4670
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Note: if you have previously set ENABLE_ASAN=1 with the broken ASAN
+    detection, you have to clear your CMakeCache.txt file to redo the
+    detection.
+    
+    Change-Id: Iba6ca0da0336eccedd0cf31a251baad9d1aff5b4
+    Reviewed-on: https://code.wireshark.org/review/15908
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 96a1bf0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Aug 26 16:44:04 2014 +0200
+commit 3a59021
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 15:28:16 2016 -0400
 
-    NSIS: Wireshark GTK is Wireshark legacy (and no Wireshark 1...) !
+    Change how dissectors do late-field-registration to avoid a double-registration
+    assertion.
     
-    Change-Id: I3b4f4ca28bc7d363474bc888b6a3a8ddbdb7dab9
-    Reviewed-on: https://code.wireshark.org/review/3867
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    If a dissector forces registration of fields during dissection it needs to do
+    so in a way that clears the prefix registration.  Otherwise epan will call the
+    registration routine a 2nd time (which will cause us to assert out) if a user
+    types a display filter (with the dissector's prefix) that doesn't exist.
+    
+    Update the proto_register_prefix() comments to reflect this.
+    
+    Change-Id: I3ce29243395fb55192bb5dfd950baa88410ac136
+    Reviewed-on: https://code.wireshark.org/review/15881
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit ea11378
-Author: warrenm <warrenmptgrey@gmail.com>
-Date:   Fri Oct 10 10:45:07 2014 -0700
+commit 22fd85d
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jun 13 18:05:11 2016 -0700
 
-    Adding GigEVision GVSP dissector
+    mount: fix a memory leak
     
-    Bug: 8673
-    Change-Id: I4e8270c76291d6ea0e0187f00a342804275f2c11
-    Reviewed-on: https://code.wireshark.org/review/4547
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    don't copy the wmem-buffer from address_to_str() into a g_malloc()ed one
+    that is never freed
+    
+    instead, realloc the wmem-buffer and add the nfs path to it
+    
+    (nfs_name_snoop_add_name() will make a copy internally)
+    
+    Change-Id: I4274a4a413c09f3f1d78beba65d94748ce185413
+    Reviewed-on: https://code.wireshark.org/review/15902
     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 03bc68c
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Mon Oct 13 17:51:15 2014 +0200
+commit eb4ed5a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Jun 14 17:35:51 2016 -0700
 
-    fix forward declarations in opcua_serviceparser.h
+    Clean up some messages.
     
-    The declarations from opcua_complextypeparser.h were used instead of the serviceparser ones, this is also fixed in our generator
+    We're checking for more than just a 64-bit off_t; we're checking for the
+    ability to do 64-bit seeks in files, even if, as on Windows, the APIs
+    are different.
     
-    Change-Id: I3d78d26a3b2b4995dfd4556720d29ecdd6960c4b
-    Reviewed-on: https://code.wireshark.org/review/4650
-    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>
+    Remove trailing white space and clean up some comments while we're at
+    it.
+    
+    Change-Id: I6122b6d6b44ff5dd3a4d8268f9793193e65817ce
+    Reviewed-on: https://code.wireshark.org/review/15912
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit fb27a68
+commit 51dd96f
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Oct 13 23:14:19 2014 +0200
+Date:   Tue Jun 14 16:11:18 2016 -0700
 
-    NCP: cast to guint instead of gulong
+    Fix OSX buildbot
+    
+    Dirty CORBA IDL dissectors must be compiled without -Werror option
     
-    Change-Id: Idc8f8f3177703ce5546b8a472034705cb6070707
-    Reviewed-on: https://code.wireshark.org/review/4666
+    Change-Id: I46431c635274399cd6d365a608cdc0aecbc59c95
+    Reviewed-on: https://code.wireshark.org/review/15911
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 8342eb8
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Oct 10 22:17:23 2014 +0200
+commit 38d08e0
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jun 14 19:35:32 2016 +0200
 
-    smartcard descriptor: bitmask for pin support field
+    dns_stats: generate stats just for pure dns (not mDNS, not LLMR).
     
-    Change-Id: If0e5cd90ff73bfbb211970f9a24974119c6ec550
-    Reviewed-on: https://code.wireshark.org/review/4664
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 9dd515c
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Oct 10 21:34:57 2014 +0200
-
-    smartcard descriptor:
-    dissect number of lines, characters per line in the lcd layout
+    The stats for mDNS and llmnr are pending. The change just resolves a bug
+    in the stats that are wrongly generated when the traffic is mDNS or LLMR.
     
-    Change-Id: I36c9c6f2e73cdfde8a9b7c4ad0450d93722fca2b
-    Reviewed-on: https://code.wireshark.org/review/4663
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Bug: 12492
+    Change-Id: Ie772e204d0ddea997dd8cbf609725605c8a507c8
+    Reviewed-on: https://code.wireshark.org/review/15897
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 15f23c7
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Oct 10 20:50:02 2014 +0200
+commit 58023e5
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Jun 14 23:43:15 2016 +0200
 
-    smartcard descriptor: the lcd layout is two bytes long
+    proto(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]
     
-    Change-Id: Ie8fd82d652a9a3fc1d3139ab610bbaa7a5ecd32d
-    Reviewed-on: https://code.wireshark.org/review/4662
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ie0e502adcc8eb00f65ffa6c018d5b9d79655ddb7
+    Reviewed-on: https://code.wireshark.org/review/15907
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 89a95f2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Oct 13 21:37:01 2014 +0200
+commit b7e32bb
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jun 14 17:23:58 2016 -0400
 
-    Add Kerberos 3.2.2 package for Win64
+    FIX dissector - Improve Message info
     
-    Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb
-    Reviewed-on: https://code.wireshark.org/review/4661
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Bug: 5350
+    Change-Id: I4b2d60549f9680bbc008a2abba5d7ec108f6bf22
+    Reviewed-on: https://code.wireshark.org/review/15905
+    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 1f48125
+commit 581a17a
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Oct 13 21:01:11 2014 +0200
+Date:   Mon Jun 13 15:11:55 2016 -0700
 
-    Upgrade Win64 GTK2 package to 2.24.23-3.39
+    CORBA IDL: compile dissectors with /Ox when using MSVC2013 x64
     
-    Change-Id: I0f5f27aa2fc13f38af73a42e1c6e4a36636d2fc7
-    Reviewed-on: https://code.wireshark.org/review/4656
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    By default Windows files are compiled with /O2 optimization flag (that brings the best performance).
+    But MSVC2013 x64 compiler generates buggy code for CORBA IDL dissectors.
+    Let's downgrade the optimization to /Ox for those files specifically.
+    
+    Bug: 12495
+    Change-Id: Ibbb532653808d915c82bd20b55dd9e68d86b1207
+    Reviewed-on: https://code.wireshark.org/review/15884
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 05a6615
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Mon Oct 13 16:18:28 2014 +0200
+commit d74113f
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jun 14 17:38:17 2016 -0400
 
-    extcap: Remove single-space argument for boolflags
+    Don't list "AVP" as a possible member of a grouped AVP.
     
-     Boolflags will be added with a NULL argument to the
-     list and therefore the original fix will work.
+    There's no AVP named "AVP".  And there's no need to tell Wireshark that any AVP
+    may put in the group (the RFC lists "AVP" for that purpose).
     
-     Note: extcap_get_complex_as_string will convert any NULL
-     value into a single character argument (' '). Therefore
-     any argument type, where NULL is a special value should
-     be handled seperately here. For now, the only datatype
-     will be BOOLFLAG
-    
-    Change-Id: Icfc9b573214e05ea713a3b70ea37953d470dafae
-    Reviewed-on: https://code.wireshark.org/review/4649
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Tomasz Moń <desowin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I3591af725ebe089e13eae7b712ef4404cb7924a2
+    Reviewed-on: https://code.wireshark.org/review/15906
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 74c4358
-Author: Mikael Kanstrup <mikael.kanstrup@gmail.com>
-Date:   Sat Oct 11 22:41:10 2014 +0200
+commit 9bb4edf
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Apr 5 18:24:25 2016 +0200
 
-    Split ws80211_get_phys callback handler
-    
-    Split up the ws80211_get_phys parser callback handler function into
-    separate functions for each attribute parsed. This is done in
-    preparation for supporting split wiphy dump feature where the function
-    logics will need modications.
+    packet.c: remove const compiler warning.
     
-    Change-Id: Ic0b497fc628f0e7453cd62eb8199f17f9a308a7f
-    Reviewed-on: https://code.wireshark.org/review/4610
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ida9384dccb0e8bacbc9aad39515c3dae9c5ce563
+    Reviewed-on: https://code.wireshark.org/review/14768
+    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: Evan Huus <eapache@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ab7f9aa
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Oct 13 14:05:29 2014 +0200
+commit 40a3cbf
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jun 14 11:31:10 2016 -0700
 
-    BER: Code cleanup in call functions
+    Qt: fix crash when opening Expert Info dialog
     
-    Change-Id: I0ba958485dffd3cc1e419fb27cf7f2bc492d05fe
-    Reviewed-on: https://code.wireshark.org/review/4643
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    g6ff19ff tried to access cinfo by following a chain of pointers from
+    expert_info. Access cinfo from cap_file_, which is more reliable. While
+    we are at it, let's explicitly check the pointer validity.
+    
+    Change-Id: I0da72c5b1d2230a49c125a1b57c81c3115c4f2fb
+    Reviewed-on: https://code.wireshark.org/review/15901
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit c0c00f4
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jun 14 10:52:28 2016 -0400
+
+    Give unique names to a bunch of reserved, experimental, etc., AVPs.
+    
+    Also remove a bunch of AVPs that are unassigned/unallocated--there's no
+    real benefit to telling users that...
+    
+    Change-Id: I1b18a11a1b65189d21520c74aae3dde77688e592
+    Reviewed-on: https://code.wireshark.org/review/15895
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6a9479e
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Oct 13 15:04:21 2014 -0400
+commit 4ba1fe4
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Tue Jun 14 21:45:53 2016 +0200
 
-    Add editor modelines and/or adjust whilespace.
+    Replace wlan_ignore_wep_ by wlan_ignore_prot_ and WLAN_IGNORE_WEP_ by WLAN_IGNORE_PROT_
     
-    Change-Id: I626b7bd8ac6e4b91c57cc9152e7ce038754e7278
-    Reviewed-on: https://code.wireshark.org/review/4658
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I870cc1e5293dd6e1a1b71157987e27399e080a73
+    Reviewed-on: https://code.wireshark.org/review/15904
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 63faad6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Oct 13 21:04:09 2014 +0200
+commit 0d45698
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon May 2 17:21:57 2016 +0200
 
-    NCP: add a missing cast following g6ca40c5
+    tvbparse: change g_hash_table to wmem_map.
     
-    Change-Id: I0b93c4faab52d830b8160d89b9bb8026ab2a216e
-    Reviewed-on: https://code.wireshark.org/review/4657
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I245595051617f6d6333314240825a526adf19339
+    Reviewed-on: https://code.wireshark.org/review/15244
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b653564
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Oct 12 22:27:54 2014 +0200
+commit a7ab65d
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Apr 21 18:04:16 2016 +0200
 
-    Lua: luaL_checkstring does not return NULL
+    addr_resolv: change g_hash to wmem_map.
     
-    Removed all checks for NULL strings to cleanup the code.
-    
-    Change-Id: Ia890cd9b206296f586e85214f07765f14984580b
-    Reviewed-on: https://code.wireshark.org/review/4632
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Change-Id: Ice7533fbeac700dae0a46766838818a32b0d5736
+    Reviewed-on: https://code.wireshark.org/review/15051
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 9ce5ca5
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Mon Oct 13 13:26:21 2014 +0200
+commit 1dabd3a
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Apr 12 18:14:14 2016 +0200
 
-    extcap: Catch unknown arguments to fix spaces
-    
-     - If boolflags are being used, an extra space is added
-       to the call of the extcap filter. This leads to the
-       argumentparser of python to exit with an error-code,
-       and the extcap filter will not start. This patch instead
-       catches the unknown arguments and prints them on stdout,
-       as well as running the dissection with the rest of the
-       arguments list.
+    dcm: remove g_malloc
     
-       Basically this is a work-around, for a behaviour not
-       yet fixed in extcap, but it stabilizes the usage of the demo
-    
-    Change-Id: I7589292692b0b3c839909fd09d62a4714cbe869e
-    Reviewed-on: https://code.wireshark.org/review/4638
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Tomasz Moń <desowin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I3d00b710c6fc6e5798ecc5eca9af11ccac920e5a
+    Reviewed-on: https://code.wireshark.org/review/14913
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 631834f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 13 10:21:39 2014 +0200
+commit 374d120
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon May 2 17:50:38 2016 +0200
 
-    IPv6: use proto_tree_add_item for IPv6 Routing Header Next and Length
+    tvbparse: change g_malloc to wmem_alloc.
     
-    Like other header (Fragment, Hop by Hop...)
-    
-    Change-Id: I5d0a85bf285b37eed38345d659439400c5f50d06
-    Reviewed-on: https://code.wireshark.org/review/4634
+    Change-Id: I6a6363400d9fd1d76b9de0c5deea83dfc7cea1e2
+    Reviewed-on: https://code.wireshark.org/review/15245
     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 b9988e2
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Oct 13 12:55:40 2014 -0400
+commit 76ed781
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Tue Jun 14 21:12:16 2016 +0200
 
-    ncp2222: don't overflow buffer constructing string
+    Add Aerohive gre tunnel between APs.
     
-    Fixes stack-smashing vuln.
+    Change-Id: I24d0320cd164ead2802af37d07016c9c46d18e9e
+    Reviewed-on: https://code.wireshark.org/review/15903
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+
+commit e86af3a
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Apr 3 11:10:02 2016 +0200
+
+    wslua: remove FAIL_ON_NULL_MEMBER_OR_EXPIRED
     
-    Somehow there was already an XXX in the code about this, but nobody realized at
-    the time it was worth fixing... really?
+    Ensure that the member cannot be NULL at initialization, simplifies
+    checkCaptureInfo and checkCaptureInfoConst logic.
     
-    Bug: 10552
-    Change-Id: I849068bd6c45146339444f295b72430d3c6e08f2
-    Reviewed-on: https://code.wireshark.org/review/4653
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I2d9caa4a235310569ebbf0b30199dd3df7a4c093
+    Reviewed-on: https://code.wireshark.org/review/14791
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8fb74b4
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Oct 13 12:08:43 2014 -0400
+commit f6e223c
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun Apr 3 10:58:44 2016 +0200
 
-    extcap: remove use of g_list_free_full
+    wslua: Drop unused "push_code" macro parameter
     
-    It requires a newer glib than we support
+    Reduce noise, no caller has used this parameter since its introduction.
+    Msotly automated regex search and replace.
     
-    Change-Id: Id8f14d4188a9ba55e0a5196bb877e2fe6a0c8d3f
-    Reviewed-on: https://code.wireshark.org/review/4652
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I4b1180bfee8544b38d19c9c440ff5b9b0dc080b2
+    Reviewed-on: https://code.wireshark.org/review/14790
+    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 4f37f55
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Oct 13 14:04:23 2014 +0200
+commit cecb227
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jun 3 17:56:54 2016 +0200
 
-    RTSE: Return dissected length from call_rtse_oid_callback
+    Add dissector for Real Time Location System (RTLS)
     
-    Change-Id: I6766135ddcdfe25d9bcc060bb2a47376abb36794
-    Reviewed-on: https://code.wireshark.org/review/4642
+    Change-Id: I494cbb8c3c6da18dfd7901d098dde6448226f67e
+    Reviewed-on: https://code.wireshark.org/review/15711
+    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>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 748e522
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Oct 13 13:59:38 2014 +0200
+commit 4000386
+Author: Irene Ruengeler <ruengeler@wireshark.org>
+Date:   Mon Jun 13 17:39:42 2016 +0200
 
-    ROS: Return dissected length from call_ros_oid_callback
+    Fix SCTP analysis broken
     
-    Change-Id: I8d119cd3dc9ac0a724497400680a70f39fc21ede
-    Reviewed-on: https://code.wireshark.org/review/4641
+    Bug: 12513
+    Change-Id: I3fdf79106ed007aadf528f0b373fb7a487f3d9a9
+    Reviewed-on: https://code.wireshark.org/review/15870
+    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>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 24b6a11
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 12 20:56:17 2014 +0200
+commit 798f7e9
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Tue Jun 23 13:51:32 2015 -0700
 
-    IPv6 RPL option is read as less bytes than it is
+    gtk: Allow restoring maximized windows as maximized
     
-    Add check if the opt len equal to the "calculcate" length
-    and display expert info if not.. also replace offset by the opt len
+    without losing window decorations on GNOME on the secondary monitor.
     
-    Bug:10559
-    Bug:10561
-    Change-Id: I6e80e4055b6d0c5ef3f030c544cd1629e6b9abec
-    Reviewed-on: https://code.wireshark.org/review/4627
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Bug: 11303
+    Change-Id: Ie8f541dba9d49f9fe5d4892a8dc1cd42091afe1d
+    Reviewed-on: https://code.wireshark.org/review/9077
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a9497be
-Author: Tim (Thanh) Nguyen <tnnguyen@broadcom.com>
-Date:   Sun Oct 12 10:31:03 2014 -0400
+commit f8031fa
+Author: Binh Trinh <beango@gmail.com>
+Date:   Tue Jun 14 00:37:53 2016 -0400
 
-    RoCE and CM dissector fixes
+    Added XML proper decoding for XML CDATASection
     
-    - fixed cm.req cm.rep bit fields
-    - fixed packetLength and CRC length for RoCE
-    - use "RoCE" or "RRoCE" instead of "InfiniBand" in COL_PROTOCOL where appropriate
-    
-    Change-Id: Id491658f9368034bb2267922fa5618e1c259cd56
-    Reviewed-on: https://code.wireshark.org/review/4614
-    Petri-Dish: Bill Meier <wmeier@newsguy.com>
+    Bug: 11755
+    Change-Id: Iecf7ce4bfad45d0c49f3af205e8489e53077198b
+    Reviewed-on: https://code.wireshark.org/review/15889
+    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: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c4acc4b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 12 19:22:58 2014 +0200
+commit cbfa817
+Author: Anders Broman <a.broman58@gmail.com>
+Date:   Tue Jun 14 15:37:33 2016 +0000
 
-    extcap (GTK): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Revert "Move inclusion of CmakeListsCustom to the end of the file in order to have all defines in place."
     
-    Change-Id: Ifdba972e3a12e01ac80bc920a2100bd7aa0f733c
-    Reviewed-on: https://code.wireshark.org/review/4622
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit b3ad51d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Oct 13 14:17:35 2014 +0200
-
-    Follow-up of ged0b19b (Make boolean bitmask type 64-bit wide)
+    This reverts commit bcbcad1e597f89e64389b6cc25b2fdbe9f89d960.
     
-    - use G_GINT64_MODIFIER instead of "%ll"
-    - use G_GUINT64_CONSTANT instead of ULL
-    - add some missing explicit casts
+    This change breaks building of custom plugins.
     
-    Change-Id: Ic048d9ee8966ea504ea542cefe55688edcfb2dc7
-    Reviewed-on: https://code.wireshark.org/review/4644
-    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>
+    Change-Id: I63e88ceb922ca23ead9784705ad8ba088a504fd1
+    Reviewed-on: https://code.wireshark.org/review/15893
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e8a63a5
+commit 2f9957a
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 13 12:30:26 2014 +0200
+Date:   Tue Jun 14 15:40:57 2016 +0200
 
-    SPDY: Add Slot field for SYN_STREAM (and also unused field...)
+    browser (dcerpc): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Ping-Bug: 10566
-    Change-Id: I4d3d991eb8b5ede349a361d1f6b605b4a67a98b6
-    Reviewed-on: https://code.wireshark.org/review/4645
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I158a5fd8a645cd4d58565a6a4ee64371d271eb8e
+    Reviewed-on: https://code.wireshark.org/review/15892
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 017fc82
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 13 11:55:34 2014 +0200
+commit af6936c
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Mon Jun 13 20:01:08 2016 -0700
 
-    SPDY: Fix bitmask for priority bit
+    GTK: Disable liboverlay-scrollbar that crashed wireshark on Ubuntu
     
-    Found by yurui ming
-    
-    Ping-Bug: 10566
-    
-    Change-Id: I92e784eb91dc6c88af409e2936671b0ea473fba9
-    Reviewed-on: https://code.wireshark.org/review/4637
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Bug: 11400
+    Change-Id: I40d901ab3ef43a61ef984014dabc0547605ef77c
+    Reviewed-on: https://code.wireshark.org/review/15888
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2c23c7e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 13 10:50:50 2014 +0200
+commit 048ba7a
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jun 13 15:50:33 2016 -0700
 
-    SPDY: Fix the display of COL_INFO...
+    mount: don't THROW() an exception from a dissector
     
-    Clear the COL_INFO before start to dissect SPDY PDU
+    if the length is too large, we can simply skip nfs_name_snoop_add_name()
+    and the code to prepare its input
     
-    Change-Id: I7a22515f1c2c89b5647003320ff455a74fbce42a
-    Ping-Bug: 10566
-    Reviewed-on: https://code.wireshark.org/review/4636
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I30c9a89edf7b48c45b52e7dad099ac4151f7f4a7
+    Reviewed-on: https://code.wireshark.org/review/15883
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ebbe70b
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Oct 7 22:41:47 2014 +0200
+commit 238a984
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 19:51:29 2016 -0400
 
-    ASN1: Register BER syntaxes as NEW
+    Don't register Wireshark for .pfx (IPFIX) files.
     
-    Change-Id: Id85eaecd84dbe1115935e1977dca321fd601d986
-    Reviewed-on: https://code.wireshark.org/review/4639
-    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 71ae57e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 13 09:50:46 2014 +0200
-
-    IPv6: Fix typo for Fragment nxt (Next Header)
+    (As pointed out by Gerald) .pfx files are (more commonly) PKCS#12 files.
+    People may be upset if we start grabbing them.
     
-    Change-Id: Id7d6cd4a4c09238890394d5dc887ec840dc2d2af
-    Reviewed-on: https://code.wireshark.org/review/4633
+    Change-Id: Iecf857d082b7f2a0ad4fdd1a932332fc3c9d9498
+    Reviewed-on: https://code.wireshark.org/review/15886
     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 313c400
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Oct 13 13:37:24 2014 +0200
+commit da50994
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 20:14:41 2016 -0400
 
-    P1: Added ORAddress and ORName syntax.
+    Adjust the Diameter DTD to accept applications and vendors in any order.
     
-    Change-Id: Icf8e8cb2988d9134aa65f04a3459e4a4c4a5721f
-    Reviewed-on: https://code.wireshark.org/review/4640
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Change-Id: I301a138b7f6db2d1a9ce1a20ebecf94e100bf831
+    Reviewed-on: https://code.wireshark.org/review/15887
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 4e1b5ea
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Oct 6 15:31:47 2014 +0200
+commit 4e13588
+Author: John A. Thacker <johnthacker@gmail.com>
+Date:   Mon Jun 13 16:36:07 2016 -0400
 
-    ASN1: Register PDU-dissectors as NEW
+    extcap: Check libssh >= 0.6.0 for sshdump, ciscodump
     
-    Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
-    Reviewed-on: https://code.wireshark.org/review/4494
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    sshdump and ciscodump require libssh >= 0.6.0. Check for this version and
+    only build them if a sufficient version is present. (The other checks
+    stay; in particular, ssh_userauth_agent doesn't exist on Windows and
+    must be checked separately.)
+    
+    Bug: 12507
+    Change-Id: Ibe42b0cbb597cd9c4aab51f44d48185940ad954b
+    Reviewed-on: https://code.wireshark.org/review/15882
+    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>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 94d3548
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 13 10:32:38 2014 +0200
+commit 4943082
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 19:28:04 2016 -0400
 
-    SPDY: Fix typo about length for Control bit
+    Fix Custom.xml so it can be (correctly) included into the main dictionary.
     
-    Found by yurui ming
+    This file is included into dictionary.xml so it doesn't need all the DOCTYPE
+    stuff.
     
-    Change-Id: Ibef07fa13af0de8357bdf98a038460706d0972f7
-    Ping-Bug: 10566
-    Reviewed-on: https://code.wireshark.org/review/4635
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I8397b3babe45c28706867be3169ce6ed566930e6
+    Reviewed-on: https://code.wireshark.org/review/15885
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 749832a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 12 19:37:02 2014 +0200
+commit 90fa55d
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Jun 13 05:35:14 2016 +0100
 
-    USB Mass Storage: Display target number for SCM USB-SCSI converters
-    
-    The USB Mass Storage Class (Bulk Only Transport) has the LUN in bits [3:0] of byte 13 of the command block wrapper. Bits [7:4] of that byte are undefined/reserved.
+    Add missing const to inet_ipv6.h
     
-    USB-SCSI converters based on a chipset from SCM Microsystems can work with multiple SCSI devices. After enabling multi-target mode (which the vendor driver and Linux do), the target number is given in bits [6:4] of CBW byte 13.
+    Make it simpler too.
     
-    Request from Mark
-    
-    Bug:10563
-    Change-Id: I8e6d9b7d47ff4296d41e8b9b15f4bd44c89238c9
-    Reviewed-on: https://code.wireshark.org/review/4625
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I97dc79d7ac536089c1fa6ec2c20f19754d47a9d4
+    Reviewed-on: https://code.wireshark.org/review/15866
+    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 8cc7b0d
-Author: Joseph Huffman <jhuffman@codeaurora.org>
-Date:   Thu Sep 25 16:27:41 2014 -0700
+commit 72af485
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sat Jun 11 13:56:33 2016 +0200
 
-    Fixed missing padding. Fixed ENC_NA/ENC_BIG_ENDIAN errors.
+    dcerpc: don't THROW() an exception from a dissector
     
-    There was no tree items for padding in the many instances where there were
-    bytes added to make certain data types align on even boundaries of 2, 4, or
-    8 bytes. These instances now show up as "Padding" in the display.
+    remove the checks in dissect_ndr_ucarray_core() where a block or bytes
+    dissection function is called and an exception is thrown if the offset
+    wraps around, i.e. the final offset is lower than the initial one
     
-    There were many instances where ENC_NA was used for fields of more than one
-    byte. This wasn't noticed before because ENC_NA was ENC_BIG_ENDIAN for
-    historical reasons and all these fields are big endian fields.
+    the block functions eventually call proto_tree_add_item(), which throws
+    an exception if necessary
     
-    Change-Id: Iabadd46eacc9ceb8ca85f4a5ba42b6583375c5f0
-    Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org>
-    Reviewed-on: https://code.wireshark.org/review/4413
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8d0becd
-Author: Matthieu Texier <matthieu@texier.tv>
-Date:   Mon Sep 15 16:10:51 2014 +0200
-
-    Aliging PIM hello message type to IANA in order to fix BUG 10231
+    the bytes functions end up calling functions to dissect basic types.
+    insert calls to tvb_ensure_bytes_exist() if those functions increase our
+    offset without reading data.  thus, an exception is thrown if there's an
+    overflow.
+    
+    remove some unnecessary if (tree) checks while at it
     
-    Change-Id: Ie9a126d106c08935eb385fd93d011e481913ab3c
-    Reviewed-on: https://code.wireshark.org/review/4448
+    Change-Id: I8006399ae20934daeec231246debe247f8dedbf0
+    Reviewed-on: https://code.wireshark.org/review/15832
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b563a84
+commit 551b824
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Oct 12 22:09:35 2014 -0400
+Date:   Mon Jun 13 15:34:16 2016 -0400
 
-    Eliminate proto_tree_add_text from IP dissectors
+    Add proto_tree_add_bitmask_list_value.
     
-    Change-Id: I81fc364cbff3c5b305d61b2d444bf8599fbd19e7
-    Reviewed-on: https://code.wireshark.org/review/4631
+    Ran across enough situations that proto_tree_add_bitmask_list couldn't
+    solve that it seemed necessary.
+    
+    Change-Id: I6a540ac6efca76cae7c4571a84bb400538652784
+    Reviewed-on: https://code.wireshark.org/review/15880
     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 5518513
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 12 20:58:59 2014 +0200
-
-    IPv6 RPL: Display RPL flag on HEX
-    
-    Change-Id: I0b3bb9e1a0de388135a71bc6a97602d6abf6a9dc
-    Reviewed-on: https://code.wireshark.org/review/4628
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 73613d4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 12 17:51:29 2014 +0200
+commit 720b47f
+Author: Andreas Leibold <andreas.leibold@harman.com>
+Date:   Fri Jun 10 10:41:19 2016 +0200
 
-    Remove DIRTY_DISSECTOR_SRC
+    Updates on AVB IEEE 1722 protocol to support more 1722 subtypes.
     
-    x11 dissector don't have longer warning !
-    and fix different between Autotools and CMake (about gsm_a_common dissector)
+    packet-ieee1722.c now contains the entire protocol.
+    packet-ieee1722a.c file was removed, because the term 1722a is outdated
+    and now part of 1722 protocol.
     
-    Change-Id: Id9da62d84b8b0bb4b0ed5d8fc62abba4e2442ed2
-    Reviewed-on: https://code.wireshark.org/review/4621
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ic2f44a2752f9254cde62d878dc971f09cddc5adc
+    Reviewed-on: https://code.wireshark.org/review/15810
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 38c9ac8
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Oct 12 22:56:19 2014 +0200
+commit 858dc0c
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jun 12 16:31:57 2016 -0700
 
-    GlusterFS: fix OSX compilation failure
+    use #include <file.h> for generated include files
     
-    ged0b19b introduced support for 64 bits bitmask. Make use of it and add an explicit cast to fix a compilation error
+    the same mechanism as described in
+    7c40de5c38ac71323455c51dcc14a5eb385ce718
+    could trick us into using the wrong config.h
     
-    Change-Id: I9f2202d851aedc0dc78655c505b5a0b26b224c0e
-    Reviewed-on: https://code.wireshark.org/review/4630
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit eed22ac
-Author: Tomasz Moń <desowin@gmail.com>
-Date:   Sun Oct 12 21:07:48 2014 +0200
-
-    Fix double free.
+    fix this for some occassions where config.h is included before we
+    include zlib.h
     
-    This double free involves damaging GHashTable internals (key and value).
+    I saw compile errors on windows where we picked up config.h from a linux
+    build and zlib failed because of a mission unistd.h
     
-    Change-Id: I17c8a473b96ab28e611ccf79ddd2b3da56512184
-    Reviewed-on: https://code.wireshark.org/review/4629
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Tomasz Moń <desowin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I91cf73b96c9e1b6f009fb2376fabfe973d1ac941
+    Reviewed-on: https://code.wireshark.org/review/15874
+    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 fc2f318
-Author: Tomasz Moń <desowin@gmail.com>
-Date:   Sun Oct 12 17:26:04 2014 +0200
+commit dda2acc
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jun 12 14:00:21 2016 -0700
 
-    Fix handling of extcap boolflags which defaults to true.
+    qt: use #include <file.h> for generated include files
     
-    Example:
-    arg {number=0}{call=--test}{type=boolflag}{default=true}
+    make sure that generated include files are picked up only from the
+    directories set by -I (or /I), not from the current directory
     
-    Before this change --test was never added to argument list (no matter if
-    user left it selected or explicitly deselected it).
+    if we use #include "file.h", Visual Studio searches for file.h in the
+    same diretory as the source file that includes file.h
     
-    After this change --test will be added to argument list unless user
-    explicitly deselects it.
+    if we do an out-of-tree build with cmake and the source directory
+    contains files from an in-tree build (done with autotools), we might end
+    up including the wrong file
     
-    Change-Id: Ia5bc11f900b03e630aba882ef918dcb7f0b79291
-    Reviewed-on: https://code.wireshark.org/review/4618
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Iaaed2626258b6ff0c12485fe3f436bd03bbb5adf
+    Reviewed-on: https://code.wireshark.org/review/15873
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1b8b2a8
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Oct 12 14:56:12 2014 -0400
+commit 4ca4768
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jun 11 23:15:01 2016 +0100
 
-    Add editor modelines; Adjust whitespace as needed.
+    IPv6: Add text marker for SRH next segment
     
-    Change-Id: I4da7b335d905dbca10bbce03aa88e1cdeeb1f8ad
-    Reviewed-on: https://code.wireshark.org/review/4626
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: If13ffe4ddb9ae08e738ccf0c715dc12ce7a076e8
+    Reviewed-on: https://code.wireshark.org/review/15834
+    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 4e328e4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 12 17:44:04 2014 +0200
+commit 4dad151
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jun 13 11:36:10 2016 -0700
 
-    DCERPC: Remove DIRTY_PIDL_DISSECTOR_SRC
+    sip: remove some unnecessary if (tree) checks
     
-    Now mapi and drsuapi build without warning !
+    which shouldn't have any impact on performance
     
-    Change-Id: Iae19af2fd06fd998a13696ba2adf6cd12d311f58
-    Reviewed-on: https://code.wireshark.org/review/4619
-    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>
+    we should not remove the chcks around blocks where
+    vb_format_text() is called
+    
+    Change-Id: Idc191cc70e7458225bbc5dfececb3c88c83ab5f1
+    Reviewed-on: https://code.wireshark.org/review/15879
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d62b323
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 12 17:24:35 2014 +0200
+commit bcbcad1
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Jun 13 20:51:48 2016 +0200
 
-    PIDL (DCERPC misc): enhance dissector
+    Move inclusion of CmakeListsCustom to the end of the file in order to have
+    all defines in place.
     
-    * Fix -Wunused-function (Set NOEMIT winreg_Data and remove unused function)
-    * Remove dissector DCERPC misc from DIRTY list
-    
-    Change-Id: If59b14f8db33354a2d5248e8bc256cadee3ea4bf
-    Reviewed-on: https://code.wireshark.org/review/4345
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I190257e9b833c409921bbca74c8ab531b632c60d
+    Reviewed-on: https://code.wireshark.org/review/15878
+    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 148136c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 12 19:23:39 2014 +0200
+commit 3fe879b
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jun 13 09:30:30 2016 -0700
 
-    ISUP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    isns: fix dead code
     
-    Change-Id: I17163b18348919d19d3d336ccf9c1310d473a05d
-    Reviewed-on: https://code.wireshark.org/review/4624
+    do the special handling for len==0 and tag==ISNS_ATTR_TAG_PORTAL_GROUP_TAG
+    before going into the different attributes
+    
+    Bug: 12503
+    Change-Id: I4dd6dcea25aba2e4963811a7a85f1eed1b906bcd
+    Reviewed-on: https://code.wireshark.org/review/15875
     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 44208b9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 12 19:23:17 2014 +0200
+commit 30d1afb
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue May 3 16:51:45 2016 +0200
 
-    LMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    tvbparse: change g_strdup_printf to wmem_strdup_printf.
     
-    Change-Id: Ie651e8a7d0309330504a77664bb2eac75c00d968
-    Reviewed-on: https://code.wireshark.org/review/4623
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I57ff604d23967eb1f6481c7019e3eab0389dc3a5
+    Reviewed-on: https://code.wireshark.org/review/15257
+    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 1b65cb6
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sun Oct 12 18:41:36 2014 +0200
+commit 34cacfc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jun 13 11:17:48 2016 -0700
 
-    Add back get_uinteger for boolean_type.
+    Qt: Fix a Windows version check.
     
-    This was removed in ed0b19b94bf07056b5e0cfe64d4d05c3ebae801a
+    Fetch the version using QSysInfo::windowsVersion.
     
-    Change-Id: I548ca955eda6e0b6991a0f6731cbbb3bf82e0e2b
-    Reviewed-on: https://code.wireshark.org/review/4620
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Ping-Bug: 12010
+    Change-Id: If63c576ec4f56f34b76f320cdd927bee427c8cb7
+    Reviewed-on: https://code.wireshark.org/review/15876
+    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 6e3a2b4
+commit b8201ae
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Oct 12 08:06:04 2014 -0700
+Date:   Sun Jun 12 16:07:30 2016 -0700
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-10-12]
+    Qt: Main window tab behavior.
+    
+    Make the main window tab order more closely match the GTK+ UI. Draw a
+    focus rect in the byte view text while we're here.
     
-    Change-Id: Icc98f156e55bc8523490bb8a8d712ca80076649e
-    Reviewed-on: https://code.wireshark.org/review/4615
+    Change-Id: I04212c14ea7f0d6865b709533246760adc02f45a
+    Reviewed-on: https://code.wireshark.org/review/15862
+    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: Gerald Combs <gerald@wireshark.org>
 
-commit f7c5e3a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Oct 12 15:47:11 2014 +0200
+commit 1dcaeb3
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 14:29:22 2016 -0400
 
-    E-LMI: add what seems to be a missing break (Coverity CID 1245648)
+    Cisco Diameter: move the XML declaration to the top of the file.
     
-    Change-Id: I6b35ea96fba142bdabf17d3fc3f9db23dc390d31
-    Reviewed-on: https://code.wireshark.org/review/4613
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    ... That's where it's supposed to be.
+    
+    Change-Id: I0ec68dc8757776bf757b52e75bc156acc7264ee5
+    Reviewed-on: https://code.wireshark.org/review/15877
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit ed0b19b
-Author: Daniel Mack <daniel@zonque.org>
-Date:   Wed Sep 17 18:39:22 2014 +0200
+commit d06cac6
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 13:52:19 2016 -0400
 
-    Make boolean bitmask type 64-bit wide
+    Diameter (NSN): the attribute name is 'mandatory' not 'mandatory-flag'.
     
-    There are protocols out there that have 64-bit wide bit mask fields, so
-    make the internal representation and bitfield decoders 64-bit aware.
+    Change-Id: Ifa19b59e23278abf332d8ab06dd5ad2059f3e679
+    Reviewed-on: https://code.wireshark.org/review/15872
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+
+commit 4e989c2
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jun 13 13:37:08 2016 -0400
+
+    Diameter: close command elements.
     
-    For this, the ws_ctz() fallback and bits_count_ones() have to be tweaked
-    slightly.
+    ... in order to make the XML (more) valid.
     
-    Change-Id: I19237b954a69c9e6c55864f281993c1e8731a233
-    Reviewed-on: https://code.wireshark.org/review/4158
-    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>
+    Change-Id: Iefffff3208c98d6ea55d509ed35b57abd268baf3
+    Reviewed-on: https://code.wireshark.org/review/15871
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 29afac2
-Author: Matthieu Patou <mat@matws.net>
-Date:   Fri Oct 10 20:30:59 2014 -0400
+commit 04b82a7
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 12 12:28:02 2016 -0400
 
-    Add support for NTTIME_hyper and NTTIME_1sec
+    Convert AT_SS7PC to a "dissector address type"
     
-    It's hyper with 8 bytes alignment it can have 1/100000 sec resolution or 1sec resolution
+    The formatting of the address type is determined by a preference in
+    packet-mtp3.c, so just make MTP3 register the address type.
+    Use address_type_get_by_name in other dissectors (and export_pdu)
+    to use the address type.
     
-    Bug: 10541
-    Change-Id: Iecc4c6d1bd1695a4c02db72e1617134254810cd9
-    Reviewed-on: https://code.wireshark.org/review/4606
+    Change-Id: Ifb32d7de27aeaa23cee8e803e25ffb3c905547b5
+    Reviewed-on: https://code.wireshark.org/review/15856
     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 b3490c2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 11 16:06:57 2014 -0700
+commit e2e8456
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Mar 18 13:13:44 2016 -0700
 
-    Use the wtap_read_bytes{_or_eof}() routines.
+    Use getc_unlocked in a few places.
     
-    Change-Id: I4f707bc714b2643d0f6c568f3367e712ee635d8e
-    Reviewed-on: https://code.wireshark.org/review/4612
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Use getc_unlocked or _fgetc_nolock instead of getc in a few places. This
+    reduces startup time by about 100ms here.
+    
+    Change-Id: I59ceb09678457c871cce79fcc3ce71998fe4f5af
+    Reviewed-on: https://code.wireshark.org/review/14518
+    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 eb72d2a
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Sat Oct 11 22:39:17 2014 +0200
+commit 92ef3d0
+Author: Anton Thomasson <anton.thomasson@ericsson.com>
+Date:   Fri Jun 10 16:12:24 2016 +0200
 
-    Use variable name 'len' when handling length.
+    GSM RLC/MAC: add dissection of EC-GSM-IoT control messages
     
-    Change-Id: Icb1d81316d1ead3455c68ad55e52b8120b7dccf9
-    Reviewed-on: https://code.wireshark.org/review/4609
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Change-Id: Ib7096039aa9761fda96ed8552899833597ba70a6
+    Reviewed-on: https://code.wireshark.org/review/15812
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 8eefa4d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Oct 11 13:10:14 2014 -0700
+commit 4679f5d
+Author: Anton Thomasson <anton.thomasson@ericsson.com>
+Date:   Fri Jun 10 16:13:44 2016 +0200
 
-    Use the count-of-records fields to figure out how many records to read.
-    
-    Fetch the count of records from one of the locations where it appears to
-    be, and, currently, require that it be equal to the count at the other
-    location where it appears to be; if they ever differ, we'll need the
-    file in order to reverse-engineer some more.
+    GSM RR: add dissection of EC-GSM-IoT ccch control messages
     
-    Fix the way we *write* .rf5 files - it turns out that we were
-    
-       1) not writing the full file size;
+    Change-Id: Ib40f78a0d1822bf216af0911f9672c750a78b265
+    Reviewed-on: https://code.wireshark.org/review/15813
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit c016dcd
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Sun Jun 12 19:00:37 2016 -0400
+
+    Diameter: free the diameter directory variable.
     
-       2) not writing the packet count in the right location.
+    It's only needed for a few milliseconds--there's no need for it to stick around
+    until the epan scope ends.
     
-    Detect files written by the old code, and get the packet count from the
-    right location for those files.
+    As discussed on I51813815babb4c40722c38459139ab9e3e3ccb42.
     
-    Change-Id: I7ce83afbc9dbbd300c81c96ef8f7785a0aeefa7a
-    Reviewed-on: https://code.wireshark.org/review/4608
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I81fef351ef2d700cc5ec5866340605704173fbdb
+    Reviewed-on: https://code.wireshark.org/review/15861
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e331083
-Author: Matthieu Patou <mat@matws.net>
-Date:   Fri Oct 10 19:34:48 2014 -0400
+commit 8b6ea37
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 12 15:10:02 2016 -0700
 
-    Add dissection of MIDL_NDRHEADERBLOB used in drsuapi and some other protocols
+    Qt: Make the capture filter read-only only in main welcome.
     
-    Bug: 10540
-    Change-Id: If4a8603a7cb62894cc46094056dd5313039884b2
-    Reviewed-on: https://code.wireshark.org/review/4604
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    As noted in gb7897dd, CaptureFilterCombo needs to be read-only until the
+    app is initialized. Move the code to do so to MainWelcome, otherwise the
+    capture filter entry in CaptureInterfacesDialog starts out read-only and
+    stays that way. Disable / enable the entire CaptureFilterCombo instead
+    of setting its lineEdit read-only status, which provides a stronger
+    visual indicator.
+    
+    Change-Id: Ic7bf5b5631b861ecf4dc8cca67beb5bf4ed27510
+    Reviewed-on: https://code.wireshark.org/review/15859
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    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>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 81f9976
+commit 6ff19ff
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Oct 10 17:19:55 2014 -0700
+Date:   Fri Jun 10 09:57:17 2016 -0700
 
-    CMake: Don't add Custom.make to the bundle.
+    Qt: Add the Info column contents to Expert Info.
+    
+    When "group by summary" is enabled, packet items contain a packet number
+    followed by a lot of empty space. Fill it with the contents of the Info
+    column.
     
-    Change-Id: I08f2701e4450f34aa9d840cc5f507e9348e115bd
-    Reviewed-on: https://code.wireshark.org/review/4605
+    Set the first column title to "Severity" or "Packet" depending on the
+    item selection.
+    
+    Change-Id: Iff96ab2ec631300ec8f08e55019e191e88cff84a
+    Reviewed-on: https://code.wireshark.org/review/15814
     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 6e42a72
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Oct 10 19:22:45 2014 -0400
+commit 88f4374
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Apr 27 15:07:03 2016 +0100
 
-    Dissection of sid28 needs null check.
+    Indent register.c and other cosmetic changes
     
-    Bug: 10542
-    Change-Id: I8fcfbbd96833af2c57754a4c8f96cf702972e22a
-    Reviewed-on: https://code.wireshark.org/review/4603
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I06e863e0b87118047f4c3b7618df02b9c7384a34
+    Reviewed-on: https://code.wireshark.org/review/15836
+    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 5c5bf3b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Oct 10 15:03:26 2014 -0700
+commit 20961a1
+Author: Binh Trinh <beango@gmail.com>
+Date:   Sun Jun 12 14:21:12 2016 -0400
 
-    Update READMEs to reflect recent CMake environment changes.
+    Added Diameter 3GPP decoding of AVP 1404 - QoS-Subscribed
+    (removed spaces)
+    (removed C++ style comments)
     
-    Change-Id: Idbf879f20448eea0b69e793271439dec877832e9
-    Reviewed-on: https://code.wireshark.org/review/4602
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I0f6c7586486b48eab8659a048be451ce3fe1c72b
+    Reviewed-on: https://code.wireshark.org/review/15850
+    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 ffa377b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 10 13:20:02 2014 -0700
+commit 8ec8f6b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Jun 13 10:00:28 2016 +0200
 
-    Use names more like the other names in open_info.
+    Qt: Multi line import from hex dump without offsets
     
-    For open_info, use names based on the names in other lists.
+    Fix importing hex dump without offsets with multiple lines.
     
-    Also, in comments, indicate what the three count 'em three tables are
-    used for, and clean up the type/subtype table.
-    
-    Change-Id: I7a763119e790d5970f87dff05284f465eebfb7e7
-    Reviewed-on: https://code.wireshark.org/review/4599
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I7a7339e375b3125688f5b5d29f493704c7b9944a
+    Reviewed-on: https://code.wireshark.org/review/15868
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit d330cd4
-Author: cbontje <cbontje@gmail.com>
-Date:   Fri Oct 10 14:00:48 2014 -0600
+commit 4e55a28
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Jun 11 06:14:35 2016 +0200
 
-    DNP3 Protocol Bugfix / Enhancement
+    RADIUS: Add Sangoma dictionary
     
-    - Fix for Single-bit Objects offset-pointer
-    - Enhancement for Obj 12 Var 2 (Pattern Control Block) and Var 3 (Pattern Mask) Decoding
+    From FreeRADIUS master
     
-    Bug: 10558
-    Change-Id: I8d3f6cee4acbab09d0b93dab6b868cddd842b682
-    Reviewed-on: https://code.wireshark.org/review/4597
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit f7588ea
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Wed Oct 8 22:02:31 2014 -0700
-
-    [ELMI] Add missing information elements, add support for sub-information elements.
-    Bug 10532
+    commit ba4b4402588ae87497a0b7c87e26eb5cb433c8a7
+    Author: Alan T. DeKok <aland@freeradius.org>
+    Date:   Fri Jun 10 14:38:55 2016 -0400
     
-    Updated with Bandwidth Profile support
+        Added dictionary.sangoma
     
-    Change-Id: I0f31eb6c78a5e34bcb1c286a9a10730b3b63481c
-    Reviewed-on: https://code.wireshark.org/review/4571
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+        from http://wiki.sangoma.com/files/NSC-Radius-Support/dictionary.sangoma.txt
+    
+    Change-Id: Ie51ea6343a2a8a5b286d70451abce81ca920261f
+    Reviewed-on: https://code.wireshark.org/review/15823
+    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 a168c44
+commit 87b5597
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Oct 10 08:44:13 2014 -0400
+Date:   Sun Jun 12 11:12:15 2016 -0400
 
-    Remove (almost all) proto_tree_add_text calls in ISUP dissector.
+    Add address_type_get_by_name
     
-    Change-Id: I57a01eacaa02e45c23bb4827ae982c897fb308ee
-    Reviewed-on: https://code.wireshark.org/review/4592
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    This allows the decoupling of a dissector registering an address type
+    so it doesn't need to export the returned registered type.
+    
+    Change-Id: I49c913d042e70bd4b7ea1e964ba9511bb27304f5
+    Reviewed-on: https://code.wireshark.org/review/15855
     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 a193302
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Oct 10 07:16:21 2014 +0200
-
-    NCP: switch to wmem memory and ensure that all fields are initialized
-    
-    Change-Id: Ia17e189baed05d8020654e6702a51f51bd384f26
-    Reviewed-on: https://code.wireshark.org/review/4589
-    Reviewed-by: Evan Huus <eapache@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 685d303
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 10 11:40:08 2014 -0700
+commit 0baf13f
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jun 12 09:38:55 2016 -0400
 
-    Version 3 has only absolute timestamps; don't set nsg_creltime.
+    Completely remove dissector_add_handle.
     
-    Version 3's time stamps are all absolute, so we can directly use the
-    value in the file; we don't need to keep track of the time in the
-    private data structure, and some compilers issue warnings due to setting
-    it and then not using the value to which we set it.
+    It has been deprecated and replaced with dissector_add_for_decode_as.
     
-    Change some names and indentation to match other file versions while
-    we're at it.
-    
-    Change-Id: I97698d933b87a8ad58d9e88ceedd75004797df69
-    Reviewed-on: https://code.wireshark.org/review/4596
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I5a4976f83951f749e70b5267570fca188daa7a07
+    Reviewed-on: https://code.wireshark.org/review/15854
+    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 6463d2a
+commit 6ff6357
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Oct 9 22:48:59 2014 +0200
+Date:   Sun Jun 12 14:50:04 2016 -0700
 
-    GSM MAP: fix detection of SMS direction when application context version is < 3
+    USB: fix dissection of URB setup when the payload was claimed by a sub dissector
     
-    Bug: 10547
-    Change-Id: I4708fd9977e635c66ef1350ce5098520e4c2ce1e
-    Reviewed-on: https://code.wireshark.org/review/4579
+    Bug: 12511
+    Change-Id: Ic9af8358e2a8110f53c587201cafc337630c302a
+    Reviewed-on: https://code.wireshark.org/review/15858
     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>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 98d77e2
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Oct 10 08:32:51 2014 -0700
+commit fef202b
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jun 12 14:49:04 2016 -0700
 
-    CMake: Bundle the "share" directory files and directories.
-    
-    Work around a CMake bug using file globbing.
+    USB HID: add dissector to USB Device 'Decode As' list
     
-    Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f
-    Reviewed-on: https://code.wireshark.org/review/4595
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Ping-Bug: 12511
+    Change-Id: I6193e3bb084adf9925bb6800a756804164030630
+    Reviewed-on: https://code.wireshark.org/review/15857
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 23e78cd
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Oct 10 10:41:10 2014 -0400
+commit db8dd0f
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Jun 13 03:49:37 2016 +0100
 
-    Add editor modelines; Adjust whitespace as needed.
+    Rename a variable
     
-    Change-Id: I3dc57f4c2ca57585103e3b71503ac4c332903e50
-    Reviewed-on: https://code.wireshark.org/review/4594
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ie5d859e166fbc8073be88cbbd96bffa877e6b654
+    Reviewed-on: https://code.wireshark.org/review/15865
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit bdbc8e3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Oct 10 15:41:53 2014 +0200
+commit 3f0c709
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 12 19:15:40 2016 -0700
 
-    GTPv2: Presence-Reporting-Area-Elements-List do full dissection of ECGI
-    and TAI.
+    Finish moving the parenthesis.
     
-    Change-Id: I95d9ebf1d6f4eabe30b557fdc937d56006f8b123
-    Reviewed-on: https://code.wireshark.org/review/4593
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I02f099ef198e360663b03857bdf9538bb63a7de8
+    Reviewed-on: https://code.wireshark.org/review/15864
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7e49f06
+commit 49db728
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 10 03:21:57 2014 -0700
+Date:   Sun Jun 12 18:45:45 2016 -0700
 
-    wtap_file_read_till_separator() can return values other than 1 on success.
+    Fix a compile error.
     
-    It returns the length of the string it read, so only treat 0 and -1 as
-    errors.  (0 either means "EOF" or "string is zero length", but this is
-    only in the code that reads numbers, and a number needs at least 1
-    digit, so both EOF and "zero-length string" mean "this isn't a valid
-    Peek tagged file".)
+    (Perhaps the Petri dish buildbots should, if a build fails, immediately
+    mark the change as failing the Petri dish build, without waiting for the
+    other build(s), so that you don't have to, for example, wait for the
+    Ubuntu buildbot to finish doing a test build for a change that doesn't
+    affect code built on UN*X.)
     
-    Change-Id: Ib83eb2f1e53d912a2138be01480e2b464cf936db
-    Reviewed-on: https://code.wireshark.org/review/4591
+    Change-Id: I89ee1616d35c186fcabc0ec989936fa94116df70
+    Reviewed-on: https://code.wireshark.org/review/15863
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit f5b06c5
+commit 010e55c
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Oct 10 01:14:06 2014 -0700
+Date:   Sun Jun 12 15:30:35 2016 -0700
 
-    Fix some more int-to-enum conversion complaint.
+    Don't assume we can get a module handle for kernel32.dll.
     
-    While we're at it, log a message if a Lua file format module lacks a
-    read or a seek-read routine, rather than completely silently ignoring
-    that module if it claims a file.
+    A failure "shouldn't happen", but check anyway; if nothing else, that
+    squelches some complaining from the VS Code Analysis tool.
     
-    Change-Id: I9778f7835922439e2d3708614689280ef7b61d33
-    Reviewed-on: https://code.wireshark.org/review/4590
+    Change-Id: I9b06db399741176d0e9f859eb650bed8a2f96d9c
+    Reviewed-on: https://code.wireshark.org/review/15860
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 3a4cab7
-Author: Gerald Combs <gerald@zing.org>
-Date:   Thu Oct 9 18:24:18 2014 -0700
-
-    CMake: Bundle our libraries.
-    
-    Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa
-    Reviewed-on: https://code.wireshark.org/review/4588
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 33d20c6
-Author: Gerald Combs <gerald@zing.org>
-Date:   Thu Oct 9 18:36:12 2014 -0700
+commit d72b29c
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sun Jun 5 21:06:51 2016 +0200
 
-    Add back a value_string conversion lost in g58cc452.
+    Qt: Add import from hex dump without offsets
     
-    I don't have a capture to check but this appears to be correct.
+    Added support for importing from hex dump without offsets.
+    This will create one packet with all hex values found in the file.
     
-    Change-Id: I93405d1e3ec4aac3761d06e257db3ec2e32b2fc2
-    Reviewed-on: https://code.wireshark.org/review/4587
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I0414441721078befeb59aa6a87b9412646cfcf5c
+    Reviewed-on: https://code.wireshark.org/review/15743
+    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 45f2afc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 9 18:30:18 2014 -0700
+commit 0acc76a
+Author: Léo Gaspard <leo@gaspard.io>
+Date:   Sun Jun 12 22:35:16 2016 +0200
 
-    Oops, missed one.
+    Fix typo in dissector doc
     
-    Change-Id: I0847846d50d6979f0f50a00438a834c7c7c2acc0
-    Reviewed-on: https://code.wireshark.org/review/4586
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I5ca20080f99905ab23d484d0be054a89c406c583
+    Reviewed-on: https://code.wireshark.org/review/15852
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4f4e01b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 9 18:14:12 2014 -0700
+commit 752a8ea
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jun 12 18:46:46 2016 +0200
 
-    Don't treat int return values as valid wtap_open_return_val values.
+    expert_info_dialog (Qt): fix Uninitialized members (UNINIT_CTOR) reported by Coverity (CID 1362692)
     
-    They happen to be, at least now, but that's not valid in C++, and it's
-    probably unwise in any case.
-    
-    Change-Id: Ifd49920cfaa376e5e7788329ee83db3956a7cdff
-    Reviewed-on: https://code.wireshark.org/review/4585
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I1bc71ac7b9c08a9a5749aa9bc88863fa10eb27c7
+    Reviewed-on: https://code.wireshark.org/review/15848
+    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 9754192
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 9 18:09:06 2014 -0700
+commit bc35660
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jun 11 18:09:05 2016 +0100
 
-    Cast size_t to to gulong as the length argument to g_snprintf().
-    
-    Sadly, the GTK+ folks decided not to use size_t for the size argument,
-    so it doesn't do the right thing on LLP64 platforms such as Windows.
+    IPv6: Add dissection for SRH flags
     
-    Change-Id: I2aa9096215c488b48f1cf68d2a285a48abb6f07f
-    Reviewed-on: https://code.wireshark.org/review/4584
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I535aba36cc906e8d78cb594900e9a7fdcbd26c83
+    Reviewed-on: https://code.wireshark.org/review/15828
+    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: João Valverde <j@v6e.pt>
 
-commit 5947291
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 9 18:04:16 2014 -0700
+commit d6e9665
+Author: Thibault Gerondal <github@tycale.be>
+Date:   Sat May 28 02:55:04 2016 +0200
 
-    Fix declared types of open routines.
+    IPv6: Add support for Segment Routing (Type 4) Extension Header
     
-    Change-Id: Ifa38dfec31ec5b03f00d6e077902184a9ae2ee0e
-    Reviewed-on: https://code.wireshark.org/review/4583
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 12512
+    Change-Id: I5672ff3b8c4e8afcc82e957933330e0bf9454b08
+    Reviewed-on: https://code.wireshark.org/review/15593
+    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: João Valverde <j@v6e.pt>
 
-commit bea24cf
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Oct 9 16:41:37 2014 -0700
+commit cee3e82
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Jun 11 06:10:17 2016 +0100
 
-    CMake: Bundle our plugins.
+    CMake: Make PROJECT_VERSION_EXTENSION code simpler
     
-    plugins/*/CMakeLists.txt has a lot of repitition. We might want to
-    create a module or include file to simplify things.
+    The intent was to allow all sorts of overrides but, ugly.
     
-    Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852
-    Reviewed-on: https://code.wireshark.org/review/4582
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    I don't think we need $cmake_package_string either, at least with
+    these changes.
+    
+    Follow-up to 7c6e859ccf210a45e1cc0f6da17692845e6b5a23.
+    
+    (And bdec712166ba924a2cdeaaca8ae580c343eaf02c).
+    
+    Change-Id: I808b6bd3a3c64d2a67165344e8fe23e8314c27db
+    Reviewed-on: https://code.wireshark.org/review/15835
+    Reviewed-by: João Valverde <j@v6e.pt>
 
-commit 45e4629
+commit 38d39f2
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Oct 9 16:44:15 2014 -0700
+Date:   Sun Jun 12 12:18:14 2016 -0700
 
-    Use an enum for the open-routine return value, as per Evan Huus's suggestion.
+    Have MemoryCheck() directly incorporate the error message and exit.
     
-    Clean up some things we ran across while making those changes.
+    Manually inline memory_error() in MemoryCheck(), so that static
+    analyzers know that, if MemoryCheck() sees a null pointer, it exists,
+    and the null pointer isn't subsequently used.
     
-    Change-Id: Ic0d8943d36e6e120d7af0a6148fad98015d1e83e
-    Reviewed-on: https://code.wireshark.org/review/4581
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 112c90a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Oct 8 23:58:18 2014 +0200
-
-    Kerberos: fix decryption of DCERPC with Kerberos encryption
+    Use MemoryCheck() instead of the one place where we manually checked for
+    a null pointer and called memory_error().
     
-    Bug: 10538
-    Change-Id: I4e6feaf218da7f977f6c63d8bc204635f387672c
-    Reviewed-on: https://code.wireshark.org/review/4566
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Id6b0328cfd17cb14ec9d1e461420896a31573c71
+    Reviewed-on: https://code.wireshark.org/review/15851
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7690afb
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Oct 9 00:09:50 2014 +0200
+commit 7bbc60c
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jun 12 10:34:16 2016 -0700
 
-    Kerberos: remove debug logs when loading a keytab
+    Add more memory checks, and use MemoryCheck() for some existing checks.
     
-    Bug: 10543
-    Change-Id: I9ea20cd4d046cc072c21fd3f87f6d6be40b08b27
-    Reviewed-on: https://code.wireshark.org/review/4567
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 40e6d76
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Oct 9 22:14:01 2014 +0200
-
-    GTPv2: fix an infinite loop
+    Always check for malloc() and realloc() failing.  Use MemoryCheck() for
+    most of the checks - it's a bit cleaner and makes the error message the
+    same for those checks.
     
-    Bug: 10548
-    Change-Id: I916e15cecf0ec9dc607362b902709567d69243df
-    Reviewed-on: https://code.wireshark.org/review/4578
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I533153c697b37b85adfa0259c1352efece0b0486
+    Reviewed-on: https://code.wireshark.org/review/15849
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e00ac05
+commit aaba30a
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Oct 9 11:37:27 2014 -0700
+Date:   Fri Jun 10 11:16:10 2016 -0700
 
-    CMake: Build an application bundle (Wireshark.app) on OS X.
-    
-    Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on
-    OS X and disabled elsewhere. The bundle is currently bare-bones and only
-    contains the main executables, Info.plist, and application icon.
+    Qt: Draw a border around inactive+selected packet list items.
     
-    Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is
-    set and on Windows.
+    Try to make inactive+selected packet list items more visible by drawing
+    a border around them. Make an exception for Windows 7 and Vista if a
+    theme is active.
     
-    Start updating CPackConfig.txt for OS X packaging.
-    
-    To do:
-    
-      - Add supporting libraries and frameworks.
-    
-      - Make the bundle standalone. I.e. call FIXUP_BUNDLE or
-        replicate the relevant parts of osx-app.sh
-    
-    Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb
-    Reviewed-on: https://code.wireshark.org/review/4577
+    Bug: 12010
+    Change-Id: I974069dda92588b80772f577f319569751ff3347
+    Reviewed-on: https://code.wireshark.org/review/15816
     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 58cc452
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Oct 9 09:09:58 2014 -0400
+commit a5ff5c2
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 12 08:11:17 2016 -0700
 
-    Eliminate proto_tree_add_text from packet-lmp.c
+    [Automatic update for 2016-06-12]
     
-    Also "refactored" a few fields into proto_tree_add_bitmask calls.
-    
-    Change-Id: I3a222b38e1992943d6ee4bd300026bc28c5bbb78
-    Reviewed-on: https://code.wireshark.org/review/4575
-    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 608207f
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Thu Oct 9 11:27:17 2014 -0700
-
-    Add Dissection of MA packets over UDP
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: Ic6e1cbb623f3e84b73ce7e4608f291baadc77bf6
-    Reviewed-on: https://code.wireshark.org/review/4576
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I14deff6b9a13a51d66ebdea361686822583b07c0
+    Reviewed-on: https://code.wireshark.org/review/15843
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 39b2814
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Oct 8 19:45:41 2014 -0400
+commit b882478
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sat Jun 11 14:23:59 2016 +0200
 
-    Eliminate proto_tree_add_text from packet-nbns.c
+    mongo: don't THROW() an exception from a dissector
     
-    Some other cleanup while in the neighborhood.  Not sure the all the proto_tree_add_expert calls are needed after each field (having implicit bounds error thrown should be sufficient), but left them in there.
+    just return the overall length even if the value is not in line with the
+    protocol specification
     
-    Change-Id: I3ca75ec9f51ccbed6b6ca792789daa8e7cebf34a
-    Reviewed-on: https://code.wireshark.org/review/4574
+    Change-Id: Ieeb5d1d265acb6de807a1175f07c7981db4b6c2b
+    Reviewed-on: https://code.wireshark.org/review/15833
+    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: Michael Mann <mmann78@netscape.net>
-
-commit 1c51075
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Wed Oct 8 22:21:34 2014 -0700
-
-    [BACnet][trivial] change strings as per Bug 9640
-    
-    Change-Id: I542b5a96bcff6c779359b80ddce513524852272c
-    Reviewed-on: https://code.wireshark.org/review/4572
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4edda1b
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Oct 8 19:32:55 2014 +0200
+commit be12133
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Jun 11 14:21:17 2016 +0200
 
-    Lua: Improved TreeItem:add documentation.
+    Actually progress through the command data (CID-281394)
     
-    The protofield is optional and can not be replaced with 'nil'
-    as with the other fields for this function.
+    The loop reading through the command data doesn't progress through
+    it, it just reads until the available data (represented by max_length)
+    runs out. It therefore:
+    - doesn't present the commands
+    - doesn't detect a missing final marker bit (CID-281394)
+    This change does make the code progress through the command data,
+    fixing both issues in the process.
     
-    Change-Id: I2b1dd7f290264394b400cea2110b65b657c71456
-    Reviewed-on: https://code.wireshark.org/review/4549
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Change-Id: I61ba8b56b4a153affe9b4f9a574267f981ef0594
+    Reviewed-on: https://code.wireshark.org/review/15825
+    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 e7e2f9c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 8 17:27:08 2014 -0700
+commit 416c8a1
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Fri Apr 29 10:21:44 2016 +0200
 
-    Make the OPEN_INFO_ values members of an enum.
+    debian: Regenerate ASN.1 dissector code during package build
     
-    Change-Id: I93dbd14f81492764bf5854ee40eebcd1e04f3e01
-    Reviewed-on: https://code.wireshark.org/review/4570
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3f7378ae5c048d3f954238bd04c707f039401ea1
+    Reviewed-on: https://code.wireshark.org/review/15161
+    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 3ee8efd
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Oct 8 15:43:58 2014 -0700
+commit 2d095de
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jun 10 00:00:39 2016 -0400
 
-    Be less lazy about disabling a Visual C++ warning.
+    Move Gateway Control Protocol (Context Tracking) into packet-h248.h
     
-    As Graham pointed out, "#pragma warning(disable..." affects the rest
-    of the file. Add a push+pop so that we only operate on the line in
-    question. Ideally we'd be able to use "suppress" but an "#endif"
-    prevents that.
+    The Gateway Control Protocol (Context Tracking) is used by both H248
+    and MEGACO, so the functionality was refactored to epan, but should
+    really be kept in the dissector directory to minimize (and eventually
+    completely remove) the epan directory's dependence on it.
     
-    Change-Id: Ia01d6c245879f1c845dc68c18caea2cbceb273ef
-    Reviewed-on: https://code.wireshark.org/review/4569
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I387b46aecde97234086bfdb7d8c546854fa301cd
+    Reviewed-on: https://code.wireshark.org/review/15798
+    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 d1ec1e8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 8 15:48:37 2014 -0700
+commit 68ef5db
+Author: Michael Vigovsky <upliner@gmail.com>
+Date:   Fri Jun 10 15:17:49 2016 +0300
 
-    Use WTAP_ERR_DECOMPRESS for decompression errors.
-    
-    Distringuish "the compression data has a problem" from "the capture file
-    (not compressed, or after decompression) data has a problem", with
-    WTAP_ERR_DECOMPRESS used for the former (whether it's the gzipping
-    decoded by our gunzip code or the Sniffer compression) and
-    WTAP_ERR_BAD_FILE used for the latter.
+    Add missing scale in TDS type info
     
-    Change-Id: I8e6bff7edb480deba00c52a9e5afff607492e085
-    Reviewed-on: https://code.wireshark.org/review/4568
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I6734fe448e4ee6f20a0d57b1aaae5e7e61f0cb5c
+    Reviewed-on: https://code.wireshark.org/review/15811
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0066776
-Author: Tomasz Moń <desowin@gmail.com>
-Date:   Wed Oct 8 19:45:11 2014 +0200
+commit 5416a34
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Jun 11 19:13:14 2016 -0700
 
-    Fix --extcap-dlts call in extcap_example.py.
+    Handle zero-length addresses in cmp_address().
     
-    There is regular expression that extracts only the number from
-    --extcap-interface argument and only that number (as string) is being
-    passed to extcap_dlts().
+    Don't compare the data if there's none to compare.
     
-    Change-Id: I5159f9405a766c1edff792213b2aef72b9a29ba4
-    Reviewed-on: https://code.wireshark.org/review/4550
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ib0e3541e448127869d19afddfc71bb441dba5874
+    Reviewed-on: https://code.wireshark.org/review/15840
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c83169f
+commit 24f02da
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 8 14:12:54 2014 -0700
+Date:   Sat Jun 11 18:59:25 2016 -0700
 
-    Only set err_info on an error, and use g_strdup_printf().
+    Add checks to address setting routines.
     
-    If the goal is to look like a libwiretap routine, we only need to set
-    *err_info on an error, and we should set it to a g_mallocated string (or
-    NULL).
+    Fail if:
     
-    Handle WTAP_ERR_UNSUPPORTED while we're at it - we never return it, but
-    we never return WTAP_ERR_UNSUPPORTED_ENCAP, either, but we handle it.
+       1) you have an AT_NONE address with data;
     
-    Change-Id: I9d93c43278d22f0fa77ec1cf7f29b476c8dd0dd0
-    Reviewed-on: https://code.wireshark.org/review/4565
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit dbf8024
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 8 14:04:45 2014 -0700
-
-    No need to set *err_info if there's no error.
+       2) you have a non-AT_NONE address with a zero length and a
+          non-null data pointer, or with a non-zero length and a null
+          data pointer.
     
-    Change-Id: I98ae9ec50e079d48b6247bb208528b7c5ad16027
-    Reviewed-on: https://code.wireshark.org/review/4564
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a307ed6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 8 13:54:13 2014 -0700
-
-    Robopatch and remove #MISSING comments.
+    When comparing addresses for equality, just make sure the types are the
+    same, the lengths are the same and, if the lengths are non-zero, the
+    data is the same; don't treat AT_NONE specially - the "lengths are
+    non-zero" check will make sure we do the right thing.
     
-    Change-Id: I611882a8b268046665488381be64aca89cdf3194
-    Reviewed-on: https://code.wireshark.org/review/4563
+    Make sure when we create an AT_NONE address it has a zero length and
+    null data pointer.
+    
+    Change-Id: I5c452ef0d140c2d9aef3004f1cfd124a95b78fb2
+    Reviewed-on: https://code.wireshark.org/review/15839
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 21e844b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 8 13:50:17 2014 -0700
+commit 4cab051
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Jun 11 14:49:59 2016 +0200
 
-    Use WTAP_ERR_BAD_FILE for malformed compressed data in DOS Sniffer files.
+    Store the tree item to add to later (CID-1159152)
     
-    Get rid of WTAP_ERR_UNC_TRUNCATED and WTAP_ERR_UNC_BAD_OFFSET, and lump
-    them under WTAP_ERR_BAD_FILE, with an error string; they're just another
-    form of "this file isn't a valid file of the type in question".
+    The tree item needed to test and append to isn't being stored,
+    so the items are never amended with notes, resulting in dead code.
     
-    Change-Id: I0e9ac7c2ee66c8d789234a301c1dc2173aef1312
-    Reviewed-on: https://code.wireshark.org/review/4562
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib1a9b7994ad12a9a9013d1bc1e1e4c165f34f20f
+    Reviewed-on: https://code.wireshark.org/review/15826
+    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 c303a2e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Oct 8 13:44:46 2014 -0700
+commit 21007dc
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jun 9 11:02:33 2016 -0400
 
-    Make sure we don't dereference a null pointer.
+    H225: Replace globals that track packet data with p_add_proto_data/p_get_proto_data.
     
-    Change-Id: I033c60cdc5b78f4db31903277c659661e0dc5123
-    Reviewed-on: https://code.wireshark.org/review/4561
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I0380151fb0f45063b81bc55dd5b8dc4add99ad30
+    Reviewed-on: https://code.wireshark.org/review/15794
+    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 ea5587a
+commit e659faa
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 8 13:24:57 2014 -0700
+Date:   Sat Jun 11 13:28:29 2016 -0700
 
-    Fix a comment.
+    Line up comments.
     
-    Change-Id: I0ebaa1b99bc9c7e51be10f3f8825280782f26190
-    Reviewed-on: https://code.wireshark.org/review/4560
+    Change-Id: Ifda0499e00dfa38c936f7e054ab4d5b3a0fd627f
+    Reviewed-on: https://code.wireshark.org/review/15830
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 23286b7
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Oct 8 21:50:15 2014 +0200
+commit de028e8
+Author: Vincent Helfre <vincenthelfre@googlemail.com>
+Date:   Thu Jun 9 17:47:20 2016 +0200
 
-    ANSI 683: Removed unused assignments.
+    GSM RLC/MAC: improve dissection of Packet Resource Request message
     
-    Change-Id: I952ce5329f69fa947e39b020a70a06f2bbf8a014
-    Reviewed-on: https://code.wireshark.org/review/4558
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I8513ef550e81a97e1a8ac1c1f365355118d5ebae
+    Reviewed-on: https://code.wireshark.org/review/15827
+    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 97e462d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 8 13:09:46 2014 -0700
+commit e00d73a
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun May 29 16:35:22 2016 +0200
 
-    "long" does not necessary mean "64-bit".  Use G_GINT64_MODIFIER.
+    dcerpc-browser: don't THROW() an exception from a dissector
     
-    Change-Id: I2521bf368ea30ac691af50c760a63b81efedeeae
-    Reviewed-on: https://code.wireshark.org/review/4559
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c55d697
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Oct 7 10:11:45 2014 -0700
-
-    Try to speed up ping-dependent capture tests.
+    the condition for THROW() will never be true
     
-    Ping four times a second for ~60 seconds. Save the subprocess PID so that
-    we can kill it when we're done with each test instead of waiting for it
-    to finish.
+    there's no way to decrement offset below its initial value
+    the dissect_browser_TYPE_x_data() functions read a uint32 and increment
+    offset by 4 + the uint32 value that was read
     
-    Change-Id: I64f889c700e8a6fa1bc1c3916ef045341ef59cc6
-    Reviewed-on: https://code.wireshark.org/review/4557
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ia5a63e714ffa0add601960d858452152e4d9b10b
+    Reviewed-on: https://code.wireshark.org/review/15627
+    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>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 70ba2f8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Oct 8 11:44:03 2014 -0700
+commit c755c88
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Fri Jun 3 20:11:56 2016 +0200
 
-    Set err_info to null for errors that don't have an informaton string.
+    iso14443: dissect attrib's p3 byte
     
-    Change-Id: Ibbcf3496ebfb20c53b953db84b2ddb69083dcb86
-    Reviewed-on: https://code.wireshark.org/review/4556
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iec3595a9ee0f7037af1f949804f1022f315d1edc
+    Reviewed-on: https://code.wireshark.org/review/15824
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 5c0a3be
-Author: Tomasz Moń <desowin@gmail.com>
-Date:   Wed Oct 8 19:35:25 2014 +0200
+commit 5932044
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Jun 10 19:30:36 2016 +0100
 
-    Remove redundant and erroneous debug log message.
+    ftype-protocol: Fix [-Wcast-qual] warnings
     
-    Change-Id: I91d6131b3b4b7ef670f0d188ebd6da3947c49bdc
-    Reviewed-on: https://code.wireshark.org/review/4548
+    Change-Id: Ia8a02d8dc66aead486c8ae3f0bdf4cd82717ed20
+    Reviewed-on: https://code.wireshark.org/review/15817
+    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 fb6e043
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Oct 8 19:57:49 2014 +0200
+commit b8779f9
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jun 10 15:05:23 2016 -0700
 
-    DCERPC (DRSUAPI) Fix typo found on idl file
+    More comment clarification.
     
-    Change-Id: I79ad05122ae48de671c9c919bab6b3e8d94a50de
-    Reviewed-on: https://code.wireshark.org/review/4554
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 7207d2f
-Author: Johan Wahl <johan.wahl@ericsson.com>
-Date:   Wed Oct 8 10:55:57 2014 +0200
-
-    SIP Enhance dissecion of PATH
+    That's not "the biggest record we're willing to write", it's "the
+    biggest record the pcapng format supports, as the record length is a
+    16-bit field".
     
-    Change-Id: I0508a886fb664f36b51464a9dfd6936092e197f8
-    Reviewed-on: https://code.wireshark.org/review/4543
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Icbd5e0cc4ed8e2a3a0d474245a9b9ed2c999d520
+    Reviewed-on: https://code.wireshark.org/review/15818
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 09de28933f9a17d4472206e1ac4b7c92001e44f5)
+    Reviewed-on: https://code.wireshark.org/review/15820
 
-commit 57a7aca
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Tue Oct 7 21:18:18 2014 -0700
+commit 8626cef
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jun 10 11:02:07 2016 -0700
 
-    elmi: Fix bug in message type coding
+    Make the IPv4 NRB code's comments match the IPv6 NRB code's comments.
     
-    Bug: 10531
-    Change-Id: Ide6237afb71c79243347dedd1c744b3e97ff612e
-    Reviewed-on: https://code.wireshark.org/review/4542
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 439c0b8
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Wed Oct 8 03:42:55 2014 -0700
-
-    [tools] Add missing GPL license to generate-bacnet-vendors.py
+    The IPv6 comments gave more details.
     
-    Change-Id: I15336a5f759fea6b1fb4f6c5a05807d797a7f5aa
-    Reviewed-on: https://code.wireshark.org/review/4544
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I4e4d865feadbabfd625cdf2b2b162b99c4f23efa
+    Reviewed-on: https://code.wireshark.org/review/15815
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 6c41f50
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Oct 7 17:43:18 2014 -0400
+commit 00d36c7
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jan 14 11:15:46 2016 -0800
 
-    Qt capture interfaces dialogue string tweaks
+    Qt: Expert info grouping.
     
-    To clarify that capturing always uses a file, the checkbox only controls whether
-    that file is temporary or persisted.
-    
-    Change-Id: I939e1fdf488f53245166612193c60a366f63a18b
-    Reviewed-on: https://code.wireshark.org/review/4537
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit ceda0f9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Oct 5 19:34:46 2014 +0200
-
-    Remove #pragma warning (MSVC) for PIDL generate dissector
+    Add the ability to group expert info items by summary and enable it by
+    default. This more closely matches the GTK+ UI behavior.
     
-    Change-Id: I1e4c7944a2cd877f5c707703dcff44fe9f955a2c
-    Reviewed-on: https://code.wireshark.org/review/4479
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit e881036
-Author: Tomasz Moń <desowin@gmail.com>
-Date:   Tue Oct 7 23:14:21 2014 +0200
-
-    Fix extcap boolean flag handling.
+    Show matching item counts while we're here.
     
-    Change-Id: I4c6b32805d4138ef0912fbf1b129a5e97776ab9c
-    Reviewed-on: https://code.wireshark.org/review/4535
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 41b8c6b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 7 08:40:19 2014 +0200
+    Bug: 12218
+    Change-Id: Ic02267da8435fb70015de8dd15e0ac46faabbee9
+    Reviewed-on: https://code.wireshark.org/review/15796
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-    DCERPC DFS: Remove from Dirty PIDL list
-    
-    Change-Id: I87bd196d1c4ba14d9af6d174754b37d2b4d772c8
-    Reviewed-on: https://code.wireshark.org/review/4527
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+commit 237f2d4
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Tue May 19 11:55:01 2015 +0200
+
+    Qt/Bluetooth: Add Device dialog
+    
+    Device dialog appears when user double clicks on device in
+    Devices dialog (Bluetooth->Devices). It provides
+    summary of device, like BD_ADDR, name, timeouts, etc.
+    Base on information from HCI layer, so this feature is more interesting
+    for local devices (capturing on its side). Each field has changes counter,
+    what mean that value at specified field changes in time, for example:
+    user change device name 3 times. Please note that initial change
+    is not counted. It means that you can see fielkd without any value
+    then change occur and counter is not increased. It will be increased
+    next time. Reason for that is in most cases field value is unknown
+    at start.
+    
+    Change-Id: Ife0a6bd454eac00a28f8eb2906e1b395695b0307
+    Reviewed-on: https://code.wireshark.org/review/15793
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit f31836d
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Tue Oct 7 00:53:18 2014 -0700
+commit 2df337d
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jun 10 08:42:41 2016 +0200
 
-    [bacnet] update vendors list, fix whitespace issues, all generated via script
+    Bluetooth HCI (Qt): Remove Q_UNUSED
     
-    Change-Id: Ieb4b169dfcf5e89b7b2a2cb90b6572a3d973d744
-    Reviewed-on: https://code.wireshark.org/review/4519
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 65321df
-Author: Lorand Jakab <ljakab@ac.upc.edu>
-Date:   Mon Sep 22 11:10:45 2014 -0700
-
-    Add support for LISP over TCP control messages
+    See g21754f43e for detail
     
-    draft-kouvelas-lisp-rloc-membership-00 specifies 9 new LISP control
-    message types using TCP transport instead of UDP (which is used by all
-    existing messages).  These new messages are related to each other and
-    are used to exchange RLOC membership information between a tunnel router
-    and a map server.
+    There is always some other Q_UNUSED but include on #if/#endif...
     
-    Bug: 10494
-    Change-Id: I129f0d6344693092bd5d0efb06b025e89fd26bf2
-    Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
-    Reviewed-on: https://code.wireshark.org/review/4253
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ib2283660c91787acbf6392841faa3db6aed39438
+    Reviewed-on: https://code.wireshark.org/review/15803
+    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: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit d3e3cb2
+commit e53a1ad
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 7 16:22:53 2014 -0700
+Date:   Fri Jun 10 00:40:18 2016 -0700
 
-    Provide an error message for WTAP_ERR_CANT_WRITE.
+    Always count packets per encapsulation.
     
-    Change-Id: Iffc762ba60ac523148310ea2a432d4953bc64a94
-    Reviewed-on: https://code.wireshark.org/review/4541
+    Currently, for pcapng files, if all of the IDBs we've seen *so far* are
+    the same, we report it as the file's encapsulation type; however, we may
+    see IDBs of a different type in the future, so don't check for
+    per-packet encapsulation before counting packets of the encapsulation
+    type.
+    
+    Change-Id: I617ddcf2963aa16e7ba58855b3e5bf326ab7dc32
+    Reviewed-on: https://code.wireshark.org/review/15808
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a566f61
+commit 1438d28
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 7 16:18:47 2014 -0700
+Date:   Fri Jun 10 00:31:36 2016 -0700
 
-    No need for WTAP_ERR_CANT_READ.
-    
-    Unlike the standard I/O routines, the code we introduced that supports
-    fast random seeking on gzipped files will always supply some specific
-    error code for read errors, so we don't need WTAP_ERR_CANT_READ.
+    Set the size of the packet counts array when we create it.
     
-    Add WTAP_ERR_CANT_WRITE for writing, as we're still using the standard
-    I/O routines for that.  Set errno to WTAP_ERR_CANT_WRITE before calling
-    fwrite() in wtap_dump_file_write(), so that it's used if fwrite() fails
-    without setting errno.
+    g_array_sized_new() sets the amount of *space allocated for* the array,
+    but doesn't actually set its *length*.
     
-    Change-Id: I6bf066a6838284a532737aa65fd0c9bb3639ad63
-    Reviewed-on: https://code.wireshark.org/review/4540
+    Change-Id: Ia7deab34c758c88910dfb0e246a6903301e68029
+    Reviewed-on: https://code.wireshark.org/review/15806
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5e0e4fa
+commit 3ba7798
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 7 15:48:29 2014 -0700
+Date:   Thu Jun 9 23:59:34 2016 -0700
 
-    Replace another file_read() call with wtap_read_bytes().
+    Set cf_info.num_interfaces before using it.
     
-    Change-Id: I7b5e82c3a2fc4b4c16bf466508546558c584c150
-    Reviewed-on: https://code.wireshark.org/review/4539
+    Change-Id: I6ba5932f339ea6296dd91a6800721b11bcd4956a
+    Reviewed-on: https://code.wireshark.org/review/15804
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit d6f217f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 7 15:07:25 2014 -0700
+commit 777cddd
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jun 10 07:04:44 2016 +0200
 
-    Close some memory leaks for bad K12 RF5 files.
+    LANforge: fix wrong offset for magic detection
     
-    Change-Id: Ic4272a5637463fdb4d23f80d81341a0e6ea33de3
-    Reviewed-on: https://code.wireshark.org/review/4538
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Issue reported by Brent Lovelace https://www.wireshark.org/lists/wireshark-dev/201606/msg00034.html
+    
+    Change-Id: If296f01747316ddbe28e88d4d11d9df90d68bc5d
+    Reviewed-on: https://code.wireshark.org/review/15800
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@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 515f09f
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Tue Oct 7 00:55:33 2014 -0700
+commit a4afda6
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Jun 9 23:51:04 2016 +0200
 
-    [tools] add script to automatically generate bacnet vendors
+    Remove superfluous length check (CID-1158783)
     
-    Requires beautifulsoup4 for parsing, translitcodec for converting accents/diaeresis etc to regular text
+    When entering a loop with check for minimum length, don't stick
+    to the pattern of checking length first thing.
     
-    Change-Id: I4d400f15916ee3ab07fa14b09fca12beac2010f3
-    Reviewed-on: https://code.wireshark.org/review/4518
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I28c414108efa5499dbacd8527b2c3e654e49e808
+    Reviewed-on: https://code.wireshark.org/review/15795
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit cf4fc57
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Oct 7 17:24:17 2014 -0400
+commit 4233e9a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jun 9 20:32:35 2016 -0700
 
-    ANSI683: Fix mobile country code base
+    Don't assume all IDBs are available aftre we open the file.
     
-    Fixes error:
-    Field 'Mobile country code (MCC_T)' (ansi_683.mcc_t) is an integral value
-    (FT_UINT16) but is being displayed as BASE_NONE
+    IDBs can occur anywhere in the file, so if we see an interface ID bigger
+    than the number of IDBs we've see, re-fetch the interface information,
+    update the IDB count, and grow the packet count array as necessary.
     
-    Change-Id: I2d87075b0c982bcaf0e855653d49eb891e83b70d
-    Reviewed-on: https://code.wireshark.org/review/4536
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Get the information strings for interfaces after reading the entire
+    file; we don't need them until then.
+    
+    Change-Id: Ib6096e481e321de485710d14eadf7b5232bf0be7
+    Reviewed-on: https://code.wireshark.org/review/15797
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 43dffab
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Oct 7 08:40:03 2014 +0200
+commit f928a5f
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Thu Jun 9 08:04:04 2016 +0200
 
-    GSM (bssmap): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Make the determination if file is relative. (CID-1348040)
     
-    Change-Id: I9fadd0edc26e5525cfdd15fc62062f19fef16d10
-    Reviewed-on: https://code.wireshark.org/review/4526
+    The code tries to show a file handle when the file is relative
+    to it, but doesn't actually make that determination. Extract the
+    relevant bit and use that to flag the relative file.
+    
+    Change-Id: I7259c8843dc388b9dda96a73399a6da5575d3f5e
+    Reviewed-on: https://code.wireshark.org/review/15789
+    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 a9e6c2c
+commit 0ccde30
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Oct 7 07:51:52 2014 -0400
+Date:   Wed Jun 8 23:28:07 2016 -0400
 
-    Overhaul the filterability of packet-ansi_683.c
-    
-    It's (ab)use of proto_tree_add_text was "hidden" behind a single FT_NONE hf item, that effectively had the same behavior of proto_tree_add_text, but wouldn't show up in checkAPIs.pl.  Replaced the (over 200+) proto_tree_add_none_format calls with proto_tree_add_text and then ran convert_proto_tree_add_text.pl on the dissector.  That started the cleanup, and I did more while in the neighborhood.
+    MGCP: Replace globals that track packet data with passing data to functions.
     
-    Change-Id: I89e09cf23e8998bcc9197f9a4043e1fc2850fc8c
-    Reviewed-on: https://code.wireshark.org/review/4521
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I9595abf882adb821fd3c08532afba1b7e20412fe
+    Reviewed-on: https://code.wireshark.org/review/15788
+    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 1280015
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Mon Oct 6 22:34:02 2014 -0700
+commit 9fd37c0
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Tue May 3 22:50:26 2016 +0200
 
-    [iSCSI] Fix incorrect heuristic.
+    Qt/Bluetooth: Set missing HCI Summary Occurence fields
     
-    The only valid check for Expected Data Transfer Length is :
-    R and W  MUST  NOT both be 0 when the Expected Data Transfer Length and/or
-    Bidirectional Read Expected Data Transfer Length are not 0
+    Set they to zeros at startup like other fields.
     
-    Bug #10469
-    Change-Id: I5503a5ad524c4e237b143696fc8eda895bcb9172
-    Reviewed-on: https://code.wireshark.org/review/4514
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I820e7a0ce8fad5726448cb83f85235ecf578d77d
+    Reviewed-on: https://code.wireshark.org/review/15792
+    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>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 6831652
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Tue Oct 7 18:18:32 2014 +0200
+commit 508e0f4
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Jun 8 17:18:45 2016 +0200
 
-    asn2wrs: Added support for #.SYNTAX_NEW
+    Bluetooth: ATT: Fix Object List Control Point response
     
-    This allows syntaxes to be registered as "new" dissectors.
+    Fix CID 1355646.
     
-    Change-Id: Ibb76688d9d3cbf47222610956aa627fa374bcbce
-    Reviewed-on: https://code.wireshark.org/review/4524
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Bug: 12496
+    
+    Change-Id: Ia6c95c8f31a19b5e8fc21182658147ed4208d635
+    Reviewed-on: https://code.wireshark.org/review/15790
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
 
-commit d89cc1c
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Oct 6 15:17:46 2014 +0200
+commit 2a0d61e
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sun May 29 11:10:24 2016 +0200
 
-    ASN1: Added support for using #.REGISTER_NEW
+    Logcat: Unicodize texts
     
-    This will register BER PDU-dissectors as "new".
-    Return number of bytes dissected from dissector_try_* functions.
-    Return number of bytes dissected in DissectorTable:try()
+    Text over Logcat is in real in Unicode.
+    ASCII does not display it correctly.
     
-    This will make it possible to get dissected length when using
-    dissector_try_*() and dissected ASN.1 length in Lua when using
-    DissectorTable:try() (as we already have for Dissector:call).
+    Change-Id: I998dad1ee50c4b00b874a1f197f6e465fadd3e38
+    Reviewed-on: https://code.wireshark.org/review/15791
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+
+commit d907fc2
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jun 8 22:26:02 2016 +0200
+
+    Update Developer's Guide to reflect dissector_t signature change
     
-    Change-Id: Iee17a68dc214fa0fb50b25fc927026ad7c1cbce4
-    Reviewed-on: https://code.wireshark.org/review/4531
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Change-Id: Ia793d94c7e79e49d1f27ad8adbdbafdb30131abe
+    Reviewed-on: https://code.wireshark.org/review/15783
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 47a1735
-Author: Michał Orynicz <michal.orynicz@tieto.com>
-Date:   Thu Oct 2 10:37:53 2014 +0200
+commit 078ab45
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jun 8 18:12:48 2016 -0700
 
-    Add proper decoding for type field in OBEX headers
+    Use the locale's decimal separator for times as seconds and fraction.
     
-    Change type field type from byte sequence to string.
+    We use it when printing *other* seconds-and-fraction values, as we're
+    just using %f, so we should use it consistently.  If you don't want
+    commas as decimal separators, you presumably don't want them anywhere;
+    if you want to standardize the way numbers are shown, set the locale to
+    the C locale.
     
-    Change-Id: I3e2ac6fbb5ce7187ba1183d63236e9a2bcd824ee
-    Reviewed-on: https://code.wireshark.org/review/4417
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    This addresses one of the two problems mentioned in bug 12500; there may
+    be other places in the Wireshark suite where we should use the locale's
+    decimal separator in times.
+    
+    Change-Id: I41f1c44d12ebf0f46ff678c977a955d09831b0cf
+    Ping-Bug: 12500
+    Reviewed-on: https://code.wireshark.org/review/15787
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 71550ba
+commit 6ec6beb
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Oct 7 12:49:14 2014 -0700
+Date:   Wed Jun 8 16:26:18 2016 -0700
 
-    Make the code a bit more like the pre-new-APIs code.
+    ieee80211_htrate() isn't exported.
     
-    Change-Id: I40282d8825936d24480c9b77e2e7d9374b1de6b5
-    Reviewed-on: https://code.wireshark.org/review/4534
+    Change-Id: I8a7a4727b473820d46ee543875f9fb57c5d79928
+    Reviewed-on: https://code.wireshark.org/review/15786
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit bdec712
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 8 14:55:06 2016 -0700
+
+    2.1.0 → 2.1.1.
+    
+    Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5
+    Reviewed-on: https://code.wireshark.org/review/15785
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>