Fix compilation of extcap programs with NMake
[metze/wireshark/wip.git] / ChangeLog
index ddf15c42631f0aff90220babe30578d0932dfbfc..b350578d4e66026a45a7bc794b9970bf6de47b5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
-commit 9076bf3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Mar 4 08:54:23 2015 +0100
+commit af6365a
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 30 23:18:34 2015 +0100
 
-    Qt: Display only filename on status bar and display full path and size on tooltip
+    Allow "Decode As" for IPv6 over UDP
     
-    Ping-Bug: 10949
-    Change-Id: Ic735afdb7994a4c10b527217327831138362ffc9
-    Reviewed-on: https://code.wireshark.org/review/7538
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ib28206e9573f1dd624be1d3c265fef405f65b19a
+    Reviewed-on: https://code.wireshark.org/review/10351
+    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 cdab442
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Mar 5 17:44:33 2015 +0100
+commit d512710
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Sep 2 13:40:46 2015 +0200
 
-    Fix makedist (Add new packet-bgp.h)
+    idl2wrs: fix clang analyzer Warning complains.
     
-    Change-Id: I0dbe43d5faa241fed5eaa6459e384761c11851a8
-    Reviewed-on: https://code.wireshark.org/review/7546
+    890:9: warning: Access to field 'str' results in a dereference of a null pointer (loaded from variable 'token_list')
+    3132:4: warning: Value stored to 'str' is never read
+    3155:4: warning: Value stored to 'str' is never read
+    3166:4: warning: Value stored to 'str' is never read
+    3183:4: warning: Value stored to 'str' is never read
+    3192:4: warning: Value stored to 'str' is never read
+    3203:4: warning: Value stored to 'str' is never read
+    3220:4: warning: Value stored to 'str' is never read
+    
+    
+    Change-Id: If1a1acfc331e0648f95f6d6defe6533b6927ccaa
+    Reviewed-on: https://code.wireshark.org/review/10357
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit f2b35a1
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Feb 23 17:56:14 2015 -0800
+commit 5518ae0
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Sep 2 12:43:23 2015 +0200
+
+    PER: followup of g59453fb
+    
+    Change-Id: I45c02a249444e5f17d99eeb0ca8dea6f7a012262
+    Reviewed-on: https://code.wireshark.org/review/10356
+    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 e1dee7c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Sep 2 12:27:31 2015 +0200
 
-    Qt: Add extra related packet indicator types.
+    dcerpc: fixed distcheck.
     
-    Add the ability to set frame number types: none, request, or response.
-    Use the types to draw different related packet indicators in the packet
-    list.
+    Change-Id: Ide0b95278786d45d9c41fb0fe3214dce0880b830
+    Reviewed-on: https://code.wireshark.org/review/10355
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 5d8363e
+Author: Tom Haynes <loghyr@primarydata.com>
+Date:   Tue Sep 1 14:07:30 2015 -0700
+
+    nfs: Fix order of octets in IPv4 address
     
-    Track the conversation in PacketListRecord. Use it to draw dashed lines
-    for unrelated frames.
+    Before:
     
-    Set frame number types for DNS and ICMP.
+    skull:bugs loghyr$ ~/ipv4/wireshark/tshark -r 2-layoutstats-in-1-compound.pcap -Y nfs -V | grep -i ipv4
+                    [IPv4 address 113.12.31.172, protocol=tcp, port=2049]
     
-    Instead of drawing a transparent QImage, alpha blend our foreground
-    color and draw directly in our painter. Blend more toward the foreground
-    color.
+    After:
     
-    Add FRAMENUM_TYPE to checkAPIs.
+    skull:bugs loghyr$ ~/ipv4/wireshark/tshark -r 2-layoutstats-in-1-compound.pcap -Y nfs -V | grep -i ipv4
+                    [IPv4 address 172.31.12.113, protocol=tcp, port=2049]
     
-    Change-Id: I2495945bb436413e05d6ec697184a0b4fd5ad214
-    Reviewed-on: https://code.wireshark.org/review/7436
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Bug: 11496
+    Change-Id: Ia6097ae76411f6ff9de1f53191c8fc767856e2d1
+    Signed-off-by: Tom Haynes <loghyr@primarydata.com>
+    Reviewed-on: https://code.wireshark.org/review/10347
+    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 a065fef
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Mar 4 12:45:30 2015 +0100
+commit 920e056
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Sep 2 07:48:34 2015 +0200
 
-    icmp: more precise decoding for destination unreachable.
+    idl2wrs: Make Mac OSX buildbot happy
     
-    Change-Id: Ie3b5ea8d6965dd39d8d7ad7c14026896fc4f973c
-    Reviewed-on: https://code.wireshark.org/review/7518
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I5f9c860bec0f8d323d9f3cd7cf55e348654c8b8b
+    Reviewed-on: https://code.wireshark.org/review/10354
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit ec4e7e0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 26 10:46:53 2015 +0100
+commit 8b6fe35
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Sep 2 01:33:22 2015 +0100
 
-    ICMP: Add ICMP Original Datagram Length generated field
+    IPv4: Remove extraneous colon from format string
     
-    Change-Id: Ib268512b56e90f09aad42a7b7a42573a119d5b6f
-    Ping-Bug: 10991
-    Reviewed-on: https://code.wireshark.org/review/7406
+    Change-Id: If52f8086ec971cc43947ece3d8e062da8378fa95
+    Reviewed-on: https://code.wireshark.org/review/10352
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit c4cab87
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Tue Feb 24 01:52:38 2015 -0800
+commit 59453fb
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Sep 1 22:14:47 2015 -0400
 
-    [ICMP] icmp_original_dgram_length is being used incorrectly
+    Eliminate proto_tree_add_text from packet-per.c
     
-    icmp_original_dgram_length is of no use, we need to always account for
-    icmp_original_dgram_length + ip header, where icmp_original_dgram_length
-    is available
+    Change-Id: I67f572129821fb00e4478a30bfd4a52287b8b1a1
+    Reviewed-on: https://code.wireshark.org/review/10350
+    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 c41a833
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Sep 1 20:18:15 2015 -0400
+
+    Eliminate proto_tree_add_text from some dissectors.
     
-    Bug: 10991
-    Change-Id: Ibd0ce538eaf1a7851e4f3e928bad29310ebbcc81
-    Reviewed-on: https://code.wireshark.org/review/7345
+    Change-Id: If617016f588bbf940f37699e27559dc5c59cf508
+    Reviewed-on: https://code.wireshark.org/review/10349
     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 b679295
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Tue Feb 24 00:55:33 2015 -0800
+commit 630f48f
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Sep 1 13:28:56 2015 -0400
 
-    [ICMP] Don't use icmp_original_dgram_length for redirect packet
+    Eliminate proto_tree_add_text from packet-rsvp.c
     
-    icmp_original_dgram_length was being incorrectly used to clamp tvb size for
-    ICMP redirect packet. This is a bogus value, use ip header len + 64 bits
-    instead
-    
-    Bug: 10992
-    Change-Id: Iebd70d72df34185446a239280bb19c0268977490
-    Reviewed-on: https://code.wireshark.org/review/7340
+    Change-Id: I95edc1b40c07a4addf194df6a2056e7b61193e5a
+    Reviewed-on: https://code.wireshark.org/review/10348
+    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 23c6a0f
-Author: Ebben Aries <exa@fb.com>
-Date:   Wed Mar 4 19:13:43 2015 -0800
+commit 87f2bd4
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Fri Aug 14 12:02:38 2015 +0200
 
-    [bmp] Support for decoding of BGP Peer Distinguisher
+    idl2wrs: some code cleanups.
     
-    re-utilize decode_bgp_rd() logic from packet-bgp
+    Code cleanups include:
+    - sanity checks for malloc()
+    - change forbidden APIs into g_* versions
+    - minor indentation fixes
+    - add modeline
+    - add compilation for cmake and autotools
     
-    Change-Id: I588a58e0b2f7da5d3c9b86b28abb9c5b29e0dc8f
-    Reviewed-on: https://code.wireshark.org/review/7537
+    Bug: 11052
+    Change-Id: I825f04d9703448f9165d188be2bdd185fce5ff5d
+    Reviewed-on: https://code.wireshark.org/review/10030
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 3948d82
+commit aa1f556
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Mar 3 11:20:56 2015 +0100
+Date:   Mon Aug 31 13:59:28 2015 +0200
 
-    TX: Update translations (Manual sync 2015-03-05)
+    MSDP: fix will never be executed [-Wunreachable-code]
     
-    Change-Id: I7469fbfa799dae5857c6f0df710438f28d77f43a
-    Reviewed-on: https://code.wireshark.org/review/7505
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
+    Move tvbuff declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020
+    
+    Found by Clang 3.7
+    
+    Change-Id: I299d2413dc4effc5e6e34c289152b8f401f19342
+    Reviewed-on: https://code.wireshark.org/review/10326
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit fe578d6
+commit 998dcc2
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 22 20:13:00 2015 +0100
+Date:   Tue Sep 1 19:50:52 2015 +0200
 
-    Readme.qt: Add information about Transifex !
+    ANSI: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-    Change-Id: I22780721dcc32caee0eae782142e7dad31e0ed07
-    Reviewed-on: https://code.wireshark.org/review/7313
+    Change-Id: I981336271a8f6b41fe777f732069639df494c5d2
+    Reviewed-on: https://code.wireshark.org/review/10346
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 120ee7f
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Mar 5 11:05:07 2015 +0100
+commit b7764fc
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 31 14:01:46 2015 +0200
 
-    Logcat: Fix typo
+    UMTS (mac): fix will never be executed [-Wunreachable-code]
     
-    Fix funny "...replace all new characters by spaces" to
-    "replace all new line characters by spaces"
     
-    Change-Id: I8322ccd9f01220d300a0ba2982b2a61252b51242
-    Reviewed-on: https://code.wireshark.org/review/7540
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 9848b22
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Mar 3 14:39:00 2015 +0100
-
-    rtps: added magic
+    Move tvbuff_t declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020
     
-    Change-Id: I52861b6893abf36b304ea58a12c7987e0f7bc5ba
-    Reviewed-on: https://code.wireshark.org/review/7512
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    
+    Found by Clang 3.7
+    
+    Change-Id: Id26fd62273d6838774db161a8b3f6c7db94a2de1
+    Reviewed-on: https://code.wireshark.org/review/10328
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit aa9497b
+commit c8f8784
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Mar 4 14:31:55 2015 +0100
+Date:   Tue Sep 1 19:39:44 2015 +0200
 
-    USB: add support for alternate setting selection
+    ANSI A: fix dissection of numerous fields broken in g7298a31
     
-    With this, the traffic of a device implementing both NCM and MBIM protocols is properly identified as MBIM when selected by the host
-    
-    Bug: 11018
-    Change-Id: I438ab1917945d9c5ba13329d515abc7e2cd13896
-    Reviewed-on: https://code.wireshark.org/review/7519
+    Change-Id: I09898cfc1aedc4b8067c6d12c94effc51a5ebbc0
+    Reviewed-on: https://code.wireshark.org/review/10345
     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>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 9312c2d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Mar 4 10:27:52 2015 +0100
+commit f0e4c49
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Sep 1 08:24:58 2015 -0700
 
-    bthci-evt: added reserved
+    Update the release notes.
     
-    Change-Id: I66b93fa35d14b4674fcd897dfb2b1f8810642977
-    Reviewed-on: https://code.wireshark.org/review/7517
-    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: I0ab4cc92c24048e4e77b12bcc205d7a15a5ddb74
+    Reviewed-on: https://code.wireshark.org/review/10343
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 51c3d27
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Feb 16 09:30:17 2015 +0100
+commit db2fdfd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Sep 1 07:37:45 2015 -0700
 
-    Add Transifex Configuration
+    Fixup the main window tab order.
     
-    Change-Id: I7fa4593b086d285553eaa4334303dab019446a76
-    Reviewed-on: https://code.wireshark.org/review/7156
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Make sure the packet list is directly after the display filter edit in
+    the main window tab order. When we press enter in the display filter
+    edit, go to the next child in the tab order.
+    
+    Change-Id: If46e178365dbd59feb5985e9f8fa8b55d004d864
+    Reviewed-on: https://code.wireshark.org/review/10342
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit e2bf218
-Author: Luke Mewburn <luke@mewburn.net>
-Date:   Thu Mar 5 09:30:28 2015 +1100
+commit a8682af
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Sep 1 09:53:38 2015 +0200
 
-    Add SCCP SSN 0xf8 for CSS (MAP)
+    [mtp3_summary_dialog] Unused parameter warning with MSVC
+    mtp3_summary_dialog.cpp(315) : warning C4100: 'edt'  : unreferenced formal para
+    mtp3_summary_dialog.cpp(314) : warning C4100: 'pinfo' -
     
-    3GPP TS 23.003 11.9.0 adds subsystem number 0b 1111 1000 (0xF8) for CSS (MAP).
+    Change-Id: Ia21e15ff6348f34bf8ae240f867f0ab2cade606a
+    Reviewed-on: https://code.wireshark.org/review/10340
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 7298a31
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 31 00:20:49 2015 -0400
+
+    Eliminate proto_tree_add_text from ANSI dissectors.
     
-    Change-Id: Iaa2b97f14f4f3c732aeff05419c0300c3a1fb121
-    Reviewed-on: https://code.wireshark.org/review/7533
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I22dccb2f2d71897334e11632f4060ccfbf4794ad
+    Reviewed-on: https://code.wireshark.org/review/10334
+    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 ce3ec6a
+commit 54d2ff1
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Mar 4 18:08:35 2015 -0800
+Date:   Mon Aug 31 16:06:33 2015 -0700
 
-    Qt: Redraw the packet list when a column is resized.
+    Convert the WSP stats to generic stat API.
     
-    ...otherwise the packet list and header columns don't match until
-    the next redraw.
+    Add support for multiple tables to SimpleStatisticsDialog.
     
-    Change-Id: Ice9c17c93badec93839be7c100ca27d8dc493daa
-    Reviewed-on: https://code.wireshark.org/review/7536
+    Change-Id: I843d901db092d2f2856d3d1a16f29f85fb41374b
+    Reviewed-on: https://code.wireshark.org/review/10339
+    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 0a4f93a
+commit 377d215
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Mar 4 08:12:58 2015 -0800
+Date:   Mon Aug 31 12:24:48 2015 -0700
 
-    Qt: Show the full file path in the status bar.
+    Convert the MTP3 stats to new "generic stat API".
     
-    Add file_size_to_qstring and use it to show the file size. Add a
-    "shrinkable" property to LabelStack. Make the info status shrinkable.
-    Elide text so that long file paths don't widen the main window.
+    Convert both the MTP3 statistics and summary. As with the GSM stats this
+    is mostly untested.
     
-    Change-Id: Ieb1caaf7e016384609d41fcabaa63d8f7a293eff
-    Bug: 10949
-    Reviewed-on: https://code.wireshark.org/review/7534
+    Change-Id: I7af8d5f21c8161dc95f7f2c710f32364b6f6a431
+    Reviewed-on: https://code.wireshark.org/review/10338
     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 9df502a
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Mar 4 14:21:28 2015 -0500
+commit e9614ad
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Aug 31 12:19:34 2015 +0200
+
+    Windows: update GeoIP library to 1.6.6
+    
+    Change-Id: I56f58e52fa39fdddd35bcc7ef6d96cfa4042892d
+    Reviewed-on: https://code.wireshark.org/review/10333
+    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 1772416
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Aug 31 22:10:23 2015 +0200
+
+    tshark.pod: fix typo
+    
+    Change-Id: Iba5f12637e0f494805f2d9aab370fb42a32c1cb9
+    Reviewed-on: https://code.wireshark.org/review/10335
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-    Note that the Lua tests don't work in cmake.
+commit 4e236e6
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 29 22:59:00 2015 +0200
+
+    Qt/Lua: Call atclose when TextWindow closes
     
-    (Also point out that we really want cross-compilation to work since people
-    do use it--with autotools.)
+    The close callback was never called because the destructor was never called.
     
-    Change-Id: I0570e0d3e4063c53699233e950687d86aa34b651
-    Reviewed-on: https://code.wireshark.org/review/7528
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Change-Id: I9f6204858bc5d5e48d0aedc90b0e242ab70e161c
+    Reviewed-on: https://code.wireshark.org/review/10321
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 7dd8349
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 12 20:58:52 2015 +0200
 
-commit fb03d49
+    NGHTTP2: Update to 1.3.0
+    
+    Change-Id: Ia12396b3b4a2bb4dcbdce63d06558b6474cd588e
+    Reviewed-on: https://code.wireshark.org/review/10324
+    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 026812c
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Mar 4 12:32:25 2015 -0800
+Date:   Mon Aug 31 08:37:15 2015 -0700
 
-    Add CMake SOVERSIONs to make-version.pl.
+    Redraw timestamps when time display settings change.
+    
+    As with g3bec655, we need to call columnsChanged (which invalidates
+    cached column strings) whenever any settings that generate those strings
+    change. Do so for the time display preferences in the View menu.
     
-    Change-Id: Ifd011288ca23263738ca50842d59a23cc25e7952
-    Reviewed-on: https://code.wireshark.org/review/7532
+    Bug: 11429
+    Change-Id: I71bf1cc0df2800902ecb7b734b8f12ebd85a4de5
+    Reviewed-on: https://code.wireshark.org/review/10331
+    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 afc8589
+commit 75b8457
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Mar 4 12:20:56 2015 -0800
+Date:   Mon Aug 31 09:24:49 2015 -0700
 
-    Add some items to the release notes.
+    Add a Telephony→SCTP submenu.
     
-    Change-Id: I57e8bef7ff9370f4f1d1515d2a82dd65936ba259
-    Reviewed-on: https://code.wireshark.org/review/7531
+    Add the current SCTP actions to the telephony menu to match the GTK+ UI.
+    
+    Change-Id: Ie7471bcbd1a82fe3f203d60f5ea8a72d923f34b9
+    Reviewed-on: https://code.wireshark.org/review/10332
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit e4b8e9f
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Mar 1 18:08:20 2015 +0100
+commit 3bec655
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 16:46:17 2015 -0700
 
-    Logcat: Add preference for oneline info column
+    Redraw the packet list when name resolution changes.
     
-    In fact user may want to disable oneline info column what
-    changes view to multiple lines of log then increases readability.
+    Call columnsChanged (which invalidates cached column strings) when we
+    change our name resolution preferences from the View menu.
     
-    Change-Id: I8aeb1af10abfe8cd56e441d4ebf17cd1526efc89
-    Reviewed-on: https://code.wireshark.org/review/7524
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Remove the last sorted column tracking from gf19a173 while we're here
+    (it didn't work properly).
+    
+    Bug: 11468
+    Change-Id: I7fea58d702b283028235d023f27ab0336d8643a4
+    Reviewed-on: https://code.wireshark.org/review/10301
+    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: Gerald Combs <gerald@wireshark.org>
 
-commit 23b07cb
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Mar 4 16:11:50 2015 +0100
+commit a060183
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Aug 28 22:41:07 2015 -0400
 
-    Set packet encapsulation for HCIDUMP captures
+    Eliminate proto_tree_add_text from packet-rtps.c
     
-    Change-Id: I2a523694a38b6fe296b6dbceb5a00e4202364e99
-    Reviewed-on: https://code.wireshark.org/review/7523
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I353b4fcb3091e731a4b2a68e1932a5abc60c6038
+    Reviewed-on: https://code.wireshark.org/review/10323
+    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 d63df87
+commit 053f53c
 Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Mar 4 16:32:13 2015 +0100
+Date:   Mon Aug 31 06:00:28 2015 +0400
 
-    Print the content of an unknown message type as hex. May help reverse
-    engineering type 11 (dec) messages.
+    Add a hidden item that allows to allow filtering on the station address.
+    This currently only works for data frames. A Fixme is in place for
+    managment frames.
     
-    Change-Id: I41df5f1cd433b04e9067228a2a7487b90f7e5bd1
-    Reviewed-on: https://code.wireshark.org/review/7522
+    Change-Id: I0a72a9a3e40cf8269856fbbcd97b270af422afa2
+    Reviewed-on: https://code.wireshark.org/review/10322
     Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit efd53ad
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 17 19:32:38 2015 +0100
+commit f0b4e8e
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 30 20:31:35 2015 +0200
 
-    Fuzz test : Add -a(SAN) option to disable ulimit when fuzzing
+    dlsw: don't THROW() an exception from a dissector
     
-    from https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer#ulimit_-v
-    The ulimit -v command makes little sense with ASan-ified binaries because ASan consumes 20 terabytes of virtual memory (plus a bit).
-    
-    Change-Id: I8c8c77dd51d5440fb2f9bd95f90873e59a64d409
-    Reviewed-on: https://code.wireshark.org/review/7204
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I897202e7fb2987f608ca4f98aa1a1dc4b7dbd995
+    Reviewed-on: https://code.wireshark.org/review/10320
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 763b6d3
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Mar 2 22:51:38 2015 +0100
+commit 81c6ecd
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 30 20:08:53 2015 +0200
 
-    Added JSMN_STRICT that allow a more precise json parsing.
+    dlsw: remove unnecessary if (tree) checks
     
-    Bug: 10977
-    Change-Id: I725c10d895fdec4530d0761db3ac2659171f2f03
-    Reviewed-on: https://code.wireshark.org/review/7249
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
+    don't create an expert info under if (tree)
+    
+    Change-Id: I2c8f90483c434d708a97b621621ca123fc505edc
+    Reviewed-on: https://code.wireshark.org/review/10319
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit d2720ec
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Mar 3 13:16:52 2015 +0100
+commit 78007fa
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Aug 30 10:16:16 2015 -0400
 
-    Address types: fix no previous prototype for ... [-Wmissing-prototypes]
+    Add debug printing to tshark
     
-    address_types.c:230:14: warning: no previous prototype for 'ipv4_name_res_str' [-Wmissing-prototypes]
-    address_types.c:237:5: warning: no previous prototype for 'ipv4_name_res_len' [-Wmissing-prototypes]
-    address_types.c:386:14: warning: no previous prototype for 'ipv6_name_res_str' [-Wmissing-prototypes]
-    address_types.c:393:5: warning: no previous prototype for 'ipv6_name_res_len' [-Wmissing-prototypes]
-    address_types.c:509:14: warning: no previous prototype for 'fcwwn_name_res_str' [-Wmissing-prototypes]
-    address_types.c:538:5: warning: no previous prototype for 'fcwwn_name_res_len' [-Wmissing-prototypes]
+    Add g_warning functions for tshark debug printing, disabled by default.
     
-    Change-Id: I6cf44b887d9e35fb76bd1840444074c9102b4d2b
-    Reviewed-on: https://code.wireshark.org/review/7508
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: If1720b790b75bd1228afa62efac49dc04bc8addb
+    Reviewed-on: https://code.wireshark.org/review/10314
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit a308aef
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Sat Feb 28 22:20:07 2015 -0500
+commit 00087b4
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 29 22:28:01 2015 +0200
 
-    Look for and use gethostbyname() if we don't have getaddrinfo().  Fail to
-    configure if we can't find any name resolver (autotools only).
+    Add Lua 5.2.3 built with MSVC2015
     
-    This puts back the gethostbyname()/gethostbyname2() code removed in
-    I3348179626e97daaddfbc89e3ed21e39915e3de4 and
-    If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c but as a last-resort option (only
-    if we don't have a better or more modern name resolver).
+    Change-Id: I9b173f5136f858e4f95fb5b0688ef02c08a8d9e4
+    Reviewed-on: https://code.wireshark.org/review/10313
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 99e16ce
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 30 08:10:04 2015 -0700
+
+    [Automatic update for 2015-08-30]
     
-    As suggested/requested by Guy in https://code.wireshark.org/review/#/c/7423/
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I706dbbd65135f47c67d3d8d88a61ad7273914c47
-    Reviewed-on: https://code.wireshark.org/review/7447
-    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>
+    Change-Id: I37400bf1fac15fcd5f2946913b96184b1828f091
+    Reviewed-on: https://code.wireshark.org/review/10317
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 9070656
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Mar 3 13:13:29 2015 +0100
+commit faaa6f2
+Author: Pyeole <pyeole@ncsu.edu>
+Date:   Sat Aug 29 15:36:41 2015 -0400
 
-    SSTP: fix no previous prototype for proto_register_sstp/proto_reg_handoff_sstp [-Wmissing-prototypes]
+    BGP: fixed incorrect NLRI decoding
     
-    Change-Id: I65c6cf59ec9e7eb64a665ea3b253db5200d19f4b
-    Reviewed-on: https://code.wireshark.org/review/7507
+    Bug: 11308
+    Change-Id: I967b9596edad1e3656e139d0ca3a0e3c389d80ea
+    Reviewed-on: https://code.wireshark.org/review/10308
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 2780a30
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Mar 3 14:26:13 2015 +0100
+commit e0a87d8
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 27 18:01:27 2015 +0200
 
-    GSM MAP: do not use a global variable to store OID
+    stanag4607: add check for wtap max size.
     
-    Fixes an ASAN failure reported by Alexis
+    Bug: 11472
+    Change-Id: Ic269046e697ac5e65301caf4ea5586098d030458
+    Reviewed-on: https://code.wireshark.org/review/10279
+    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: Anders Broman <a.broman58@gmail.com>
+
+commit 6c06578
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 29 22:54:54 2015 +0200
+
+    CBOR: fix definition of cbor.type.tag64 field
     
-    Change-Id: I63b07ec4b6eb0698c4abf27f8fb0b1f11a19396d
-    Reviewed-on: https://code.wireshark.org/review/7510
+    Bug: 11486
+    Change-Id: I070c8c397a41c0c8231720c611938d7282c03d19
+    Reviewed-on: https://code.wireshark.org/review/10310
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 8933cbb
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Tue Mar 3 13:30:49 2015 +0000
+commit 7791c6f
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 19:14:13 2015 -0400
 
-    HTTP: Fix small typo in a field description
+    pcapng: drop count is unknown for ISB without isb_if_drop option
     
-    Change-Id: I31a676f5e514b32f891496230eb70cac571730f9
-    Reviewed-on: https://code.wireshark.org/review/7511
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 11489
+    Change-Id: I38bcc2570c2efc461e4eb0edbff8ac2a7371c725
+    Reviewed-on: https://code.wireshark.org/review/10311
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 4e32899
-Author: Petr Gotthard <petr.gotthard@centrum.cz>
-Date:   Mon Feb 9 17:18:15 2015 +0100
+commit 605f33c
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 14:16:52 2015 -0400
 
-    AMQP: Introduce support for AMQP over TLS/SSL (AMQPS).
+    pcapng: handle NRB with options
     
-    Modified dissect_amqp to the new-style dissector.
-    Added amqp.ssl.port to protocol preferences.
-    Registered the AMQP dissector with SSL.
+    If a pcapng Name Resolution Block has options, they should not screw up the
+    pcapng reader and cause it to fail to read the file.
     
-    Fixed an error in dissect_amqp that appeared when the first segment was smaller
-    than the minimum header size required to determine the protocol version (8b).
+    Bug: 11485
+    Change-Id: Ic27cba937b6d93a3d9ed92522ed6b39ae2daeb8f
+    Reviewed-on: https://code.wireshark.org/review/10307
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+
+commit eacaa1a
+Author: Kevin Bracey <kevin.bracey@arm.com>
+Date:   Wed Jul 22 15:36:07 2015 +0300
+
+    6LoWPAN: IPv6 Fragment Headers don't have a Length field
     
-    ...plus enhanced the AMQP 0-9-1 to display also the protocol id,
-    so the packets list shows "0-9-1" instead "9-1".
+    RFC 6282 specifies special handling of the "Length" field in compressed
+    IPv6 extension headers. However, the Fragment Header does not have a
+    Length field, so this special handling does not apply - the second octet
+    should be treated as opaque data, and the header length is always 8
+    octets.
     
-    Change-Id: Ia44e0791b6ee78ad594de342c4f2401bad9beb4e
-    Reviewed-on: https://code.wireshark.org/review/7044
+    Bug: 11368
+    Change-Id: I28fcd66d96f58a5959bb669caf4244afaca9e67e
+    Reviewed-on: https://code.wireshark.org/review/10231
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Petr Gotthard <petr.gotthard@centrum.cz>
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 5c2810e
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 1 18:43:54 2015 +0100
+commit 8ddd480
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 10:30:15 2015 -0400
 
-    build the list of .qm files from the list of .ts files
+    pcapng: do not byte-swap NRB IPv4 address
     
-    (2nd attempt: yesterday's builbot failure wasn't caused by this commit)
+    Per the spec, it's always encoded in network order (4 separate bytes), and
+    thus should not be swapped on read.
     
-    Change-Id: If87d6b55cc733ff35a3677860b4559a7082a15b2
-    Reviewed-on: https://code.wireshark.org/review/7502
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Bug: 11484
+    Change-Id: I6a650896b324f42bfd2e05759c84e87ace733372
+    Reviewed-on: https://code.wireshark.org/review/10304
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 1864deb
-Author: Mikhail Koreshkov <drkor@hotbox.ru>
-Date:   Tue Feb 24 11:38:47 2015 +0300
+commit 9158176
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 10:00:02 2015 -0400
 
-    GSM_A-GCC: dissector for GCC Protocol
+    pcapng: make SPB cap_len the same as packet_len if IDB snaplen is 0
     
-    Added dissector for GSM-A GCC (Group Call Control) Protocol (GSM 04.68)
+    An IDB snaplen of 0 means no limit, so a Simple Packet Block's capture
+    length should be the same as its encoded packet length in such a case.
     
-    Change-Id: I46fafc3fd3eba674202f2c34932edf83a6d1d096
-    Reviewed-on: https://code.wireshark.org/review/7338
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Bug: 11483
+    Change-Id: I8856d6c6a669a0048ea64b3adbd23c37a598431d
+    Reviewed-on: https://code.wireshark.org/review/10303
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 499d959
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Mar 3 02:47:53 2015 -0800
+commit 0badc8c
+Author: Jim Young <jyoung@gsu.edu>
+Date:   Fri Jul 10 01:50:19 2015 -0400
 
-    Eliminate e_uuid_t in favor of e_guid_t.
+    Insure Qt Capture preferences dialog displays default capture device (if any)
     
-    That eliminates a redundant and confusing data type, and avoids issues
-    with one piece of code using e_uuid_t but wanting to use routines
-    expecting an e_guid_t.
+    In CapturePreferencesFrame::updateWidgets() save and restore the default
+    capture device name because the first call (and only the first call) in
+    the loop with addItem() triggers on_defaultInterfaceComboBox_editTextChanged()
+    which unconditionally sets the default name as the first non-hidden device.
     
-    Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60
-    Reviewed-on: https://code.wireshark.org/review/7506
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 10965
+    Change-Id: Ie93f84010a19e8144efa46ce889fb9064979e0e9
+    Reviewed-on: https://code.wireshark.org/review/9584
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit a0ce286
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Tue Mar 3 11:03:31 2015 +0100
+commit 51e77b6
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Aug 28 15:53:42 2015 +0200
 
-    sflow: added agent type
+    CBOR: fix no previous prototype for proto_reg*_cbor [-Wmissing-prototypes]
     
-    Change-Id: I01bb3dba0c27544539fdca75d655255ff25b12a3
-    Reviewed-on: https://code.wireshark.org/review/7504
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I20476046fc2338484ab85757cad7b19f4e41e4be
+    Reviewed-on: https://code.wireshark.org/review/10283
+    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 b7ef891
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 1 23:03:27 2015 -0500
+commit 4ebf5b8
+Author: Jeffrey Smith <whydoubt@gmail.com>
+Date:   Fri Aug 28 17:28:31 2015 -0500
 
-    Replace tvb_get_ptr calls with a better API choice.
+    bootp/dhcp: fix Alcatel suboption detection bug
     
-    Just reduces the overall tvb_get_ptr usage count in the dissector directory.
-    
-    Change-Id: I455dc4cc9b082ecccdd254a2e5121f3353b5a812
-    Reviewed-on: https://code.wireshark.org/review/7491
+    Change-Id: I4a4222f3f30bf8e996770295756dd206b5ce101b
+    Reviewed-on: https://code.wireshark.org/review/10297
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 599dd4f
-Author: Michael Oed <michael.oed@gmail.com>
-Date:   Sun Mar 1 13:56:34 2015 +0100
+commit e80bd2e
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 28 19:45:28 2015 +0200
 
-    Qt: Do not close file while trying to open new one
-    
-    Wireshark QT will close current opened file when popup open dialogue (File -> open), instead of keeping current file opened till new file is to be opened
+    Added Reload Lua plugins to the release notes.
     
-    Bug: 10962
-    Change-Id: I2062514ae648c95492e0160953c80d5303b8aba2
-    Reviewed-on: https://code.wireshark.org/review/7452
-    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: I2ea50b331322e0bc66bf5f3b48d9c2e78bbdd1e5
+    Reviewed-on: https://code.wireshark.org/review/10285
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 1a54112
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Mar 2 09:33:52 2015 -0500
+commit e18e400
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 15:49:22 2015 -0700
 
-    Add tvb_get_ether_name
-    
-    This is mostly to reduce tvb_get_ptr calls that were used to pass into get_ether_name.
+    Fix a GHashTable assertion in DecodeAsDialog.
     
-    Some optimizations were made to packet-ieee80211.c in the process of conversion.
+    Make sure we don't call g_hash_table_removed from g_hash_table_foreach,
+    which generates an assertion error.
     
-    Change-Id: I81d3c65d4c09a15237fc287c2e989eb6e6936b1f
-    Reviewed-on: https://code.wireshark.org/review/7492
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Bug: 11426
+    Change-Id: I00283c97b0fc63551b901c0fd526b60c0fb80ace
+    Reviewed-on: https://code.wireshark.org/review/10296
+    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 43fd878
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 1 10:46:31 2015 -0500
+commit 1663224
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 28 16:31:33 2015 -0700
 
-    Add "seed" capabilities to crc16_x25_ccitt (now crc16_x25_ccitt_seed) so we can remove CRC algorithm calculation in packet-assa_r3.c.
+    Block sizes are unsigned 32-bit quantities; don't stuff them into an int.
     
-    Change-Id: I3143800f6ff922a309f5506d9acbc2c4293363b7
-    Reviewed-on: https://code.wireshark.org/review/7490
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    *Especially* don't stuff the amount of remaining data in a block into an
+    int that will then be passed to file_skip() as an amount to skip ahead,
+    as a Really Large Value will turn into a negative value and produce
+    various forms of bizarre and tricky-to-debug behavior.
+    
+    Change-Id: I4d0a6b36fe50df84925690ad688a3ab0433ceb17
+    Reviewed-on: https://code.wireshark.org/review/10299
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 091d2db
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Mar 1 10:11:17 2015 -0500
+commit 15c9923
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 28 23:30:30 2015 +0200
 
-    Reduce the number tvb_get_ptr calls in packet-arp.c
+    Qt: Fix use-after-free pattern
     
-    Change-Id: Ic91088c38833be2463f069a646fbfea6b87b33aa
-    Reviewed-on: https://code.wireshark.org/review/7489
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I7f6d9316234c1ccfec1ec5b5c3675b3237f22eda
+    Reviewed-on: https://code.wireshark.org/review/10294
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 48d376f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Mar 2 00:16:16 2015 +0100
+commit 579365e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 14:03:34 2015 -0700
 
-    plugins: fix dissector registration with CMake
+    Disable most of the main window while we're tapping.
     
-    Noticed when comparing output of `tshark -G fields` between autofoo and
-    cmake builds. With this change, I see no differences anymore.
+    Our event loop is nested when we read packets. Disable the main window's
+    central widget while we're retapping packets in order to minimize the
+    chance of ending up in an unexpected state while analyzing packets.
     
-    While only WiMax needs this change, do a similar thing for consistency
-    with autofoo and between dissectors (actually, the contents of
-    ${PLUGIN_FILES} minus plugin.c was used).
+    Note that we will probably want to disable more of the main window and
+    do so in other parts of the code.
     
-    Change-Id: Ib61f69dcc0b8eda713da931b6cc3e946848bea9d
-    Reviewed-on: https://code.wireshark.org/review/7462
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I68a00fe43d2ac9e7c0749751abd1c10c47155b3b
+    Reviewed-on: https://code.wireshark.org/review/10293
+    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 963fbf3
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Mar 2 19:11:42 2015 +0100
+commit 4d71ae7
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 28 15:54:53 2015 -0700
 
-    MBIM: add it to "Decode As" menu
+    Have separate variables for read and write errors.
     
-    Change-Id: If961ac8fcfa0d760e112036ea3e439c4e061af8b
-    Reviewed-on: https://code.wireshark.org/review/7498
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    That way, when we check for read errors, we don't run the risk of
+    thinking we have a read error after we get a write error.
+    
+    Change-Id: Idb79822d30989b2529433878798c577a76eacca7
+    Reviewed-on: https://code.wireshark.org/review/10295
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 21a0bc7
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Mar 2 17:11:17 2015 +0100
+commit aa100e0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 12:57:57 2015 -0700
 
-    cgmp: added reserved field
+    Don't show a progress frame if our file was closed.
     
-    Change-Id: Iaf3c8c776507803e28b4372f7da1290a19dd5efd
-    Reviewed-on: https://code.wireshark.org/review/7497
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ie363f6764f4e8b2b5c476b85f7ddb0233a127f6e
+    Reviewed-on: https://code.wireshark.org/review/10290
+    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 342c55b
+commit c1c6132
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Mar 2 11:50:36 2015 -0800
+Date:   Fri Aug 28 12:28:24 2015 -0700
 
-    Qt: Add @2x images to the layout preferences.
+    Don't dissect twice from TapParameterDialog.
     
-    Run compress-pngs on the normal and @2x images.
+    When the user applies a display filter in TapParameterDialog we're about
+    to start tapping. We need to set the display filter in the main window
+    but we shouldn't apply it.
     
-    Change-Id: Ic5bc3c42273078f32511d986b299d8606c016f6d
-    Reviewed-on: https://code.wireshark.org/review/7499
+    Change-Id: I08bed5c7f470f1dbf32817a7d999f09d2c52f168
+    Reviewed-on: https://code.wireshark.org/review/10287
+    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 6878122
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 2 14:43:05 2015 +0100
+commit d767186
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 28 12:49:18 2015 -0700
 
-    Main window (Qt): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Get rid of trailing blanks.
     
-    Change-Id: Ia8d37b33ee30f09cfe5e0cd00820d84e171deb1c
-    Reviewed-on: https://code.wireshark.org/review/7494
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I0b705c924464dcc4987ed0e7c67b106b2b648dce
+    Reviewed-on: https://code.wireshark.org/review/10289
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0ebbb60
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 2 16:01:17 2015 +0100
+commit da266af
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 28 12:46:11 2015 -0700
 
-    Byte view text (Qt): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Don't check the radio information when testing for an HT Control header.
     
-    Change-Id: I507b27bbf3c2877517cc9613ada1b182becfa98f
-    Reviewed-on: https://code.wireshark.org/review/7495
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 768e37b
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Feb 26 14:38:57 2015 +0100
-
-    Bluetooth: Fix tools/checkAPI issues
+    I now read 8.2.4.1.10 "Order field" in 802.11-2012 as saying that, in
+    management and QoS data frames, the Order bit shouldn't be set for
+    non-HT, non-VHT frames, so we can just test it for those frame types
+    without bothering to check the radio metadata to see if the frame is an
+    HT or VHT frame.
     
-    Change-Id: I8ffbd4a0da800594d9888f6a30612d4fc5273119
-    Reviewed-on: https://code.wireshark.org/review/7474
-    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>
+    This handles cases where the radio metadata isn't complete, e.g. an HT
+    frame with a radiotap header but no MCS field.
+    
+    Handle this for *all* QoS data frames when capturing.
+    
+    Get rid of the "fixed-length link-layer header" stuff; it's not being
+    used.
+    
+    Fix a case where we're appending text to a tree item without a space
+    separating it from the previous text.
+    
+    Bug: 11351
+    Change-Id: I980f5b7509603b0c22c297fddc19434c08817913
+    Reviewed-on: https://code.wireshark.org/review/10288
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 77d2dc5
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Sep 18 13:19:52 2014 +0200
+commit 42570f9
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 28 12:05:20 2015 -0700
 
-    Bluetooth: HFP: Temporary disable partial message dissection
+    Clean up scanning to guess the bitrate of an MPEG-2 Transport Stream file.
     
-    Maybe this case never happen, so disable broken feature.
+    Don't treat an EOF at the beginning of a frame as an error.
     
-    Also fix unexpected Data dissectors and command tree items.
+    Treat I/O errors as hard errors; treat short reads as an indication that
+    the file isn't an MPEG-2 Transport Stream file.
     
-    Bug: 10460
-    Change-Id: I4ea76f20db21c6c9b5dca912b94a0aff99c42160
-    Reviewed-on: https://code.wireshark.org/review/7473
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Treat the PCR for a given PID not going forward as an indication that
+    the file isn't an MPEG-2 Transport Stream file.
+    
+    Bug: 11471
+    Change-Id: I42b5887049423f8265db9d121d7b5bd388e5b244
+    Reviewed-on: https://code.wireshark.org/review/10286
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit cb8876c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Mar 2 16:12:55 2015 +0100
+commit c04d54f
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Aug 27 23:35:58 2015 +0200
 
-    OPENSAFETY: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Preparation Host Flows: make ICMP(v6) code and type retrieval more robust
     
-    Change-Id: Ie566ae541d0d6cf5ac17150006de4f4498e790d6
-    Reviewed-on: https://code.wireshark.org/review/7493
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Do not retrieve type and code base on the info column content.
+    Instead store type and code in pinfo structure and retrieve them in sequence analysis tap.
+    
+    Change-Id: I71cd505d7faf713c2372731495d47b45928a41f8
+    Reviewed-on: https://code.wireshark.org/review/10280
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Pascal Artho <pascalartho@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 52b4c61
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Mar 2 14:27:09 2015 +0100
+commit 5179406
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 09:50:26 2015 -0700
 
-    [r,i]gmp: added reserved field
+    Update the release notes.
     
-    Change-Id: I628b1711e683d57ab5dcbf7ad615b1740399b65f
-    Reviewed-on: https://code.wireshark.org/review/7482
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I7fb0d307355320a77f011b59c71d1d54066b7d08
+    Reviewed-on: https://code.wireshark.org/review/10284
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit e4018f2
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Mar 2 15:29:53 2015 +0100
+commit a7f22aa
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jul 27 17:00:18 2015 +0200
 
-    fip: added reserved field
+    ISAKMP: Add new CHACHA20/POLY1305 Transform Types Values (RFC7634)
     
-    Change-Id: I12878d91dfaf11c96a9d3df965fc659928b7f58a
-    Reviewed-on: https://code.wireshark.org/review/7488
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    From IANA ikev2-parameters (2015-08-24)
+    
+    Change-Id: I02bfd9a0ffc9f863f4d266fcc56cd707c3e71725
+    Reviewed-on: https://code.wireshark.org/review/10282
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit fe7b52c
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Mar 2 14:04:12 2015 +0100
+commit f19a173
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 17:14:39 2015 -0700
 
-    rmcp: added reserved field
+    Speed up column sorting.
     
-    Change-Id: I6661494295b076d8762ea9502a7f9b23b70fc56e
-    Reviewed-on: https://code.wireshark.org/review/7481
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    The GTK+ UI sequentially dissects and caches column strings for all rows
+    before sorting a column. Do the same in the Qt UI, which can improve
+    performance considerably.
+    
+    Don't colorize packets when sorting in the Qt UI unless it's necessary.
+    
+    When sorting in the Qt UI, let the user cancel the initial packet
+    dissection.  Note that we'll need to replace std::sort in order to
+    cancel out of sorting.
+    
+    Use a pre-allocated and pre-compiled GRexex when we prime columns. Note
+    that we probably shouldn't parse a regular expression there.
+    
+    Cache the last result of proto_registrar_get_byname.
+    
+    Note performance hot spots elsewhere in the code.
+    
+    To do:
+    
+    GeoIP in packet-ip.c is pretty slow.
+    
+    Bug: 11467
+    Change-Id: Ib34038fee08ef0319261faeffc4eca01e52f4bd3
+    Reviewed-on: https://code.wireshark.org/review/10275
+    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 077405f
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Mar 2 15:18:17 2015 +0100
+commit 01fb470
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 12:48:56 2015 -0700
 
-    isl: added reserved field
+    More retapping fixups.
     
-    Change-Id: I028ebe27a55ababf9d3557cff531332313c38535
-    Reviewed-on: https://code.wireshark.org/review/7484
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Disable the main file close and reload actions while we're retapping,
+    otherwise many of our dialogs will crash.
+    
+    Disable the TapParameterDialog filter entry while we're retapping. This
+    keeps us from enabling the "Apply" button when we shouldn't.
+    
+    Don't prematurely disconnect our signals in WiresharkDialog.
+    
+    Change-Id: Iaf507eb4503b9c296766f109f2b8c71343263982
+    Reviewed-on: https://code.wireshark.org/review/10274
+    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 3f62394
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Mar 2 15:09:00 2015 +0100
+commit 30c2f23
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Aug 25 20:58:09 2015 -0400
 
-    dvmrp: added reserved field
+    Eliminate proto_tree_add_text from some dissectors.
     
-    Change-Id: Ic46acac05638bf59910e3cb0986ed14b2257ed55
-    Reviewed-on: https://code.wireshark.org/review/7483
+    Change-Id: I066b70cfd58f5fb3ffbcb2e238416747d9e7dd57
+    Reviewed-on: https://code.wireshark.org/review/10269
     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 c35ca6c
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Mar 1 18:45:24 2015 -0500
+commit 2ed634d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 15:00:39 2015 +0200
 
-    scsi-osd: fix overflow leading to infinite loop
+    Support BER files bigger than 256kB
     
-    Thanks to Vlad Tsyrklevich for the report.
+    Also support APPLICATION as starting tag.
     
-    Bug: 11024
-    Change-Id: I9defc6fc72339b2f6ba12b46172b776d798647cd
-    Reviewed-on: https://code.wireshark.org/review/7463
-    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Change-Id: Id85b08e2594969c98c530532a32268b01d50965e
+    Reviewed-on: https://code.wireshark.org/review/10233
+    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>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit e3a4188
+Author: Didier Arenzana <darenzana@yahoo.fr>
+Date:   Sun Aug 23 20:54:38 2015 +0200
+
+    RADIUS: Validation of response authenticators
+    
+    This patch enables validation of response authenticator messages when
+    the shared secret is known.
+    The validation can be activated in the preferences.
+    It implements the validation protocol described in RFC 2865 page 16: Response Authenticator.
+    When an authenticator is invalid, the information is added in the header information.
+    It adds two flags for the display filter : radius.authenticator.valid and
+    radius.authenticator.invalid: since verification is not always possible we use
+    two flags to determine if the verification has been made or not, in the same way as
+    udp and tcp checksum validation is implemented.
+    The Authenticator field becomes a tree, and the value of the flags are visible in
+    this tree.
+    
+    Change-Id: I33a664f2265c6248e106cee7904c754089d50445
+    Reviewed-on: https://code.wireshark.org/review/10216
+    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 608cf32
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Mar 1 18:33:10 2015 -0500
+commit 6151946
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 14:51:50 2015 +0200
 
-    tnef: fix overflow leading to infinite loop
-    
-    Thanks to Vlad Tsyrklevich for the report, and Fabian Yamaguchi for the "joern"
-    tool which found the bug.
+    Qt: Fixed some memory leakages
     
-    Bug: 11023
-    Change-Id: I53bc998c9934736698e7db5eba09a14e79a7c633
-    Reviewed-on: https://code.wireshark.org/review/7461
-    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Change-Id: I5bccf706001f9ff41197ed13b1be5a7404ca594f
+    Reviewed-on: https://code.wireshark.org/review/10251
+    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>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 724c2ed
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Aug 12 10:59:33 2013 +0200
+commit efba977
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 15:18:51 2015 +0200
 
-    Bluetooth: HFP: Improve HFP dissector by dissecting all commands
-    
-    Decode as far as possible AT commands according to
-    specifications: HFP 1.6
+    Qt: Fixed some memory leakages
     
-    Change-Id: Ib2cee4df4d9338cc98f28e0fadd067378fba63a9
-    Reviewed-on: https://code.wireshark.org/review/7472
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: Ie8c9b7f8c9203acb5aec00d5553b911e0299f53c
+    Reviewed-on: https://code.wireshark.org/review/10253
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit d949b3c
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Feb 11 13:35:08 2015 +0100
+commit 8384a5b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 20:18:46 2015 +0200
 
-    Bluetooth: HCI: Fix "Host Number of Completed Packets"
+    Qt: Fixed some memory leakages
     
-    Update internal packet offset to avoid unexpect data expert warning.
+    And changed strdup -> g_strdup
     
-    Change-Id: I9c0f7e8ec35365e8f8bcca6f37a26ed8da56e166
-    Reviewed-on: https://code.wireshark.org/review/7471
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I62de106462259194738d633f16297eb1210f8ccf
+    Reviewed-on: https://code.wireshark.org/review/10259
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 51e12e2
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Feb 26 13:24:12 2015 +0100
+commit 2e1fa63
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 26 10:32:52 2015 +0200
 
-    Bluetooth: L2CAP: Add link to Connect and Disconnect frames
-    
-    Add ability to jumps to connect or disconnect frame from any frame
-    binded to specific PSM session, what should improves analyse by user.
+    Lemon grammar: fix indent (use tabs)
     
-    Change-Id: Icdf6634bf128ba83721d39cf8986cf16bfb4e7a4
-    Reviewed-on: https://code.wireshark.org/review/7470
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I6fa38d5d85b25ac6c55fcfa67d6c8dba8482cc8c
+    Reviewed-on: https://code.wireshark.org/review/10266
+    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 701be1f
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Sun Mar 1 21:15:27 2015 -0500
+commit 0af048b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Aug 25 19:14:59 2015 -0400
 
-    RTP player: don't crash when drawing channel graphs for very long calls.
-    
-    X11 can't handle pixmaps more than 32k pixels wide so don't try to feed it
-    one.  This avoids crashes with the complaint "BadAlloc (insufficient
-    resources for operation)".  Instead we simply truncate the graph (and tell the
-    user).  Do this in a way that shows the user the empty portion of the graph.
-    
-    Hopefully the Qt port can fix this properly.
+    Remove calls of tvb_ensure_length_remaining.
     
-    Note: the bug report says that MacOS is not affected but it should be.  So
-    apply this fix for all on-Windows systems.
+    The remaining calls seem to fall into 3 categories:
+    1. passing it to tvb_find_line_end when -1 (for length) will do.
+    2. duplicating the checking of tvb_reported_length_remaining, which is already in use near the tvb_ensure_length_remaining call.
+    3. Those that (probably) need tvb_ensure_capture_length_remaining
     
-    Bug: 2630
-    Change-Id: I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a
-    Reviewed-on: https://code.wireshark.org/review/7464
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I1e77695251e055644bcbbb89f3c181c65d1671ca
+    Reviewed-on: https://code.wireshark.org/review/10268
+    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 f9f7ff2
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Sun Mar 1 21:59:49 2015 -0500
+commit 374439d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 11:24:29 2015 -0700
 
-    Don't read aliases from the personal hosts file.
+    Don't emit app signals from dialogs.
     
-    We only store the last name added (i.e., the last alias) which is the
-    opposite of what the name resolver does (it returns the first name in the
-    hosts file).
+    Emitting PacketDissectionChanged from a dialog on can render the main
+    window unusable on OS X. A workaround for this was added to the
+    preferences dialog in g8fc2327. Generalize the workaround and use it
+    elsewhere.
     
-    Just comment the code out for now with a comment explaining why.  Maybe some
-    day we'll have a reason to store the aliases.
+    Fix the "Enabled Protocols" action name while we're here.
     
-    Change-Id: I560ac05868a429d31e9d41f3a34af36c4fca1f6c
-    Reviewed-on: https://code.wireshark.org/review/7466
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Bug: 11361
+    Bug: 11448
+    Change-Id: I89e98daaaedc877d3b13b0d33b6f3be033e323d7
+    Reviewed-on: https://code.wireshark.org/review/10271
+    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 99ceab8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Mar 1 20:01:17 2015 -0800
+commit 8ad5611
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Aug 26 22:52:06 2015 +0200
 
-    Don't create a packet dialog if we don't have a packet.
-    
-    Move the "find the frame" stuff to openPacketDialog(), and don't even
-    bother creating a new PacketDialog if we don't find the frame.  This
-    should squelch Coverity CID 1270934, by giving up quickly if fdata is
-    null.
+    sv: remove some unnecessary checks
     
-    Change-Id: I4605ba7e271a55724f02cafed4122f9dd9b1b6f7
-    Reviewed-on: https://code.wireshark.org/review/7467
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3108bf8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Mar 1 18:59:50 2015 -0800
-
-    Fix typo caught by Coverity - wrong structure members being tested.
+    http://personal.strath.ac.uk/robert.c.atkinson/papers/sgms2011.pdf
+    implies that appid, length and the two reserved fields are mandatory
+    just try to dissect them, don't check if there's enough bytes remaining
     
-    CID 1271732
+    correct a typo while at it
     
-    Change-Id: I12b610a0a28fcc790ffb041ca88624e014f68ab5
-    Reviewed-on: https://code.wireshark.org/review/7465
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I09a315fc2c70161af527dca5661f877e09b63ff6
+    Reviewed-on: https://code.wireshark.org/review/10273
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 51f45af
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Mar 1 09:18:34 2015 -0800
+commit 7b35992
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 22:12:17 2015 +0200
 
-    Qt: Don't autoscroll if we're not capturing.
+    Reload IO Graph Y fields when reload Lua plugins
     
-    Change-Id: I3164d8a12981970f127cd68adb7e52f2a1fe5c39
-    Reviewed-on: https://code.wireshark.org/review/7457
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ic3b9096c3c25839dd7d7bfe7af71eeb5b0bd745d
+    Reviewed-on: https://code.wireshark.org/review/10239
+    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 85c589f
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 1 19:35:43 2015 +0100
+commit bc4487a
+Author: Jeffrey Smith <whydoubt@gmail.com>
+Date:   Tue Aug 25 18:40:45 2015 -0500
 
-    Revert "build the list of .qm files from the list of .ts files"
+    bootp/dhcp: tighten check for Alcatel extensions
     
-    This seems to break the build on OSX 10.5 (?)
+    The check for Alcatel extensions in bootp/dhcp packets is very weak,
+    resulting in some false positives.  Then when trying to parse the
+    suboptions, the result is an error on the packet.
     
-    This reverts commit b46bd2c7798d1c9e808625250928b40adf11a8bb.
+    This change eliminates some false positives by adding a test that the
+    vendor-specific option contents match the encapsulated format described
+    in section 8.4 of RFC2132.
     
-    Change-Id: I720de7182804c5c669934e3514e789f2da066867
-    Reviewed-on: https://code.wireshark.org/review/7459
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ie4188ff900426c2d80a5694fbba5c88385625a61
+    Reviewed-on: https://code.wireshark.org/review/10267
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit a3c6003
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Mar 1 18:43:54 2015 +0100
+commit e1c807c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 08:41:50 2015 -0700
 
-    build the list of .qm files from the list of .ts files
+    Add missing callback support.
     
-    Change-Id: If87d6b55cc733ff35a3648860b4559a7082a19b0
-    Reviewed-on: https://code.wireshark.org/review/7458
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I90838ccb701c93b11b216d0eb9973cbac8627129
+    Reviewed-on: https://code.wireshark.org/review/10270
+    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 5309591
+commit e234ce8
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Mar 1 08:05:59 2015 -0800
+Date:   Mon Aug 24 12:30:56 2015 -0700
 
-    [Automatic manuf, services and enterprise-numbers update for 2015-03-01]
+    Rework tapping in Qt dialogs.
+    
+    Add cf_cb_file_retap_started and cf_cb_file_retap_finished to file.[ch].
+    Add their associated signals to CaptureFile.
+    
+    Add registerTapListener and removeTapListeners to WiresharkDialog, which
+    collect and automatically remove tap listeners. Add beginRetapPackets
+    and endRetapPackets, which can be used to wrap critical sections so that
+    we don't delete ourselves while tapping. Don't cancel tapping on close
+    in WiresharkDialog.
     
-    Change-Id: I771a79940efcbf0fcd16ccf5894169d232bdaa9d
-    Reviewed-on: https://code.wireshark.org/review/7454
+    Use beginRetapPackets and endRetapPackets in WiresharkDialog and
+    FollowStreamDialog. We will likely need to add them elsewhere.
+    
+    Update comments.
+    
+    Change-Id: I1788a6ade0817c31aa3419216df96be5e36b2178
+    Reviewed-on: https://code.wireshark.org/review/10261
+    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 9c55903
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Feb 26 22:03:12 2015 -0500
+commit f7e9a79
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 24 12:33:49 2015 -0700
 
-    Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and SET_ADDRESS calls for the same address.
+    Add per-dialog progress frames.
     
-    Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116
-    Reviewed-on: https://code.wireshark.org/review/7437
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Add ProgressFame::addToButtonBox, which violates the UX guidelines on
+    every platform we support by inserting a ProgressFrame into a
+    QDialogButtonBox.
+    
+    Call addToButtonBox in the constructors of a bunch of dialogs.
+    
+    Change-Id: I33ac5fd7a976ee6e0527de569a5c4b528980dae1
+    Reviewed-on: https://code.wireshark.org/review/10242
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 5f2c8e9
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Feb 19 22:52:42 2015 +0100
+commit 8b4ff24
+Author: tkc <chaitanya.mgit@gmail.com>
+Date:   Tue Aug 25 16:58:43 2015 +0530
 
-    zvt: functions for dissecting a bitmap and an apdu as a sequence of bitmaps
+    ieee80211: Qos Control bit4 handling: Make the default case as EOSP, to handle TDLS Packets.
     
-    Change-Id: I87233df8fc17ac0aca0d9daefcebd95f47699808
-    Reviewed-on: https://code.wireshark.org/review/7450
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    When parsing TDLS direct link packets the ToDS: 0 and FromDS:0
+    so the wireshark treats the 4th bit in QoS Control as "bit4", but it
+    should be treated as EOSP.
+    
+    So changed the default case to EOSP and only when TODS is set
+    treat it as "bit4".
+    
+    Change-Id: Ie2a73320dc9921aed4547e32836e6cd7d89ef109
+    Reviewed-on: https://code.wireshark.org/review/10250
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 5644627
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 28 23:12:12 2015 -0800
+commit 57b2b77
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Wed Aug 26 08:50:09 2015 +0400
 
-    "Break" the Acme reader so that the tests work.
+    cmake: rework version.h handling to treat it like config.h
     
-    We don't want to have to change the pcap-ng file against which we
-    compare, so we hardcode the year here to be the same as the year from
-    the pcap-ng capture.
+    It wasn't working on my system: I kept seeing the old git revision
+    in '...shark -v' even after deleting version.h
     
-    Change-Id: Ibd83d06e035341f617b8285f6ba51c749c38a177
-    Reviewed-on: https://code.wireshark.org/review/7448
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5
+    Reviewed-on: https://code.wireshark.org/review/10265
+    Petri-Dish: Jörg Mayer <jmayer@loplof.de>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 0f3ae32
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 28 18:57:47 2015 -0800
+commit c18d2f8
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 15:16:29 2015 +0200
 
-    Call TIMEDEFVn macros in all PACKET_DESCRIBE() macros.
-    
-    Create TIMEDEFV10() and, for it and for V20, V21, and V22, undefine the
-    ones used for the read routine and define dummy ones for the read-seek
-    routines (as those record formats have relative, not absolute, times).
+    Qt SCTP: Changed prohibited APIs
     
-    Have all of them set presence_flags.
+    strcpy -> g_strlcpy
+    sprintf ->g_snprintf
     
-    That way:
+    Also initialize some temp variables.
     
-    1) if we *can* set the time stamps in the seek-read routine, we do;
+    Change-Id: I4d2fa1b0325c6e59aa13ebeb0d9c25d5ff7c4d9c
+    Reviewed-on: https://code.wireshark.org/review/10252
+    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 bd21889
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 25 19:36:28 2015 +0200
+
+    Camel: fix indent (use 2 spaces)
     
-    2) we always set presence_flags in read and seek-read routines.
+    Change-Id: I0e8047fca7f24e60e4db8ad77254bcff5f8d6651
+    Reviewed-on: https://code.wireshark.org/review/10257
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 6b41d2c
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 22 18:31:41 2015 +0100
+
+    Do not treat all unknown IP protocols as unknown IPv6 extension headers
     
-    Change-Id: I837507245e8a0cbc68c7c5fd8365f474d085488e
-    Reviewed-on: https://code.wireshark.org/review/7445
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I229260ce668b60a9756cd3f2e343c278ae27c211
+    Bug: 9996
+    Reviewed-on: https://code.wireshark.org/review/10196
+    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 7130875
+commit 5e45269
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 28 12:35:16 2015 -0800
+Date:   Tue Aug 25 16:56:37 2015 -0700
 
-    Convert fixed-point binary to floating-point in a portable fashion.
+    Explain why the MSDU length field in an A-MSDU is big-endian.
     
-    No need to try to construct an IEEE floating-point number by hand, piece
-    by piece; just sign-extend the value to 32 bits, convert that integral
-    value to a floating-point value, and divide the result by 32768 to
-    properly scale the value.
-    
-    (Yes, in practice, the chances are overwhelming that we'll be running on
-    a machine with IEEE floating point - people probably won't be running us
-    on a VAX, and the UN*Xes on which we're likely to run on a System/3x0 or
-    z/Architecture machine require, and use, the new IEEE floating-point
-    capabilities - but no need to be gratuitiously non-portable.)
-    
-    Change-Id: Ie90a61847e68c3b849de2984139a97004a4ad659
-    Reviewed-on: https://code.wireshark.org/review/7444
+    Change-Id: I4a1cfd09395860348d71e9f4c86b6343cfdcd02a
+    Reviewed-on: https://code.wireshark.org/review/10262
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5892d3c
+commit 4fe661d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 28 01:13:41 2015 -0800
+Date:   Tue Aug 25 15:40:00 2015 -0700
 
-    Don't use ctime().
-    
-    The API checks warn about it being deprecated - that doesn't seem to
-    cause a problem with the buildbot, but does result in failures from the
-    Petri dish.  Format the first and last packet time in an ISO 8601-style
-    format.
-    
-    Call them "First packet time" and "Last packet time", rather than "Start
-    time" and "End time", as they're not necessarily the times when the
-    capture started or ended.
+    Get subset TVBs correctly.
     
-    (Both make the output a bit more like the Statistics -> Summary window.)
+    If you know the actual data length, use tvb_new_subset_length(); it will
+    use that as the *reported* length, which is how it *should* be used, and
+    will calculate the *captured* length for you as appropriate.
     
-    Change-Id: Ibf02999851f49c7951c6f6152c70efa271414bd9
-    Reviewed-on: https://code.wireshark.org/review/7442
+    Change-Id: I86dde999f59fdfec58b118729b7b881737983033
+    Reviewed-on: https://code.wireshark.org/review/10260
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 65303ef
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Feb 27 19:51:37 2015 -0800
+commit 0e952e6
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Aug 25 19:55:56 2015 +0200
 
-    Remove some unneeded includes of <sys/time.h>.
+    SIGCOMP: fix sigcomp.copying_bytes_literally field
     
-    Change-Id: I9e4e6efa9f8c7dbff7627f8d5fc3278ab383618d
-    Reviewed-on: https://code.wireshark.org/review/7441
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib1baa3437579a413899aaba5dd8d31982cda1b0d
+    Reviewed-on: https://code.wireshark.org/review/10258
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 3b23561
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Feb 27 19:49:28 2015 -0800
+commit 8e55f68
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Mon Aug 24 04:34:06 2015 +0400
 
-    Don't use struct timeval if we only care about seconds.
+    Remove gitversion.h
     
-    time_t suffices in that case.
-    
-    Change-Id: Ica7a79fb6f8c7cc7fb6decd5fcd391dccfdb3fc6
-    Reviewed-on: https://code.wireshark.org/review/7440
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id3144ecaf9289dbe53cd2f5d3e3de57e8de955f6
+    Reviewed-on: https://code.wireshark.org/review/10256
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 30d878f
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Fri Dec 12 15:11:07 2014 +0100
+commit 0c291f9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 24 22:30:46 2015 -0400
 
-    openSAFETY: Add support for openSAFETY 1.5
-    
-     openSAFETY 1.5 will be the next version of the openSAFETY
-     protocol. This will include all renditions necessary for
-     future versions of the IEC 61784-3 specifications.
+    Eliminate proto_tree_add_text from packet-sigcomp.c
     
-      - SNMT service for CT preseeding
-      - 40 bit counter value flag support
-      - Adapt CRC calculation for 40bit counter
-      - Display 40bit counter value
+    Some other cleanup noted by the check* scripts.
     
-    Change-Id: Ia9f8e11de813d27bc14437d32ee3d0486810c634
-    Reviewed-on: https://code.wireshark.org/review/5728
-    Reviewed-by: Roland Knall <rknall@gmail.com>
+    Change-Id: I14d7bfa81c689fff00fc82e966d50d4ae9f0988d
+    Reviewed-on: https://code.wireshark.org/review/10254
+    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>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit abd8be3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Feb 27 18:46:44 2015 -0800
+commit 571f254
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 23 03:46:36 2015 +0100
 
-    Get rid of unused variable.
+    Replace "IPv6 header length" with the more correct "payload length"
     
-    Change-Id: I4141f00285cbb6080a782ea2837ea87b7100e081
-    Reviewed-on: https://code.wireshark.org/review/7439
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3e667ba2e3ac49ce99e7a2035d9ff604fd7cbcca
+    Reviewed-on: https://code.wireshark.org/review/10205
+    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 60cc2e0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Feb 27 18:23:14 2015 -0800
+commit cc15b11
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 24 10:29:18 2015 +0200
 
-    Clean up timestamp handling.
+    Multicast Stream: Fix Dereference of null pointer found by Clang analyzer
     
-    Use nstime_t rather than struct timeval when we want
-    seconds-and-fractions, so that, when writing the file, we can handle
-    nanosecond-resolution time stamps.  Calculate the relative time stamp as
-    a 64-bit integer rather than using floating-point.
+    Change-Id: I419f49132f8b0853c17b2fd1b4e9869ef3fafd13
+    Reviewed-on: https://code.wireshark.org/review/10224
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 31bf40e
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 25 12:45:01 2015 +0200
+
+    [Camel] The tags used in EstablishTemporaryConnectionArg differs in V2 and
+    V3 versions of Camel.
+    Add ASN1 code for EstablishTemporaryConnectionArgV2
     
-    Use time_t rather than struct timeval if we only want seconds.
+    Bug: 11466
     
-    Have the routines that write out 16-bit and 32-bit numbers convert them
-    to little-endian themselves, rather than having to be passed a
-    little-endian number.
+    Change-Id: I0dbb9c83e520c269dd567f3c3bc34c99c9aa5e15
+    Reviewed-on: https://code.wireshark.org/review/10249
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 2af5783
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 23 21:34:21 2015 +0100
+
+    Add more validity checks to the IPv6 dissector
     
-    Have a routine that writes out 48-bit values in little-endian order, and
-    use that to write out packet time stamps.
+    Check for IP version and header size
     
-    Change-Id: Ia6e047079e48915647502178e0a1c61177010c62
-    Reviewed-on: https://code.wireshark.org/review/7438
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I69102dda4e0e91ac1617d9a48fe9b0bab26aa9fe
+    Reviewed-on: https://code.wireshark.org/review/10218
+    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 dbbb1d3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Feb 27 15:48:45 2015 -0800
+commit d5049ea
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 22 20:08:31 2015 +0200
 
-    We don't need to check for strings.h.
+    win32: add detection of Npcap to Windows installer
     
-    We never use it; the autoconf script does, but that's as a result of
-    some macros that checks for various standard and non-standard-but-common
-    headers.  It's been ages since strings.h was anything other than a BSD
-    source-compatibility hack, not even needed these days when writing code
-    for *BSD-flavored OSes, as they have <string.h>.
+    If Npcap is installed without WinPcap API-compatible mode, propose to install WinPcap
+    If Npcap is installed with WinPcap API-compatible mode, do not allow to install Winpcap without manually uninstalling Npcap first
     
-    Change-Id: Iad2dc6e55207b52fc8af494ddfca4089c2eb426b
-    Reviewed-on: https://code.wireshark.org/review/7434
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I606f8b11c950fd54cf7fdda7f4a1886cc2580d31
+    Reviewed-on: https://code.wireshark.org/review/10197
+    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: Yang Luo <hsluoyz@sohu.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8c86fbc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Feb 27 14:55:30 2015 -0800
+commit e710f24
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Aug 24 11:21:29 2015 +0200
 
-    <string.h>, not <memory.h>, is the header file for memcpy().
-    
-    Don't include <memory.h> when using memcpy(), include <string.h>.
+    win32: update the list of NdisMedium and NdisPhysicalMedium defines used by GTK UI
     
-    We don't need to check for memory.h, so don't do it in CMake (we don't
-    explicitly check for it in autoconf, but it's checked for by some macro
-    we do use).
+    Use hardcoded values instead of enum values so as to avoid any dependency on newest Microsoft SDK.
+    Add WinPcap specific NdisMediumXXX values.
+    Also rename "Medium in use" to "Media in use" to better match the OID query name.
     
-    Change-Id: I7aa93d4ea93bab9beff597939d3c24aecda3d52e
-    Reviewed-on: https://code.wireshark.org/review/7433
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I7ccc2763364b65df77927cbf1c265195fc295642
+    Reviewed-on: https://code.wireshark.org/review/10225
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Yang Luo <hsluoyz@sohu.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 81fa9e0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Feb 27 14:18:01 2015 -0800
+commit edeaae0
+Author: Richard Sharpe <rsharpe@samba.org>
+Date:   Mon Aug 24 07:39:44 2015 -0700
 
-    wmem, unlike emem, doesn't use mmap(); remove some no-longer-needed checks.
+    Remove the search back up the proto tree for the capture frequency that was
+    being used to determine if we are dissecting 802.11ad in several places.
     
-    Change-Id: Ic9b57c7c7042fadf938bfa48a3aabe23ad33370f
-    Reviewed-on: https://code.wireshark.org/review/7432
+    Since we now have a macro for testing that and the frequency is in the phdr
+    we really should use that. This also prevents problems during display filter
+    execution with respect to fields that are only present for 802.11ad.
+    
+    Change-Id: Id04a31c15b04378b6b0f056baa1f37d94a65b71c
+    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/10234
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 823766b
+commit 4ba5225
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Feb 27 13:55:00 2015 -0800
+Date:   Mon Aug 24 18:46:56 2015 -0700
 
-    We don't use gethostbyname2(), don't check for it.
+    Point to GitHub for the pcapng specification.
     
-    Change-Id: Iff2e5ffe31692b06e1fd07ec0b259ac885a7ed63
-    Reviewed-on: https://code.wireshark.org/review/7431
+    Change-Id: I33faa41e8b0f36ee49d29fe391feafd94d0a7e80
+    Reviewed-on: https://code.wireshark.org/review/10245
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5e2dcb3
+commit 662f4b2
 Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Fri Feb 27 09:46:23 2015 -0500
+Date:   Mon Aug 24 20:26:30 2015 -0400
 
-    Remove a couple useless variables.
+    Use one variable that was set but not previously used and delete another.
     
-    This may fix a compile warning-turned-error on an old version of SLES that
-    Anders reported.
-    
-    Change-Id: I72e5dec00bc0088cd77a206284221cb43ae89547
-    Reviewed-on: https://code.wireshark.org/review/7429
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I6bd7a16e3ea97659a0007edfd9f90dbd2060e443
+    Reviewed-on: https://code.wireshark.org/review/10244
     Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit edb5e4b
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Feb 26 21:10:25 2015 -0500
+commit b16cca4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Aug 24 15:13:59 2015 -0700
 
-    Use getnameinfo() instead of gethostbyaddr().
+    Some beamforming stuff from 802.11ac.
     
-    Also fix up some formatting.
+    Extracted from Joerg Mayer's Ixia-derived patch to 1.12 in bug 11464.
+    Most of the changes there are already in the trunk.
     
-    Change-Id: I3348179626e97daaddfbc89e3ed21e39915e3de4
-    Reviewed-on: https://code.wireshark.org/review/7423
-    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>
+    Change-Id: I90ba04e145ffb2b164810320e3510a5bed847ed4
+    Ping-Bug: 11464
+    Reviewed-on: https://code.wireshark.org/review/10243
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e5e8af9
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Feb 25 20:40:55 2015 -0500
+commit 1874793
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 22:59:21 2015 +0200
 
-    Restore synchronous name resolution (revert SVN rev52115).
-    
-    These gethostbyaddr() calls should be changed to getaddrinfo() but only in
-    master.
+    Remove unused signal
     
-    Change-Id: I7e2d31ceb0e072beb7f324336d7b145c3adbe3a0
-    Reviewed-on: https://code.wireshark.org/review/7402
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: Ic2d4057ee95849bc1b026663dae1430432ad9707
+    Reviewed-on: https://code.wireshark.org/review/10241
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 2d48179
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Feb 20 15:30:23 2015 +0100
+commit 99dab82
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 22:19:01 2015 +0200
 
-    Qt: Automatically scroll the packet list.
-    
-    Add an "Auto Scroll in Live Capture" action to the Go menu. It's in the
-    View menu in the GTK+ UI but it seems to make more sense as a navigation
-    item.
-    
-    Use a timeout interval for automatic scrolling. I haven't run any tests
-    to see if this makes a difference but it would seem that the less
-    drawing we do during a high speed capture the better, particularly for
-    remote displays.
+    Use signal to close packet dialogs
     
-    Update the x-stay-last icons.
-    
-    Note that we might want to make prefs.capture_auto_scroll a "recent"
-    setting.
-    
-    Mark auto_scroll_live and packet_list_check_end GTK+ only.
+    Change-Id: I312f8de8de933e576b60d2b158e4c4f2d1147ef1
+    Reviewed-on: https://code.wireshark.org/review/10238
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit fbadcdd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 24 10:56:04 2015 -0700
+
+    Add notes about using CMake + Qt Creator.
     
-    Bug: 10601
-    Co-authored-by: Gerald Combs <gerald@wireshark.org>
-    Change-Id: I645d27c0814f0e4a0d5b01ae68be366847e2522d
-    Reviewed-on: https://code.wireshark.org/review/7292
+    Change-Id: Ib10cc0a407721d62b39628af858f14e749c94d22
+    Reviewed-on: https://code.wireshark.org/review/10237
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 2462c0d
-Author: Dmitry Bazhenov <dima_b@pigeonpoint.com>
-Date:   Fri Feb 27 10:31:32 2015 +0500
+commit 75d9167
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 24 10:21:55 2015 +0200
 
-    Use VCINSTALLDIR environment variable in order to locate MSVCR_DLL.
-    This fixes Windows build in cases when MSVS is installed in non-default
-    directory.
+    Multicast Statistics (Qt Dialog): Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: I9cfa3f728d64e9d5952c68b2b2b70e627d3f5c3e
-    Reviewed-on: https://code.wireshark.org/review/7426
-    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: Ie2802293576bf9edb28bccf7d464b5e687185096
+    Reviewed-on: https://code.wireshark.org/review/10223
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit e4afcc8
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Thu Feb 19 13:31:46 2015 -0800
+commit 7f60878
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 24 09:01:09 2015 -0700
 
-    Fixed MAUSB Flags subfield dissection
-    
-    Previously, the version field was being dissected as flags.
+    Add FOP 2.0 to the search list.
     
-    Change-Id: Ic7d5fd6262e844c9e578dbc29cd5b6e40078ae9f
-    Signed-off-by: Sean O. Stalley <sean.stalley@intel.com>
-    Reviewed-on: https://code.wireshark.org/review/7398
-    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: Ifc462a69e28b875f05770c453b06689c69008c52
+    Reviewed-on: https://code.wireshark.org/review/10235
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 2366113
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Thu Feb 19 13:20:56 2015 -0800
+commit d7e3076
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 24 12:16:06 2015 +0100
 
-    Added basic MA USB isochronous packet support
+    IPv6 RPL: "cmprI" should be "cumprE"
     
-    Iso fields in a MA USB header are now dissected,
-    instead of treating them as non-iso fields.
-    
-    Change-Id: I13c9ba5b0c54ef0b5130c2e87c7de3de9dbe9e22
-    Signed-off-by: Sean O. Stalley <sean.stalley@intel.com>
-    Reviewed-on: https://code.wireshark.org/review/7397
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Bug: 10560
+    Change-Id: I7cf9fb8ad39d128ed375abb8703937be8e3795b3
+    Reviewed-on: https://code.wireshark.org/review/10228
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit bc8228b
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Thu Nov 13 17:15:31 2014 -0800
+commit bc0d8d1
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 22 19:20:25 2015 +0100
 
-    Added Dissection of CancelTransfer MA packets
-    
-    Type-specific subfields of CancelTransferReq/Resp are now dissected.
+    Remove space from field description for consistency
     
-    Change-Id: I0f03e14df936409125b263409de605dde96d53c0
-    Signed-off-by: Sean O. Stalley <sean.stalley@intel.com>
-    Reviewed-on: https://code.wireshark.org/review/7396
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I74b0be1724d0754b7d1b724e177d44c4894d0e6b
+    Reviewed-on: https://code.wireshark.org/review/10198
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9cc49a7
-Author: Sean O. Stalley <sean.stalley@intel.com>
-Date:   Tue Nov 11 17:52:31 2014 -0800
+commit a5b5c5a
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 23 18:44:31 2015 +0200
 
-    Updated MAUSB Packet Type values
+    fc: don't THROW() an exception from a dissector
     
-    Packet type values are now consistant with spec.
-    Also, values in enum mausb_pkt_type are now consistant with
-    mausb_type_string array.
+    bring up an expert info and exit
     
-    Change-Id: I515332bdbc1d1f06bd03e3da314c44d7e842f2f9
-    Signed-off-by: Sean O. Stalley <sean.stalley@intel.com>
-    Reviewed-on: https://code.wireshark.org/review/7395
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Icbbafb8b7187a66d3ddc9a674502ad728b7c4ffc
+    Reviewed-on: https://code.wireshark.org/review/10222
+    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 0002424
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 24 13:46:44 2015 -0500
+commit 517f4d4
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 20 23:06:44 2015 +0200
 
-    Remove most of the tvb_get_ptr calls in the packet-batadv.c dissector.
+    cigi: don't THROW() an exception from a dissector
     
-    These calls were all getting ether addresses which can be gotten by other means.
+    stop the dissection instead and bring up an expert info in the main function
     
-    Change-Id: I9a3d564483c9ee9b8e5183bb9086da8a315c41fc
-    Reviewed-on: https://code.wireshark.org/review/7421
+    Change-Id: I391bf821422ef8e6ae01849c88096e90e4295920
+    Reviewed-on: https://code.wireshark.org/review/10221
+    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 14697b8
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 24 14:16:48 2015 -0500
+commit 7c0b8bd
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Aug 24 12:41:04 2015 +0200
 
-    Pass tvb and offset into print_nsap_net() and print_area() to "hide" the tvb_get_ptr call that dissectors are using.
+    [Q.2931] Don't use BASE_EXT_STRING for a value_string, fixes the test
+    suite
     
-    Change-Id: Ibc5a51be462d431b85b34cac7a358d736ec7b9db
-    Reviewed-on: https://code.wireshark.org/review/7422
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    ** (process:10080): WARNING **: Invalid value_string_ext ptr for: q2931.atm_identifier
+    
+    Change-Id: Id4ec745629af7774e480e91fba01ed8da5aac1bd
+    Reviewed-on: https://code.wireshark.org/review/10227
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 64c0678
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 26 20:35:31 2015 -0800
+commit 079dd03
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 11:52:29 2015 +0200
 
-    Again, we need a separate pointer to advance through the buffer.
+    Fixed typo in hfinfo_remove_from_gpa_name_map
     
-    In this case, sometimes we step through the buffer and sometimes we
-    don't, so we always use strlen(); use a separate pointer when we're
-    stepping through the buffer.
-    
-    Change-Id: Id69898760b4c255146c6eae0ab44c1d358c9ccbd
-    Reviewed-on: https://code.wireshark.org/review/7425
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic80fbe9397e50c41fa01ef9147319dd2ac0c0b91
+    Reviewed-on: https://code.wireshark.org/review/10226
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 9ac60ff
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 26 20:16:22 2015 -0800
+commit a2d8514
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Aug 23 19:02:23 2015 +0200
 
-    address_to_string routines need to remember the beginning of the buffer.
-    
-    Either they don't have a pointer into the buffer that they advance, in
-    which case strlen(buf)+1 works just fine, or they do, in which case
-    
-       1) they'd better save the pointer to the beginning of the
-          buffer, so they can figure out how long the string is when
-          they're done
+    ip: fix ip.hdr_len filter value when the header length is too small
     
-    and
-    
-       2) they don't need to use strlen(), they can just subtract the
-          pointers.
-    
-    Bug: 11016
-    Change-Id: I81ce9d517336a15bd81f0c6225756ce5178ec6cf
-    Reviewed-on: https://code.wireshark.org/review/7424
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ia510d0f4e496ef0577856bf633d6ca19f0b3e1cb
+    Reviewed-on: https://code.wireshark.org/review/10210
+    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 1e66e74
-Author: Dmitry Bazhenov <dima_b@pigeonpoint.com>
-Date:   Thu Feb 26 16:47:50 2015 +0500
+commit bd553f6
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Aug 22 22:14:30 2015 -0400
 
-    Add dissector for "Bad Password Threshold" IPMI LAN configuration parameter.
-    
-    Add dissectors for IPv6-related IPMI LAN configuration parameters.
+    Eliminate proto_tree_add_text from packet-q931.c and packet-q2931.c
     
-    Bug:11012
-    Change-Id: I9b7380d2451acb6d68a03361e26dc3a6ebc129a0
-    Reviewed-on: https://code.wireshark.org/review/7404
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I681b05755429fd7420c423ff88e5a4d3dc95db64
+    Reviewed-on: https://code.wireshark.org/review/10219
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0f29e5d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Feb 26 13:51:50 2015 +0100
+commit 7176958
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 22 22:59:42 2015 +0200
 
-    isis: bugfix in csnp source id length.
+    Close packet dialogs when reload Lua plugins.
     
-    Change-Id: Ib9f8507ed0a5a0788970b5fa150917f7c1b10de3
-    Reviewed-on: https://code.wireshark.org/review/7418
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8ae714d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 26 10:22:28 2015 -0800
-
-    Remove a dead assignment found by Clang.
+    We could keep the dialogs with the current content if postponing
+    proto_free_deregistered_fields() until all dialogs are closed.
+    This would give a feature where the user is able to compare packets
+    before and after a reload.
     
-    The code in question was copied from ui/gtk/capture_file_dlg.c. The dead
-    assignment there was removed in 68ceffe.
+    Or we could add functions in PacketDialog to reload the packet details
+    in all open dialogs.  This would give a feature to always have a
+    updated dialog for all interesting packets.
     
-    Change-Id: I605f181b623fbd87ab41505d30a79d7a4fe649df
-    Reviewed-on: https://code.wireshark.org/review/7419
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I805352b65844eafafafc54cd61f08b4605416e64
+    Reviewed-on: https://code.wireshark.org/review/10201
+    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 3e5c0bf
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 26 08:18:04 2015 -0800
+commit 25ec198
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 21:39:12 2015 +0200
 
-    Qt: Fix packet detail and byte view scrolling
+    Disable streamNumberSpinBox while reloading capture
     
-    Make sure we call scrollToByte ByteViewText::setFieldHighlight.
-    Explicitly scroll to our selected QTreeWidgetItem in
-    ByteViewText::mousePressEvent.
+    When changing stream in TCPStreamDialog it should not be possible
+    to change stream again until the capture has reloaded, because
+    this will give a crash when doing graph_segment_list_free() or
+    graph_segment_list_get() while already doing this.
     
-    Bug: 11013
-    Change-Id: I0a6381f6760ed48a4f496be8a06b1e56faa5a05b
-    Reviewed-on: https://code.wireshark.org/review/7416
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Also disable mouseMove event (showing packet details) while reloading,
+    as this also will give a crash.
+    
+    We should consider also having a reload progress bar in the
+    TCPStreamDialog to indicate that this is happening when having
+    large capture files, as the main window may not be visible.
+    
+    Change-Id: I622f9e0de8205bc1fd18101dc03100079d7a2d06
+    Reviewed-on: https://code.wireshark.org/review/10159
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 123be13
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Feb 26 14:01:08 2015 +0100
+commit 47c9aa4
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 09:33:17 2015 +0100
 
-    ANSI IS-637 A: ensure that num_fields is not null before calling text_decoder
+    Check if IPv6 payload length exceeds framing byte length
     
-    Bug: 11014
-    Change-Id: Id2c7913d96743424380bd75c4005ec747ee7dd50
-    Reviewed-on: https://code.wireshark.org/review/7412
+    Bug: 11418
+    Change-Id: Icbb980fda4f7addf52db59bc4f2aa27fc8f85837
+    Reviewed-on: https://code.wireshark.org/review/10176
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit e914bd5
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Feb 26 16:18:38 2015 +0100
+commit c6aeaad
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 22:50:58 2015 +0200
 
-    [GTP CDR] Add support for CDR data record format version 12.6.0
+    Disable apply button while adding the filter
     
-    Bug: 11015
-    Change-Id: Iea4a4cd4e4e8b41ef781c92c838f17ea6d16e499
-    Reviewed-on: https://code.wireshark.org/review/7413
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 50b15cc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 26 14:00:22 2015 +0100
-
-    Translations : fix trailing whitespace when generate translations file
+    Pressing multiple apply while reloading the capture file will
+    give a crash.
     
-    Change-Id: I4142912c7a139f57f0ac5291bf3ed6762abec35c
-    Reviewed-on: https://code.wireshark.org/review/7410
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I3587b9ab6b6b7f1437f3a7becb8c35277bb5c62c
+    Reviewed-on: https://code.wireshark.org/review/10161
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit d60d473
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 22 20:00:20 2015 +0100
+commit 216f06b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sun Aug 23 20:11:06 2015 +0200
 
-    Qt: Update translation
+    Lua: Support deregister ProtoField with existing abbrev
     
-    lupdate/lrelease ui/qt/Wireshark.pro
-    
-    Change-Id: Ic77adf7ff48d528553ac57bdf04d1ff6e036efdd
-    Reviewed-on: https://code.wireshark.org/review/7312
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Icb06792bb2662dcee6e5495359ceef420a5b4498
+    Reviewed-on: https://code.wireshark.org/review/10212
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 3546914
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Thu Feb 26 11:03:21 2015 +0100
+commit 984f87a
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Aug 20 06:16:22 2015 -0400
 
-    rsync: improved info for protocol.
+    Eliminate proto_tree_add_text from some dissectors
     
-    Change-Id: I9d1ae0bf1d6df0b9da0220aeff2dd73b5f18f38a
-    Reviewed-on: https://code.wireshark.org/review/7407
+    Change-Id: Id710ab10093227b27ef5f18b0d2960e31d0b95a9
+    Reviewed-on: https://code.wireshark.org/review/10200
     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 bcf870e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Feb 26 13:35:26 2015 +0100
+commit 296b9cf
+Author: Richard Sharpe <rsharpe@samba.org>
+Date:   Sat Aug 22 09:51:25 2015 -0700
 
-    SMPP: AT_STRINGZ address allocation must use the pinfo pool
+    Add some symbols to wtap.h so that we can correctly support 802.11ad.
+    Currently there are a lot of local hacks in the 802.11ad support and
+    better support can be provided.
     
-    Fixes an ASAN failure reported by Alexis
+    Also add a structure to track 802.11ad (DMG) specific features in the phdr
+    structure as suggested by Guy Harris.
     
-    Change-Id: I33b21d148e631e8a554882283a1c7284d701af1a
-    Reviewed-on: https://code.wireshark.org/review/7409
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Also, respond to some suggestions by Guy Harris.
+    
+    Change-Id: I8459e3986a134a08ee2e31f0158b8aa5c9b91d86
+    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/10204
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 29feae5
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Mon Feb 23 17:03:43 2015 -0500
+commit 5ed7a40
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Aug 23 16:13:20 2015 -0700
 
-    Use tcp_dissect_pdus() in the SSTP dissector.
+    Don't assume we have interface information.
     
-    I happened across the discussion in Ia44e0791b6ee78ad594de342c4f2401bad9beb4e
-    which indicates that protocols running over SSL can use tcp_dissect_pdus() too.
-    So do it in the SSTP dissector.
+    Not all capture file formats provide interface information.  Check
+    whether we have it, and don't fail if we don't have any.
     
-    Change-Id: I3de14c1b2af5e4e5fe3630121366b71a5ad223cf
-    Reviewed-on: https://code.wireshark.org/review/7333
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 96d1ce0
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 25 15:23:32 2015 +0100
-
-    chdlc: Added "control" to proto tree.
+    (Note that the current version of the pcapng specification in the Git
+    repository does not require that there be at least one IDB in a file,
+    only that there must be an IDB for each interface to which other blocks
+    in a file refers.)
     
-    Change-Id: I027b6cd274673a5ae78a23f7a3d484ff83791eae
-    Reviewed-on: https://code.wireshark.org/review/7388
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ia796f639ed3a8cb21e1dbe9b2bc6b4b66c7be479
+    Reviewed-on: https://code.wireshark.org/review/10220
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b034870
-Author: Dmitry Bazhenov <dima_b@pigeonpoint.com>
-Date:   Thu Feb 26 12:59:42 2015 +0500
+commit ce38df5
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Aug 23 21:02:24 2015 +0200
 
-    Fix a couple of bugs in IPMI dissector:
+    CBOR: get rid of INFINITY and NAN defines
     
-    * Fix incorrect offset for Block Selector field
-      in Get LAN Configuration Parameter request.
-    * Expect 0x83 completion code ("Attempt to read write-only parameter")
-      for Get LAN Configuration Parameter command instead of
-      Set LAN Configuration Parameter command.
+    This triggers an "overflow in constant arithmetic" warning with MSVC2013
     
-    Change-Id: I5be37c5f96db91b70329bfce906ce76f7b8b6958
-    Reviewed-on: https://code.wireshark.org/review/7403
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ie3b076019c4722857c8e57f8568a0cb124fd13ad
+    Reviewed-on: https://code.wireshark.org/review/10217
+    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 3336f71
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Feb 25 21:29:10 2015 -0500
+commit 4f68c52
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Aug 23 11:38:13 2015 -0700
 
-    Actually define HAVE_GETADDRINFO if we find it.
+    See if this makes MSVC happy.
     
-    AC_CHECK_FUNC() doesn't define HAVE_XXX but AC_CHECK_FUNCS() does.  And
-    AC_CHECK_LIBS() certainly doesn't define HAVE_<function>.
+    It's complaining about an "overflow in constant arithmetic".  Neither
+    INFINITY nor NAN are specified by C90; C99 specifies that they are both
+    floats.  Until recently, Microsoft had no interest in C99; if the
+    version we're using supports C99's INFINITY and NAN, it should be OK to
+    assign them to a variable (no "arithmetic" involved), so I'm guessing
+    that the "arithmetic" in question is the use of conditional operators ?
+    and :, so I'm writing it as an if statement instead.
     
-    Also remove some ancient comments.
+    Change-Id: I532b9b5943be32e0897e4f03ac4e625ac41ee63b
+    Reviewed-on: https://code.wireshark.org/review/10215
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 6b9a628
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sun Aug 23 20:36:33 2015 +0200
+
+    Lua: remove unneeded todo comments
     
-    Change-Id: I49d701bb96d3bd3c55c4beb99d532e397ec554ad
-    Reviewed-on: https://code.wireshark.org/review/7400
-    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>
+    Change-Id: I2591a0f21092a251e6fc4393e97ae0594318dfdf
+    Reviewed-on: https://code.wireshark.org/review/10214
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 4e12b59
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Feb 25 21:39:34 2015 -0500
+commit fd68385
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Aug 23 11:20:39 2015 -0700
 
-    Check whether we HAVE_GETADDRINFO before using it.
+    Use G_GINT64_MODIFIER, not l, in format strings for 64-bit integers.
     
-    One spot was missing the check.
+    64-bit integers are *not* guaranteed to be longs and, in fact, are *not*
+    longs on ILP32 platforms such as 32-bit UN*Xes and 32-bit Windows and on
+    LLP64 platforms such as 64-bit Windows.
     
-    Change-Id: I72d1d3d2dec2cc71b02861ace59dc9e189721cfb
-    Reviewed-on: https://code.wireshark.org/review/7401
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I6408778f638bb6cea52ffb64be39ea26c9b2ee64
+    Reviewed-on: https://code.wireshark.org/review/10213
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0692d75
+commit a451c60
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 25 13:04:59 2015 -0800
+Date:   Sun Aug 23 11:12:43 2015 -0700
 
-    Make the V10 path a bit more like the other paths.
+    Rename variable to avoid collisions with math.h's exp().
     
-    Provide {FULL,PART}SIZEDEFV10 macros, similar to what's provided for the
-    other versions, containing the code to set the packet length and
-    captured data length, and use the TRACE_V10_REC_LEN_OFF() macro directly
-    after that to set the various length and offset values in the
-    pseudo-header.
+    Spell out "mantissa" while we're at it.
     
-    Change-Id: I3513371057601b44821d89ebaa7565ab370a67f5
-    Reviewed-on: https://code.wireshark.org/review/7393
+    Change-Id: I47ddb9882f45ef58a6f7101818683e68bc54983b
+    Reviewed-on: https://code.wireshark.org/review/10211
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1a3dd34
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Feb 25 17:49:31 2015 +0100
+commit 0b03543
+Author: Hauke Mehrtens <hauke@hauke-m.de>
+Date:   Mon Jul 20 23:36:03 2015 +0200
 
-    ATN-CPDLC: never put a break in a TRY block
+    CBOR: add Concise Binary Object Representation (RFC 7049) dissector
     
-    It will skip the execution of ENDTRY block
+    This adds a dissector Concise Binary Object Representation (CBOR) (RFC 7049).
+    CBOR is a binary data format designed for implementations with small
+    code size as used in the IoT. It uses a structure similar to JSON, but
+    encodes the data in binary format. This is used on top of CoAP for
+    example.
     
-    Bug: 9952
-    Change-Id: I55af248b7d31cf1b75aae695ef8c149367791820
-    Reviewed-on: https://code.wireshark.org/review/7391
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I9d7b7d4f7609c899bfc68250cdfebd5dc64e0402
+    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+    Reviewed-on: https://code.wireshark.org/review/9848
+    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 618eaec
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Feb 25 15:50:49 2015 +0000
+commit 3ce60ed
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Fri Jul 17 16:31:32 2015 +0200
 
-    delete_includes.py: add target for ui/qt
+    dtls: do not try to add a zero-length fragment
     
-    Change-Id: I9dc51fbef50941f04ccf5b0b5a8cd71f3693ade4
-    Reviewed-on: https://code.wireshark.org/review/7389
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit be68cdb
-Author: Tibensky <tibensky233@gmail.com>
-Date:   Wed Feb 25 15:57:35 2015 +0100
-
-    [Diameter] Add some AVPs and AVP values from
-    3GPP TS 32.299
-    version 12.7.0 (2015-01)
-    Ping-Bug:11008
-    Change-Id: Ib7f52c743f43d8a1c70c9fb100663292d7c4a87e
-    Reviewed-on: https://code.wireshark.org/review/7387
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 03988e9
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Feb 25 09:12:04 2015 -0500
-
-    Add the ATN dissectors to the CMake build.
+    fragment_add does not like adding zero-length fragments, it causes a
+    zero-length memcpy to NULL.
     
-    Change-Id: Ic4963994ed9d1996c74c5ba3db723e93073f4649
-    Ping-bug: 9952
-    Reviewed-on: https://code.wireshark.org/review/7386
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 9dfade3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 25 00:11:56 2015 -0800
-
-    Make the _offset values static constants.
+    According to RFC 6347, fragment_offset=0 and fragment_length=length is
+    an unfragmented message, so fragment>0 and fragment_length=length=0 is a
+    fragmented message.
     
-    No need to export them outside this file, and making them constants
-    might convince the compiler not to bother fetching their values from
-    memory when referring to them.
+    An empty fragment does not extend a previous message, so ignore it.
+    Such fragments are produced by at least GnuTLS 3.3.7[1], so raise a
+    warning instead of an error.
     
-    Change-Id: Ib8605bf0bb9091721a51827c45fe75d19a15ba26
-    Reviewed-on: https://code.wireshark.org/review/7378
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 6b6c11c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 22:11:57 2015 -0800
-
-    Have a PACKET_DESCRIBE() for V30's seek-read routine.
+    Caught by ubsan:
     
-    That way it'll set the captured length and reported length the same way
-    it's done in the read routine.
+        epan/tvbuff.c:783:10: runtime error: null pointer passed as argument 1, which is declared to never be null
     
-    Change-Id: I8b1f2d0d8fa688f44b6f61f16dc2e21b5648fc12
-    Reviewed-on: https://code.wireshark.org/review/7376
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+        #0 0x7f5319f6ed64 in tvb_memcpy epan/tvbuff.c:783
+        ...
+        #13 0x7f5319f27e2b in fragment_add epan/reassemble.c:1394
+        #14 0x7f531a5c70a4 in dissect_dtls_handshake epan/dissectors/packet-dtls.c:1257
+    
+     [1]: http://comments.gmane.org/gmane.network.gnutls.general/3582
+    
+    Change-Id: I70bf16d2fb64793d0deaabe612147e238b743b2e
+    Ping-Bug: 11358
+    Reviewed-on: https://code.wireshark.org/review/9689
+    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 98e8d52
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 21:23:32 2015 -0800
+commit 3703b4e
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 22 19:56:34 2015 +0100
 
-    Make the V10 PACKET_DESCRIBE() macro a little more like the others.
+    Fix ip_try_dissect() boolean return
     
-    Rename the V10 PACKET_DESCRIBE()'s "fpp" argument to "type", and have it
-    declare the pointer variable.
+    If dissector_try_heuristic() succeeds return TRUE and vice-versa.
     
-    Change-Id: I3ac52ebdef0aec7bc95052277537185132886b57
-    Reviewed-on: https://code.wireshark.org/review/7374
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3fb2595604f2f3981468473d0a966efe7387745e
+    Reviewed-on: https://code.wireshark.org/review/10199
+    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 0856de5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 20:25:13 2015 -0800
+commit cc7afd2
+Author: Robert Grange <robionekenobi@bluewin.ch>
+Date:   Thu Aug 13 15:35:01 2015 +0200
 
-    Rename the "type" argument to V10's PACKET_DESCRIBE() to "ver".
+    packet-mq: Add new Const/Def for WMQ800 FP3
     
-    Move it in the argument list, and use it instead of a hard-coded 10
-    (even though it's always passed as 10), to match the other
-    PACKET_DESCRIBE() macros.
+    Add new Const/Def for WMQ800 FP3
+    Improve Detection of EBCDIC String in MQCONN_REPLY
+    Add Value in comments
     
-    Change-Id: Idd0a23a58cc6bb0d2de799b039db776d279cc03e
-    Reviewed-on: https://code.wireshark.org/review/7372
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I695a3afa64fee7f22918f68540901c97dfd38464
+    Reviewed-on: https://code.wireshark.org/review/10012
+    Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
+    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 825a833
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 20:14:36 2015 -0800
+commit 89ff46e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 23 08:06:46 2015 -0700
 
-    Call the version-number argument to GENERATE_CASE_xxx() "ver".
+    [Automatic update for 2015-08-23]
     
-    The name "type" is thrown around to mean both a version number and a
-    part of a structure member, and some other macros use "ver" for the
-    version number; try to make things a little less inconsistent.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I61405cf41cca43fe607154af7498944c5ec0ef11
-    Reviewed-on: https://code.wireshark.org/review/7370
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3726aa80e1e4d23301500fca326ae2b952bf38f6
+    Reviewed-on: https://code.wireshark.org/review/10208
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit fc6df64
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 19:12:35 2015 -0800
+commit f95d459
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 22 11:27:00 2015 +0200
 
-    Use FULL/PART as an argument to all PACKET_DESCRIBE() macros.
+    OSPF: Fix indent (use 4 spaces)
     
-    Makes the various flavors of that macro more similar.
+    Change-Id: I4bd3c4a983b12e8fa053c2362f80dd723b9de572
+    Reviewed-on: https://code.wireshark.org/review/10191
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 2336743
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sun Aug 23 17:02:47 2015 +0400
+
+    Remove some svn $Author$ lines that escaped previous cleanups.
+    git does keep of this in a much better way anyway.
     
-    Change-Id: Ie95ee8db0b226458146b055b54b7d61835f1e508
-    Reviewed-on: https://code.wireshark.org/review/7368
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I9923516105e63e72878e0ed34c74eed44453ab01
+    Reviewed-on: https://code.wireshark.org/review/10207
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 22b4b63
+commit ebca184
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 19:00:17 2015 -0800
+Date:   Sat Aug 22 15:33:15 2015 -0700
 
-    Get rid of an unused argument to PACKET_DESCRIBE().
+    Call the MCS field by its correct name.
+    
+    Yes, it *should* have been called "HT", but hindsight is always 20-20.
     
-    Change-Id: Ic2037f5bf7eb43f93ba39f91bca3fc267c8fb850
-    Reviewed-on: https://code.wireshark.org/review/7366
+    If you want less confusingly named information, look at what the "802.11
+    radio information" dissector puts into the protocol tree; the radiotap
+    dissection is for people debugging radiotap implementations or looking
+    for vendor-specific information that's not (yet) put into the generic
+    802.11 radio information.
+    
+    Change-Id: If6e97f82595a6f11a45e34d5a52e70e9ca686d7c
+    Reviewed-on: https://code.wireshark.org/review/10202
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 04b6b56
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 16:15:13 2015 -0800
+commit 15ed335
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Aug 18 07:01:35 2015 +0100
 
-    Give all PACKET_DESCRIBE() macros a HEADERVER argument.
+    [CLI, GTK] comparestat: Fix typos, output format, argument parsing
     
-    A bit of regularization.
+    Optional filter argument wasn't correctly parsed.
     
-    Change-Id: I60e0bd50891e1ba3e9c40f8d1d14d63534e08138
-    Reviewed-on: https://code.wireshark.org/review/7364
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic0418fa866e1a00880b4e41bb28267a155a71aa5
+    Reviewed-on: https://code.wireshark.org/review/10088
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 08c85ec
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 16:06:49 2015 -0800
+commit 9c331f7
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Aug 18 08:11:34 2015 +0100
 
-    Call header version arguments HEADERVER.
+    [GTK] Fix crash in comparestat.c
     
-    Use that rather than TYPE or acttype (to indicate that it's a header
-    version number to use as the "xxx" in NSPR_HEADER_VERSIONxxx, and to use
-    the same name throughout).
+    Selecting a row in the statistics table causes a Glib assertion failure.
     
-    Change-Id: I14cfc819e44ce4388c27d521a1256dec8d80df2e
-    Reviewed-on: https://code.wireshark.org/review/7361
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    GLib:ERROR:ghash.c:373:g_hash_table_lookup_node: assertion failed: (hash_table->ref_count > 0)
+    
+    When the comparestat_draw() function is called, the cs->ip_id_set hash table
+    is created and then immediately destroyed, but the hash table lookup
+    to cs->ip_id_set in new_tree_view_selection_changed() can happen anytime
+    the user clicks on a table row.
+    
+    Bug: 11098
+    Change-Id: I6c7a39c947ca11327c3fc3ab0d4caa735798d142
+    Reviewed-on: https://code.wireshark.org/review/10096
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c4b76a9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 14:32:28 2015 -0800
+commit 0d61321
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Aug 14 21:13:51 2015 -0400
 
-    More indentation cleanups.
+    Correct logic for finding shadow variables.
     
-    Change-Id: Ia448727e6340723800d92097f0ef7f3582ef6340
-    Reviewed-on: https://code.wireshark.org/review/7359
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ide03c3b92f70d5dad8d0dceca179ea6f3b9e1fd6
+    Reviewed-on: https://code.wireshark.org/review/10037
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0dc5edf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 14:28:21 2015 -0800
+commit 5a7f574
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sat Aug 22 16:11:35 2015 +0400
+
+    Fix two bugs
+      1) Introduced by me in commit c4fe7129d802752aa4cc89a66d2d5d5f2698e020
+         where I didn't honor the "print lsa header only" flag properly for
+         data highlighting
+      2) Introduced in 2001 with commit dd1b7eafafb5748757a0396f4cc6ad6e65f37483
+         which moved offset increasing into an "if (tree)" statement with code
+         after the if statement continuing to work with offset.
+    Also make display of v2 and v3 LSAs the same again (forgot one case in
+    previous commit.
+    
+    bug:11461
+    Change-Id: I1986c19842f1fa9c8a6d0a7c9a79c64939eeb9d0
+    Reviewed-on: https://code.wireshark.org/review/10192
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-    Clean up indentation.
+commit b0a8fa5
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 21 12:43:55 2015 +0200
+
+    Initialize extcap for pipes
     
-    Change-Id: I80f8c5c642ebc1fe0169e39c1af9584cfbb89d1a
-    Reviewed-on: https://code.wireshark.org/review/7357
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ia731f281ee9af171c759d7f6f7c614c350cbb4e7
+    Reviewed-on: https://code.wireshark.org/review/10178
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 37c09e3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 14:22:24 2015 -0800
+commit 532070b
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 16 18:41:53 2015 +0100
 
-    Pull more into PACKET_DESCRIBE() for the V10 seek-read routine.
+    Add support for IPv6 stats tree statistics
     
-    Just like the read routine.
+    Also add support for alphabetizing stat tree items as the addition of IPv6 stats tree makes it more obvious its needed.
     
-    Change-Id: If6bd98bea15f1c8dc7454a5dac0ea57920bddc8c
-    Reviewed-on: https://code.wireshark.org/review/7355
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8b319ceac805ce7e3a1fd59f92c1c6fe2a54d3de
+    Reviewed-on: https://code.wireshark.org/review/10062
+    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 592ee9e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 13:56:16 2015 -0800
+commit 953cdd4
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sat Aug 22 08:33:27 2015 +0400
 
-    Swallow up more V10 stuff into PACKET_DESCRIBE().
+    Print two reserved elements as reserved instead of skipping them
     
-    That makes it even more like V2x and V3x and slightly less unclear.
+    Change-Id: Ic91e07df4881dfff0f0dd1c4809903cbdee8ef60
+    Reviewed-on: https://code.wireshark.org/review/10190
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+
+commit c4fe712
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sat Aug 22 08:11:45 2015 +0400
+
+    Small cleanups and improvements
+      Show the LSA type and length in the summary line
+      Improve a message to make it clear when we are talking about a LLS TLV
+      Add an expert item for LLS bit set but data block missing
+      PI_MALFORMED is an error not a warning.
     
-    Change-Id: I798ead123ba6418be0252067773a951390e26ce8
-    Reviewed-on: https://code.wireshark.org/review/7353
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I516c2a2f0c27fcf101671527d4e4f018e17d3025
+    Reviewed-on: https://code.wireshark.org/review/10189
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 2a31311
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 13:21:51 2015 -0800
+commit ee80be6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 21 17:12:39 2015 -0700
 
-    Have PACKET_DESCRIBE() for V10.
+    Add the display filter macros dialog.
     
-    Have it set the record type and initialize the presence bits.
+    Add some missing functionality to UatDialog.
     
-    That makes it a bit more like V2x and V3x, and makes the code slightly
-    less unclear.
+    Remove what appears to be unused dfilter macro code.
     
-    Change-Id: Ibfbe2143b24a68c3fa3f576616fde81918b01feb
-    Reviewed-on: https://code.wireshark.org/review/7351
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8a8d6358523f24d5ddfe953d7741fe9af25d98eb
+    Reviewed-on: https://code.wireshark.org/review/10187
+    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 fe5aea7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 13:02:31 2015 -0800
+commit 97014f6
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sat Aug 22 05:43:46 2015 +0400
 
-    Move the setting of rec_type.
-    
-    This makes the code slightly less unclear.  (You are in a maze of twisty
-    little C macros, all different.)
+    OSPF database packets and OSPF hellos in DC mode are unicast. At
+    least Cisco sends out these packets with a TTL of 1.
     
-    Change-Id: I9f1bcc7a9a1a7afe87ede8b1ba513e3d8e53845c
-    Reviewed-on: https://code.wireshark.org/review/7349
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I9ef0cd486d200a768329cfb758b87e20e3456663
+    Reviewed-on: https://code.wireshark.org/review/10188
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit ced6fba
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 24 19:34:37 2015 +0000
+commit 74177d9
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 21 15:02:20 2015 -0700
 
-    Revert "exntest: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang"
+    Statistics dialog fixups.
     
-    This reverts commit f9fc25241ca0c735c0945bebf04669f17c3ffbff.
+    Fix the "retap on show" behavior in TapParameterDialog. It was filling
+    in the tree when it shouldn't have.
     
-    Apparently, clang is wrong about those increments being dead, as the tests done by exntest fail as a result of this change. Perhaps it doesn't understand setjmp/longjmp.
+    Set the capture stop flag when WiresharkDialog closes.
     
-    Change-Id: I248fba972e52bcbc97a228777139ca22a835f4b6
-    Reviewed-on: https://code.wireshark.org/review/7347
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I5e85f11cab32e8b958deabb58186a855b5fcaa84
+    Reviewed-on: https://code.wireshark.org/review/10186
+    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 c280a40
+commit a66a95c
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 24 10:31:29 2015 -0800
+Date:   Fri Aug 21 08:46:43 2015 -0700
 
-    Qt: Escape ampersands in checkboxes and radio buttons.
+    Add packet comments to the properties dialog.
     
-    Convert "&" to "&&" in checkbox and radio button preference labels so
-    that they aren't interpreted as shortucts. Fixes
+    This pulls in missing functionality from the comment summary dialog.
     
-    QKeySequence::mnemonic: "Attempt to dissect LCID 1&2 as srb1&2" contains multiple occurrences of '&'
-    
-    Change-Id: Iacab6f81db01e6eca2cfdbaeda666f2e9c1016ed
-    Reviewed-on: https://code.wireshark.org/review/7346
+    Change-Id: Ib417896a6e8f2b2f903520b26193c249677bbb83
+    Reviewed-on: https://code.wireshark.org/review/10185
+    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 c0c6278
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Tue Feb 24 10:15:47 2015 +0100
+commit 95c8b01
+Author: Bill Parker <wp02855@gmail.com>
+Date:   Fri Aug 21 15:24:41 2015 +0200
 
-    openSAFETY: Remove Macro and clear dissection
+    [echld common] Call to fcntl() missing a test for a return value < 0,
+    indicating failure.
     
-     Removing the macros for packet sender/receiver as it makes
-     the code hard to read and maintain. the more generic routine
-     opensafety_packet_node is also used for displaying the time
-     request sender and recipient.
+    Bug: 11056
     
-     Also clearing up the message id field, as it is the wrong size
-     and making the detection for the value an hf_field with an
-     array value.
-    
-    Change-Id: I31cf0f944fe803fb503f4c5d29e106dfae0f6938
-    Reviewed-on: https://code.wireshark.org/review/7344
-    Reviewed-by: Roland Knall <rknall@gmail.com>
+    Change-Id: I87aef31d874224f38226df1725cc29d13ad16b54
+    Reviewed-on: https://code.wireshark.org/review/10182
     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 30ed6a1
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 18 17:18:27 2015 -0800
+commit d32c3da
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Fri Aug 21 11:59:34 2015 -0400
 
-    Qt: Apply recent settings.
-    
-    Add PacketList::applyRecentColumnWidths which set the packet list
-    column widths from our recent settings. Make sure it gets called at
-    startup and when we change profiles.
-    
-    Save the packet list header state so that we can restore it when we
-    reset the model (i.e. freezing and thawing) and load a new capture file.
-    Save the state when the user resizes a column. As a side effect this
-    works around a weird bug that adjusts the width of column 1 at an
-    inopportune time.
+    Lua: check sscanf return value
     
-    Add a profileChanging signal so that we can save the main window geometry
-    in each profile.
+    Wslua's Int64.fromhex() and UInt64.fromhex() need to check the sscanf return
+    value. Found by coverity (CID 1191368 &1191369).
     
-    Get rid of MainWindow::configurationProfileChanged. It was unused.
+    Change-Id: I67fba027e18341d429787515f94c794573dc41c2
+    Reviewed-on: https://code.wireshark.org/review/10183
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit dd2a2d4
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 21 09:45:48 2015 -0700
+
+    Multicast and wireless lan statistics fixups.
     
-    Apply saved pane widths and heights. Note that we might want to add a
-    separate pair of recent settings for the Qt panes.
+    Make sure "-z multicast,stat[,filter]" and "-z wlan,stat[,filter]" work.
     
-    Use the last opened directory in the capture file dialog.
+    Add some missing "-z" items to the man page.
     
-    Git rid of some unneeded Q_UNUSEDs while we're here.
+    Try to fix some MSVC++ warnings.
     
-    Bug: 10953
-    Change-Id: I812aff59818cf0b4d1598b580627d32728d2e9d7
-    Reviewed-on: https://code.wireshark.org/review/7247
-    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: Ie18e5355d595e351f000f14d82781dcdf33141c3
+    Reviewed-on: https://code.wireshark.org/review/10184
+    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: Gerald Combs <gerald@wireshark.org>
 
-commit f9fc252
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 19 22:41:32 2015 +0100
+commit 69ec4a5
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 08:45:49 2015 +0100
 
-    exntest: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Add "ip.version" field to bogus IP for filter matching
     
-    Change-Id: I91ec67e8c2168dd9a93c3894abdf304c0a75845d
-    Reviewed-on: https://code.wireshark.org/review/7263
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ibb05b8742e41c1b16c1335ad97af99324ab95223
+    Reviewed-on: https://code.wireshark.org/review/10175
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit b125fea
-Author: Daniel Mack <daniel@zonque.org>
-Date:   Tue Feb 24 09:32:38 2015 +0100
+commit f8712ae
+Author: Bill Parker <wp02855@gmail.com>
+Date:   Fri Aug 21 15:13:16 2015 +0200
 
-    epan: fix build error with gcc5
-    
-    gcc5 bails out with the below error.
+    [Kerberos] Call to 'fseek()' without a check for a return value < 0,
+    indicating failure.
     
-      CC       libwireshark_la-tvbparse.lo
-      CC       libwireshark_la-tvbuff_base64.lo
-    tvbparse.c: In function 'cond_not_char':
-    tvbparse.c:254:18: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses]
-         if (! offset < tt->end_offset ) {
-                      ^
-    cc1: all warnings being treated as errors
-    Makefile:1843: recipe for target 'libwireshark_la-tvbparse.lo' failed
+    Bug: 11056
     
-    Change-Id: I4e8654e97079da6b39be580fc766eecefb4c7ea6
-    Reviewed-on: https://code.wireshark.org/review/7339
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iaa6b7ca07626b78c77e3c1507726ec579764a582
+    Reviewed-on: https://code.wireshark.org/review/10181
+    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 4ee6bcb
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Feb 21 18:43:14 2015 +0100
+commit 856bab6
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Wed Aug 19 10:42:59 2015 +1000
 
-    websocket: avoid recursion, use tcp_dissect_pdus
+    LWM: fix compilation without libgcrypt
     
-    Use tcp_dissect_pdus to handle reassembly and avoid a recursion in
-    dissect_websocket. The HTTP dissector is modified to preserve
-    desegmentation functionality (tested with the capture from bug 8448).
+    Add HAVE_LIBGCRYPT compilation guards.
+    Move gcrypt-related variables into the scope they're used.
     
-    As tcp_dissect_pdus is used now, the workaround for bug 8448 can be
-    removed and the actual frame dissection logic becomes simpler (the
-    length is checked in get_websocket_frame_length).
-    
-    Bug: 10989
-    Change-Id: I67af96a6c7be88c2a77e1c4138abe90bdb880774
-    Reviewed-on: https://code.wireshark.org/review/7285
+    Change-Id: I81a2c8a54514fb51de53640fa8eceeddb2bf24d9
+    Reviewed-on: https://code.wireshark.org/review/10118
+    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 c466d40
-Author: ranushekhar <ranushekhar@gmail.com>
-Date:   Mon Feb 23 18:17:33 2015 +0530
+commit b5ca69b
+Author: Dave Rigby <daver@couchbase.com>
+Date:   Thu Aug 20 16:05:57 2015 +0100
 
-    NS Trace (NetScaler Trace) file format is not able to export specified packets
+    Couchbase: dissect sub-document commands
     
-    Bug: 10998
-    Change-Id: Ic2c5ad5b01be3e0c39b1e93badcc4f2246c420fe
-    Reviewed-on: https://code.wireshark.org/review/7327
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Add support for dissecting Couchbase sub-document commands (those
+    which operate on a subset of a whole document).
+    
+    Example pcap file:
+      https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=couchbase_subdoc_multi.pcap
+    
+    Change-Id: I5394a6f86c036ebd339574bac4e52f7d0821e4bf
+    Reviewed-on: https://code.wireshark.org/review/10151
+    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 30651ab
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 22 12:43:25 2015 +0100
+commit d097968
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 03:10:10 2015 +0100
 
-    DNS: Ignore Client Subnet option's data length when > 16
+    Make IPv6 extension header protocol names uniform and consistent with RFC 2460
     
-    When DNS Client Subnet length is > 16, the limit coming from avoid stack smashing with tvb_memcpy
+    Example from RFC 2460 (page 7):
     
-    Issue reported by Boaz
+      IPv6 header
+      Hop-by-Hop Options header
+      Destination Options header (note 1)
+      Routing header
+      Fragment header
+      Authentication header (note 2)
+      Encapsulating Security Payload header (note 2)
+      Destination Options header (note 3)
     
-    Bug:10988
-    Change-Id: I6103ba47fac9817410c7fc399c18e96c66ab8438
-    Reviewed-on: https://code.wireshark.org/review/7308
+    Change-Id: I03c1ebedf581f71047b303856052609574110c61
+    Reviewed-on: https://code.wireshark.org/review/10173
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b9af5a5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Feb 23 16:50:18 2015 +0100
+commit 30ce20d
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 21 13:54:53 2015 +0200
 
-    proto.c: avoid corrupting stack when printing a 64 bits field in BASE_DEC_HEX or BASE_HEX_DEC format
+    [Expert] Enhance error output to identify the duplicated field.
     
-    Bug: 10994
-    Change-Id: Id5049054d5b04838df325f03a6bfa238a2063fb7
-    Reviewed-on: https://code.wireshark.org/review/7329
-    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: Ie38f51e2fa0f846dbcfd7a19f29eac1bd07cffbc
+    Reviewed-on: https://code.wireshark.org/review/10179
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 770ac91
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Feb 22 14:56:38 2015 -0800
+commit f73e1c2
+Author: Peter Lemenkov <lemenkov@gmail.com>
+Date:   Thu Aug 13 18:13:45 2015 +0300
 
-    Qt: Fix a crash when changing the layout.
+    Allow redefining all ports for RADIUS
     
-    Freeze and thaw the packet list when changing the layout. This has the
-    side effect of clearing the proto tree and byte view, which avoids
-    reading a bad tvb pointer. Note that we might want to add a cleanup
-    callback to free_data_sources.
+    RADIUS configuration sometimes uses more ports - for example, one for
+    authentication, another one for accounting. Sometimes it uses the entire
+    port ranges. In case of FreeRADIUS 2.x.x server it might look like this:
     
-    Save and restore the current row. Add CaptureFile::currentRow. Fix a
-    couple of comparisons in PacketList.
+    ...
+    listen {
+            type = auth
+            ipaddr = *
+            port = 13812
+    }
+    listen {
+            type = acct
+            ipaddr = *
+            port = 13813
+    }
+    ...
     
-    Change-Id: I26f9b97ae5a7cdb4fb6e5e6e675570884900e995
-    Reviewed-on: https://code.wireshark.org/review/7337
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a6f4bdb
-Author: Daniel Mack <daniel@zonque.org>
-Date:   Tue Feb 24 00:50:19 2015 +0100
-
-    pcap-common: fix build error with gcc5
+    Unfortunately we allow only one port to be redefined, not more. So it
+    forces a person who's analyzing a traffic from such a RADIUS server
+    manually select "Decode as" every time for each port.
     
-    gcc5 complains about the issue below, so add a trivial fixup.
+    It was requested at least once to lift this limitation:
     
-      CC       libwiretap_la-pcap-common.lo
-    pcap-common.c: In function 'pcap_byteswap_nflog_pseudoheader':
-    pcap-common.c:1290:30: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses]
-      if (!(nfhdr->nflog_version) == 0) {
-                                  ^
-    cc1: all warnings being treated as errors
+    * https://ask.wireshark.org/questions/2189/decode-multiple-ports-as-radius
     
-    Change-Id: I9f5b090ffd564f203cc3fb4ff302f2e4752865f0
-    Reviewed-on: https://code.wireshark.org/review/7336
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5e34492
-Author: unknown <drkor@hotbox.ru>
-Date:   Mon Feb 23 21:19:30 2015 +0300
-
-    BSSMAP: VGCS/VBS Assignment Request wrong first parameter
+    So let's fix it!
+    
+    With this commit it's possible to set a port ranges for RADIUS dissector
+    to handle. An example (default) configuration looks like (see
+    ~/.wireshark/preferences):
     
-    According to specification first mandatary parameter is Channel Type (BE_CHAN_TYPE)
-    but not Current Channel Type 1 (BE_CURR_CHAN_1).
-    And also "Channel Type" is TLV but not TV type.
+    radius.ports: 1645,1646,1700,1812,1813,3799
     
-    Change-Id: I740dc10930a854fcb1cf2e09a19d57a16f8cf33e
-    Reviewed-on: https://code.wireshark.org/review/7330
+    Old "alternate_port" preference is marked as obsolete. It won't be shown
+    to a user but it will still be used if exists (remained from a previous
+    installations).
+    
+    *Ver. 2*:
+    Old alternate_port value is copied to the ports range, thus making
+    transition even more smooth.
+    
+    Change-Id: Ibdd6f4f9fa1e0ac186147cec380bbfc62d509b17
+    Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/10015
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4a07667
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 23 12:51:23 2015 -0800
+commit 7d59925
+Author: Timo Warns <timow+github@DiningPhilosopher.DE>
+Date:   Fri Jul 31 22:30:16 2015 +0200
 
-    Get rid of no-longer-needed variables.
+    SSL: refine KEX handling and fix _anon KEX dissecting
     
-    Change-Id: I2758c4f57fdaaa61c1d73ca9b5ccaf427599a624
-    Reviewed-on: https://code.wireshark.org/review/7332
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Dissecting client and server KEX messages requires to precisely distinguish KEX
+    algos. For example, Server KEX for DH_anon do not contain a signature, while
+    DHE_DSS and DHE_RSA do. The patch introduces KEX distinction with full
+    precision and fixes dissecting _anon KEX messages.
+    
+    Change-Id: I0bcd5e2bf899ba9cac79476d5b7a1ffb3accf0db
+    Reviewed-on: https://code.wireshark.org/review/9836
+    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 2899cf4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 22 18:59:43 2015 -0800
+commit 8d5ac86
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 21 10:43:27 2015 +0200
 
-    Don't add redundant information to the top-level flags item for NBNS.
-    
-    We already add the opcode, a "this is a response" indication for
-    responses and, for non-WACK responses, the response code.  No need to
-    add it again.
+    Try to fix: wlan_statistics_dialog.cpp:466:1: error: unused parameter \91filter\92 [-Werror=unused-parameter]
     
-    Change-Id: I2dd0f937568057a96cd70511c872f811ea838106
-    Reviewed-on: https://code.wireshark.org/review/7331
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib9b2fe245b126f9413dbdcced94c61eacf4d1c5d
+    Reviewed-on: https://code.wireshark.org/review/10177
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 255de16
+commit eeafab5
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Feb 23 14:50:28 2015 +0100
+Date:   Thu Aug 20 15:06:41 2015 +0200
 
-    RSVD: add missing initialization of lun parameter
+    file-pcapng: always set pinfo->fd->num before calling next layer dissectors/file-pcapng
     
-    Bug: 10993
-    Change-Id: I0232cf616f880a02d50f20c67d9f76a642153737
-    Reviewed-on: https://code.wireshark.org/review/7328
+    Also fix an off by 1 error for EPB case
+    
+    Change-Id: I895d82a58ec02c577dcaa67a97d456b42460b947
+    Reviewed-on: https://code.wireshark.org/review/10149
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 9667666
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Feb 23 13:05:46 2015 +0100
+commit 5e3388f
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 19:39:26 2015 +0200
 
-    ui/gtk: use GTK+ 2 name for control keys
+    GSM_map: Fix indent (use 2 spaces) and add modelines
     
-    The GDK_KEY_* names are part of GTK+ 3, GTK+ 2 does not have the _KEY_
-    infix. See
-    https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html#id-1.6.3.3.6
+    Change-Id: I1549eb55e1fa87c46e2493c37f3ed352970b794b
+    Reviewed-on: https://code.wireshark.org/review/10168
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 8055786
+Author: Paul Emge <paul.emge@digidescorp.com>
+Date:   Thu Aug 6 11:00:22 2015 -0500
+
+    Fix bug with MVRP dissection where only one message was dissected.
     
-    Fixes regression from "ui/gtk: fix control combos such as ctrl-a,
-    ctrl-c".
+    Fix whitespace and replace tvb_captured_length with tvb_reported_length
     
-    Change-Id: I4d470212d172f978c171e54ff7377ddc211817ac
-    Reviewed-on: https://code.wireshark.org/review/7325
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Change-Id: I3952e7a1ac00b68e6f6eb1283977bc6299b0baaf
+    Reviewed-on: https://code.wireshark.org/review/9900
+    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 d488d63
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 18 20:06:57 2015 +0100
+commit a5fe54d
+Author: Pascal Artho <pascalartho@gmail.com>
+Date:   Tue Aug 18 08:44:37 2015 +0200
 
-    ssl-utils: refactor keyfile matching
+    Preparation Host Flows: Syntax Line Edit (allow longer filter text)
     
-    Merge the three separate regexes into a single pattern and use named
-    groups. This avoid magic numbers (group positions) and removes a
-    possible error source when the ht array gets out of sync with the
-    patterns array (by human error).
+    The "Syntax Line Edit" is based on "QLineEdit". By default, the maximum
+    permitted length of a QLineEdit text is 32767 (16 bits).
     
-    This is supposed to be more readable and allows for easier extension of
-    the regex.
+    As the "Host Flows" extension uses the Wireshark filter syntax to filter
+    the data, the filter can be become large. To avoid errors, I increased
+    the maximum permitted length value to the maximum of quint32.
     
-    Change-Id: I816525f358cdb89ff9f8ebc1211139b1f8c23840
-    Reviewed-on: https://code.wireshark.org/review/7245
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Change-Id: I756efa76e1fc84449caef8fea368e6e38e776235
+    Reviewed-on: https://code.wireshark.org/review/10099
+    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 306c819
+commit 0310e5a
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 19 22:32:31 2015 +0100
+Date:   Thu Aug 20 23:03:01 2015 +0200
 
-    jmirror packet dissector expects ipv6 flow label = 0
-    
-    When the ipv6 flow label is non-zero the dissector does not detect the payload as being ipv6.
+    gsm map summary (GTK): fix no previous prototype for ‘gsm_map_stat_gtk_sum_cb’ [-Wmissing-prototypes]
     
-    Issue reported by Shehan Perera
+    Change-Id: Ic97434112bc71202354004626ba51e1a22c39abf
+    Reviewed-on: https://code.wireshark.org/review/10165
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit aec8e93
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 22:08:18 2015 +0200
+
+    SPDY: fix no previous prototype for 'dissect_spdy_heur' [-Wmissing-prototypes]
     
-    Bug:10976
-    Change-Id: I1de4966dfefd1afa9bb51b9a7570091aad59fbdd
-    Reviewed-on: https://code.wireshark.org/review/7260
+    Change-Id: Ife5f44a333227b1df3d2377d12dbec65a4b4d5c3
+    Reviewed-on: https://code.wireshark.org/review/10164
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4c994e3
-Author: Jeroen Sack <jeroen@jeroensack.nl>
-Date:   Sun Feb 22 21:37:42 2015 +0100
+commit 8f0fc4b
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 19:34:47 2015 +0200
 
-    L2CAP information message contained two bits that were wrongly dissected.
+    GSM/ANSI/CAMEL...: fix no previous prototype for '*_stat_init' [-Wmissing-prototypes]
     
-    Change-Id: I308b6ed1a3953676212b9c0bb6cd7fc180210534
-    Reviewed-on: https://code.wireshark.org/review/7323
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I0aedefbb77899ebceac7fb08249faf47964d785b
+    Reviewed-on: https://code.wireshark.org/review/10163
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6765bf7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 22 18:50:50 2015 -0800
+commit fab0e59
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Thu Aug 20 14:38:35 2015 -0400
 
-    Fix generation of address-with-resolution strings.
+    Fix memory leaks of dumper SHB and IDB infos
     
-    XXX_to_str routines should return the length, in bytes, of the generated
-    string, including the terminating '\0'.
+    Change-Id: I6b81d3e853d503c6a81f9793957b48ab34c6808c
+    Reviewed-on: https://code.wireshark.org/review/10156
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit b4762a0
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Aug 12 13:57:20 2015 -0400
+
+    Generate Diameter's expert info's even when there's no tree so that they show
+    up in the Expert Infos dialog.
     
-    As their reutrn values include the terminating '\0', we need to subtract
-    1 from the return value if, when appending the ")" after the address
-    string, we want to skip past the address string rather than skipping
-    past the terminating '\0'.
+    Push the if(tree) check down into the basic type dissectors since we can't
+    generate/fill the label (which won't be used anyway) when we're not building
+    the tree (since the proto_item will be faked/NULL).
     
-    Change-Id: Ibfd41e6d7152d05070706e6d76fc3e56a097a75b
-    Reviewed-on: https://code.wireshark.org/review/7324
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ie4f1f6856cfad0dabc7c58cdee2c16c8fc032c6d
+    Reviewed-on: https://code.wireshark.org/review/10001
+    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 1c4053f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 19 22:38:45 2015 +0100
+commit dc4e960
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Aug 20 11:00:17 2015 -0400
 
-    BMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Add some Gx AVPs from 3GPP 29.212.
     
-    Change-Id: I322be0953ce8c872f8464c3e095dfe9006d3b67b
-    Reviewed-on: https://code.wireshark.org/review/7261
+    Change-Id: Iaf2cc67d4d235193b25045895441742bc6531370
+    Reviewed-on: https://code.wireshark.org/review/10150
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b9296b7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 22 12:21:47 2015 -0800
+commit 71e08dd
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 18 13:34:30 2015 +0200
 
-    Fix handling of longitude and latitude values.
+    lemonflex: fix warning: no previous prototype for 'df_scanner_*' [-Wmissing-prototypes]
     
-    The formatting routine is getting passed the 5-byte value, not some
-    8-byte value that includes the 3 bytes after it, so shifting it produces
-    the wrong value.
+    lemonflex-tail.inc:44:1: warning: no previous prototype for 'df_scanner_text' [-Wmissing-prototypes]
+    lemonflex-tail.inc:50:1: warning: no previous prototype for 'df_scanner_file' [-Wmissing-prototypes]
+    lemonflex-tail.inc:59:1: warning: no previous prototype for 'df_scanner_cleanup' [-Wmissing-prototypes]
     
-    Make the longitude and latitude FT_UINT40, as they're only 5 bytes long.
-    
-    Change-Id: I35aa05887bcfdfc1107fef2ac5069f1fe96fda3a
-    Reviewed-on: https://code.wireshark.org/review/7321
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: If0476b430592df225234c5c685c8009ab08b5ab6
+    Reviewed-on: https://code.wireshark.org/review/10162
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 08bee7d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 22 12:04:48 2015 -0800
+commit a70f591
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 23:16:04 2015 +0200
 
-    Clean up display of raw hex latitude/longitude values.
-    
-    1) It's only 40 bits long, so show only 10 hex digits.
+    proto_dlg: fix no previous prototype for ‘heur_*_all_cb’ [-Wmissing-prototypes]
     
-    2) If you're putting "0x" before the number, blank-padding on the left
-       looks weird; use zero-padding.
+    Change-Id: I330ec2cee965f8cc3128c4a7bf794e52581ac290
+    Reviewed-on: https://code.wireshark.org/review/10166
+    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 d9395b7
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 03:54:36 2015 +0100
+
+    Rename 'ip_next_header_dissector_table' to 'ipv6_next_header_dissector_table' in IPv6 dissector
     
-    3) Fix unbalanced parentheses.
+    Provides better readability, the dissector table is only used for IPv6
+    extension headers.
     
-    Change-Id: I76aedb1fb82f699ee08102b97b0d72e09d8c5917
-    Reviewed-on: https://code.wireshark.org/review/7320
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I87d877a89c6465d4475f2f0a40636ccd1b6cdd92
+    Reviewed-on: https://code.wireshark.org/review/10174
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 066ae91
+commit 56d131c
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 22 11:54:56 2015 -0800
+Date:   Thu Aug 20 17:06:04 2015 -0700
 
-    Put back address family field.
+    There is no wlan_statistics_dialog.ui.
     
-    Change-Id: I89d60f78a0c834663c426f5ec50c6033ba9f99e1
-    Reviewed-on: https://code.wireshark.org/review/7318
+    Change-Id: Ibedb3904cbab88ebae3bc9ec1588263af933dfc1
+    Reviewed-on: https://code.wireshark.org/review/10172
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 99ff8ba
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 22 11:24:33 2015 -0800
+commit 2ed3d91
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 18 11:46:12 2015 -0700
 
-    Use file extensions even more as a heuristic.
+    Add the WLAN statistics dialog.
     
-    If a file type has a list of "typical" extensions, and a file has an
-    extension that is *not* one of those extensions, the file is unlikely to
-    be of that type.
+    Instead of splitting the stats into two lists as with the GTK+ UI, add
+    everything to an expandable tree. This allows viewing nodes on more than
+    one network.
     
-    For files that have extensions, after we try the heuristics that have a
-    list of "typical" extensions that includes the file's extension, try the
-    heuristics that have no such list, and after that try the heuristics
-    that have such a list but where the list *doesn't* include the file's
-    extension.
+    Rename the top-level Bluetooth menu item to Wireless and put the WLAN
+    stats dialog there.
     
-    This fixes, for example, some cases where non-PacketLogger files were
-    getting identified as PacketLogger files.
+    The Qt UI matches SSIDs (WlanNetworkTreeWidgetItem::isMatch) a bit
+    differently than the GTK+ UI. Try to make the logic as plain as possible
+    since we'll likely have to update it in the future.
     
-    Change-Id: I2d8c3b983ed6ccd692beb888668f77eb9b5f437b
-    Reviewed-on: https://code.wireshark.org/review/7315
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 73508e8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Feb 22 08:05:29 2015 -0800
-
-    [Automatic manuf, services and enterprise-numbers update for 2015-02-22]
+    The addition of a custom BSSID address types means that we can't assume
+    that everything is AT_ETHER. Add routines for checking for broadcast
+    BSSIDs and comparing only the data portions of addresses.
     
-    Change-Id: Ida0ae626be0753c05435f3828d5137863309ebf1
-    Reviewed-on: https://code.wireshark.org/review/7309
+    Move PercentBarDelegate into its own module. Use it in
+    WlanStatisticsDialog.
+    
+    Change-Id: Ie4214eb00671a890871380c4a07213ebfb7585c6
+    Reviewed-on: https://code.wireshark.org/review/10171
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit d1865e0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 22 00:56:00 2015 -0800
+commit 0f9bbbc
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 22:56:56 2015 +0200
 
-    Make FT_{U}INT{40,48,56,64} handle BASE_CUSTOM.
+    BOOTP: fix indent (use tab)
     
-    Finish the job of handling integral values > 32 bits similarly to who we
-    handle values 32 bits or less.
+    Change-Id: I32ea4d1b9cd8aa351cbdb2bab0642e4ed0c191fb
+    Reviewed-on: https://code.wireshark.org/review/10169
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+
+commit b07ae6c
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 22:02:50 2015 +0200
+
+    ANSI: Add modelines
     
-    In cases that "should not happen", and where we might *not* be executing
-    in the context of a dissector (filling in the field label can be done
-    lazily, being deferred to "print" time, and that doesn't happen in the
-    context of a dissector), use g_assert_not_reached() rather than
-    DISSECTOR_ASSERT_NOT_REACHED() - the latter throws an assertion that's
-    not caught if we're not doing dissection, so we crash anyway.
+    Change-Id: I641a9525ec5a6315cc4a2d97506a885605b3504b
+    Reviewed-on: https://code.wireshark.org/review/10170
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+
+commit 4dd49c5
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 21:38:19 2015 +0200
+
+    Camel: Fix indent (use 2 spaces) and add modelines
     
-    Bug: 10983
-    Change-Id: Ia81a0a4925394f99aa35193a333f3e9659a9b93d
-    Reviewed-on: https://code.wireshark.org/review/7307
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I6fe835e78e58faabd5cfeeb84e39793b48d3df25
+    Reviewed-on: https://code.wireshark.org/review/10167
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 1157aa8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 23:26:06 2015 -0800
+commit 648fe94
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 07:48:58 2015 +0200
 
-    Set 64-bit signed values with proto_tree_set_int64().
+    Translations: fix typo
     
-    As in "don't set it with proto_tree_set_uint64(), signed vs. unsigned
-    matters".
+    coversation => conversation
     
-    Change-Id: I23ef3d172fa40c0867dfb6a078ce292bd5282170
-    Reviewed-on: https://code.wireshark.org/review/7306
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Found by s3erios (Ukrainian translator)
+    
+    Change-Id: Iaecb4e139d049c212956fa8567ee480d2f2aa0d2
+    Reviewed-on: https://code.wireshark.org/review/10152
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 2196378
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 19:45:08 2015 -0800
+commit c4b93e9
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 20 11:54:04 2015 -0700
 
-    Fetch values appropriately according to the value's type.
+    CMake: Fixup appending to WS_WIN_LIBS
     
-    This fixes some crashes.
+    In the world of CMake calling "set" with multiple values creates a
+    semicolon-separated list. For WS_WIN_LIBS we want a single string so we
+    need to call "set" with a single, quoted value.
     
-    Change-Id: I47583777486486114675ba98cb58971adb8b1b10
-    Reviewed-on: https://code.wireshark.org/review/7305
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I96c5085af58adfb97ce16195eb27cc8ddb612d6a
+    Reviewed-on: https://code.wireshark.org/review/10158
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 8d5da72
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Feb 14 18:01:53 2015 -0500
+commit e67098c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 20 11:39:02 2015 -0700
 
-    Add tvb_address_with_resolution_to_str.
+    Squelch recent display filter warnings.
     
-    Convert dissectors to using the API where appropriate.
+    Try to keep the main display filter editor from emitting warnings when
+    we populate the recent item list.
     
-    Change-Id: I059582f73a75635d4a0338d02d4c4b212162480b
-    Reviewed-on: https://code.wireshark.org/review/7296
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ib0c150093e03d4d2ca2ac6cd72c0e37d041fe98b
+    Ping-Bug: 11438
+    Reviewed-on: https://code.wireshark.org/review/10157
+    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit ddafa7e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 14:53:39 2015 -0800
+commit 36a74cb
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 20 08:56:04 2015 -0700
 
-    Update Debian symbols list.
+    Tap parameter and stats dialog fixups.
     
-    Change-Id: Iaf5d8022f2005ac32133896c74f45246a2310684
-    Reviewed-on: https://code.wireshark.org/review/7303
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    If we run into an error when trying to register a tap listener, return
+    instead of tapping packets. This should fix some (but likely not all)
+    double frees found by Stig. For now close each statistics dialog if we
+    find an error. Note that we might want to keep them open instead.
+    
+    Add checks and cleanups to some of the stats table free routines.
+    
+    Call fillTree once in TapParameterDialog's constructor instead of each
+    time it's shown. Make fillTree a slot which lets us use a delay timer so
+    that the dialog is visible when we retap packets.
+    
+    Change-Id: Id49f2f2a99bc8e5b1d32990024986b3c8b1abe24
+    Reviewed-on: https://code.wireshark.org/review/10153
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit bfb4327
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 12:39:00 2015 -0800
+commit 37a737f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 20 10:05:39 2015 -0700
 
-    Remove tvb_ from the names of wsutil mempbrk routines.
+    Make sure we can apply deprecated display filters.
     
-    Routines that don't take a tvbuff as an argument shouldn't have tvb_ in
-    the name.
+    Deprecated filters are still valid. Update display filter checks to make
+    sure we can apply them.
     
-    Change-Id: I3550256551e30b3f329cbbfca71ef27c727d29c0
-    Reviewed-on: https://code.wireshark.org/review/7302
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 11438
+    Change-Id: Ib5e009c070b40912434e0ffd771203ed1e1ba093
+    Reviewed-on: https://code.wireshark.org/review/10154
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit f3a68f0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 12:17:30 2015 -0800
+commit 829c648
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 17 01:38:00 2015 +0100
 
-    Rename the slower-but-portable mempbrk to ws_mempbrk_portable_exec().
-    
-    That parallels ws_mempbrk_sse42_exec().
+    Check for IP version errors in dissect_ip()
     
-    Change-Id: I1662badc6d1efab5bdd827f29bbad3712464ec43
-    Reviewed-on: https://code.wireshark.org/review/7301
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I7db4ed54be820e5667e1e93880013cc7abf95256
+    Reviewed-on: https://code.wireshark.org/review/10064
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit e35aa1f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 12:13:54 2015 -0800
+commit ba69473
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Thu Aug 20 08:48:46 2015 -0400
 
-    Move declarations of internal ws_mempbrk routines to a separate header.
+    Link setargv.obj for Windows in CMake so mergecap works
     
-    Put the internal routines, which are only to be used by the
-    implementation of the mempbrk functions, to a separate header file, so
-    that they're not exported even in the standard header file.
+    Try it again.
     
-    Change-Id: I92c39b138de3e4f9da1b102210b39d50728e2fd6
-    Reviewed-on: https://code.wireshark.org/review/7300
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I511dd3d7d70fa33e246085c8cb79925e92945ebc
+    Reviewed-on: https://code.wireshark.org/review/10148
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit f12d231
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 12:07:21 2015 -0800
+commit 7249791
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 13:00:24 2015 +0200
 
-    More wrapping of constants with G_GUINT64_CONSTANT().
+    pcapng: Fixed copying if_filter_bpf_bytes
     
-    Change-Id: I11771b08cc4e57692c42dd3fc8976fe390b3025d
-    Reviewed-on: https://code.wireshark.org/review/7299
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 11455
+    Change-Id: Ic99ff1bcd7dad65b3ade5a9f46ce0f64573cb059
+    Reviewed-on: https://code.wireshark.org/review/10147
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit f868da2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 11:43:08 2015 -0800
+commit 8a71867
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Aug 19 21:47:50 2015 +0100
 
-    Update Debian symbols file.
+    UDP jumbogram expert info fix
     
-    Change-Id: Ide84741afffbd7c8c6dac44cf456291e2609af9d
-    Reviewed-on: https://code.wireshark.org/review/7298
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ifa6170622bc8331097bc3fe9c567c97ce826c340
+    Reviewed-on: https://code.wireshark.org/review/10140
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0808fc0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 11:40:39 2015 -0800
+commit bc8b94d
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:57:25 2015 +0200
 
-    64-bit constants need to be wrapped in G_G{U}INT64_CONSTANT().
+    file-pcapng: differentiate captured length and reported length when calling next dissector and catch bound errors
     
-    Otherwise, they don't get the right suffix to tell the compiler that
-    they're 64-bit even on ILP32 platforms.
+    Otherwise dissection will fail when analyzing a capture with a snap length set
     
-    Change-Id: I5c52a999d21707602e0a4174a142d1d1036242be
-    Reviewed-on: https://code.wireshark.org/review/7297
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: If6714364efffdd1fbf88c947743929a71f75c663
+    Reviewed-on: https://code.wireshark.org/review/10135
+    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 1694e81
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 21 11:35:08 2015 -0800
+commit ff78d0a
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:54:47 2015 +0200
 
-    The shortening to 32 bits is intentional, so add a cast.
+    file-pcap: differentiate captured length and reported length when calling next dissector and catch bound errors
     
-    The cast reassures the compiler that we do, in fact, know what we're
-    doing, so it doesn't issue a warning.
+    Otherwise dissection will fail when analyzing a capture with a snap length set
     
-    Change-Id: Ie3bc4e1c955f9c5cad5506e26fc72e12f7a8f854
-    Reviewed-on: https://code.wireshark.org/review/7295
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I764f48c624d0cc411b04ee62f8ecccaf6abb6f0c
+    Reviewed-on: https://code.wireshark.org/review/10134
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ffeadb7
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Jan 22 12:27:23 2015 +0100
+commit 2046368
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:48:46 2015 +0200
 
-    Bluetooth/GUI: ATT: Use alphabetical order in makefile
+    file-pcapng: fix dissection of options in blocks
     
-    Change-Id: Ia34dd6b783a1c8214956166b07ffb1537f04aa1d
-    Reviewed-on: https://code.wireshark.org/review/7291
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    - fix the loop logic
+    - flags in EPB include link-layer-dependent errors
+    
+    Change-Id: Iae0b4869b556abbf3c14f3b865d0f23cee182c84
+    Reviewed-on: https://code.wireshark.org/review/10132
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit b8388c6
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Feb 5 11:57:27 2015 +0100
+commit bc777f9
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 10:29:03 2015 +0200
 
-    Ftypes: Double: Minor fixes
-    
-    Fix comments typos and use safe equivalent of sprintf.
+    Added a missing break
     
-    Change-Id: Icc9d69532dc35e8a58a78c0eacdb42214b679069
-    Reviewed-on: https://code.wireshark.org/review/7290
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: Ia04a112d8df195e271dc11565750a6e28bd7f0c9
+    Reviewed-on: https://code.wireshark.org/review/10146
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 9ad00fd
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Feb 14 18:49:36 2015 +0100
+commit 950f1dd
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 19 15:38:10 2015 +0200
 
-    Qt: Fix for QT < 4.8
+    IO Graphs: Don't show unchecked graphs in legend
     
-    QApplication::queryKeyboardModifiers() was introduced in 4.8.
-    Try to be compatibile with my old Qt 4.7.2.
-    
-    Change-Id: Ie4abdd397cf2f10bb50132b09fed198d30425ee7
-    Reviewed-on: https://code.wireshark.org/review/7289
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I0a9c4d967ee03a0a8dfc93f87dbe38e4e3a0404c
+    Reviewed-on: https://code.wireshark.org/review/10128
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 8e43698
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Feb 9 12:34:11 2015 +0100
+commit 75f4ff7
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 10:09:13 2015 +0200
 
-    Set phdr encap for pcap file
+    Make empty filter valid in checkFilter
     
-    Change-Id: Id600b395d6fd2711c9b392a60454e5bd9a3eb465
-    Reviewed-on: https://code.wireshark.org/review/7288
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: Ia5293a228a7044a4cd01b3b2f62f1d7a8f7747e2
+    Reviewed-on: https://code.wireshark.org/review/10145
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 2d1d83a
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Feb 21 17:42:28 2015 +0100
+commit 29cd036
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 10:06:48 2015 +0200
 
-    Use correct mem scope for source address in Text Logcat
+    Clear display filter when filterPackets with empty filter
     
-    Change-Id: I94594e5c7ad8a398dd86ee3fe496077196f81fb9
-    Reviewed-on: https://code.wireshark.org/review/7287
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: Ie3f763d53f5c250bbc58e32490eb83bb2e076a62
+    Reviewed-on: https://code.wireshark.org/review/10144
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit c093797
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Feb 21 17:40:40 2015 +0100
+commit 3b5a1f2
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 23:29:13 2015 -0400
 
-    Fix GTK-shark
+    Link setargv.obj for Windows in CMake so mergecap works
     
-    Looks like a copy/paste issue.
-    ERROR: wireshark/color_filters.c:100:color_filters_add_tmp: assertion failed: (strlen(prefs.gui_colorized_fg)==69)
+    Mergecap needs setargv.obj in order to get wildcard support. This is linked
+    in nmake but not cmake.
     
-    Change-Id: I7b8309cfc178fd834951078a098bbce986639ed2
-    Reviewed-on: https://code.wireshark.org/review/7286
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Bug: 10354
+    Change-Id: Icccf6b36495ac4b376f651d689b4a1f9e2c6042d
+    Reviewed-on: https://code.wireshark.org/review/10143
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit e2bcee6
-Author: JC Wren <jcwren@jcwren.com>
-Date:   Wed Dec 17 15:19:20 2014 -0500
+commit 6fb6ede
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 21:38:13 2015 -0400
 
-    Make FT_{U}INT64 behave more like FT_{U}INT32, add support for FT_{U}INT{40,48,56}
+    Get the windows buildbot working for mergecap test suite
     
-    Change-Id: I57354c309ecf3a0c8f0c7cff485638027f30bb19
-    Reviewed-on: https://code.wireshark.org/review/5813
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ic9351b9bb8df85086eee3ab21908a2f9a04db767
+    Reviewed-on: https://code.wireshark.org/review/10141
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 13531d3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Feb 12 19:51:11 2015 -0500
+commit ddaa311
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 18:30:29 2015 -0400
 
-    Convert dissectors to use address_with_resolution_to_str instead of two separate calls for address string and name resolution.
+    Remove unused struct member from wtap
     
-    Change-Id: I7c8cfbcf201b3b73afe731302572646ce7833d64
-    Reviewed-on: https://code.wireshark.org/review/7284
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    The 'number_of_interfaces' member of struct wtap is not used - nor is it
+    needed since the interface_data is a GArray with its own 'len' member.
+    
+    Change-Id: Id0fb25248dea4bea9fc88a8ea35c09ba55029d89
+    Reviewed-on: https://code.wireshark.org/review/10138
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c1b672c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Feb 19 23:58:41 2015 +0100
+commit b3daf70
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 18:42:59 2015 -0400
 
-    checkAPIs: match packet-*.[ch], independent of locale
+    Pcap: wtap does not set interface timestamp precision when reading pcap
     
-    In perl, the \w character group seems to match '-' depending on the
-    locale. On Linux (with the C or en_US.UTF-8 locale), packet-ssl-utils.c
-    does not match.
+    Like bug 11447, when wiretap reads a legacy PCAP file it needs to
+    set the interface description's tsprecision member. And like bug
+    11447, I'm wondering why we have the field to begin with. But I'm
+    fixing this so that the Windows buildbots can get going again.
     
-    This patch makes the regex match anything except for the path separator.
-    
-    Change-Id: I27543072295af5f2bd5ea8ab36e5d913bebf7d85
-    Reviewed-on: https://code.wireshark.org/review/7266
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I71d0fe2e999ee7d11f1f5cc424681a99e17b1b1b
+    Reviewed-on: https://code.wireshark.org/review/10139
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 5012cf8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 20 15:49:35 2015 -0800
+commit fc0a2f5
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 17:59:27 2015 -0400
 
-    Call pre_init_prefs each time our profile changes.
+    Add more debug infor for windows buildbot test suite failure
     
-    Manually back out gafa96c3 so that we can set our preferences to their
-    default values each time we switch profiles.
+    Down the rabbit hole we go...
     
-    Zero the prefs struct at startup.
-    
-    Change-Id: Ic28db44cd0c4cdf640e977d7277f7357db10ebe8
-    Reviewed-on: https://code.wireshark.org/review/7282
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I8371b95b85128209b56960eb6e54648a6babbb84
+    Reviewed-on: https://code.wireshark.org/review/10137
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit ae9cc88
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 20 17:03:48 2015 -0800
+commit 8a86222
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 18:34:20 2015 +0200
 
-    Qt: Fix unsaved changes behavior.
+    PNRP: capitalize protocol name
     
-    Check the return value of testCaptureFileClose in
-    MainWindow::openCaptureFile and add testCaptureFileClose to
-    MainWindow::closeEvent. Some of the file opening and closing behavior
-    still needs to be cleaned up but this should at least keep the user from
-    losing unsaved data.
-    
-    Bug: 10944
-    Change-Id: I7d7b563a6b72f48b41a5a3aff2837655557869ff
-    Reviewed-on: https://code.wireshark.org/review/7283
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I1cf5d22e12241ef330319ef8fdf176becdefe300
+    Reviewed-on: https://code.wireshark.org/review/10131
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit ead79e6
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 20 13:44:27 2015 -0800
+commit d9dd323
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:52:30 2015 +0200
 
-    Clear the filter expression list in prefs.c.
-    
-    Move filter_expression_nuke from ui/gtk to epan and rename it to
-    filter_expression_free. Call it in prefs_reset along with the other
-    preference reset routines.
+    file-pcapng: remove useless hf_pcapng_timestamp_data entry
     
-    This keeps the Qt filter toolbar from filling up with duplicate
-    expressions when the profile changes.
-    
-    Change-Id: I9fae9a7b48944079ea342a126979d9e79af0d22b
-    Reviewed-on: https://code.wireshark.org/review/7281
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I82b2d4e4b0be8179103b827e0d11a0d8b10e1374
+    Reviewed-on: https://code.wireshark.org/review/10133
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 422ad10
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 20 10:32:15 2015 -0800
+commit 0bdf518
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 16:25:54 2015 -0400
 
-    Qt: Apply the main window geometry directly.
+    Try to debug merge test suite failure on windows buildbot
     
-    As of g2c00d66 we create the main window after we've read the recent
-    settings. This means that we can get rid of the property animation
-    workaround in MainWindow::loadWindowGeometry.
+    This change will be undone once the problem is found.
     
-    Change-Id: I028061c5bdab9261f9394a1840bcdcb752a4f0c8
-    Reviewed-on: https://code.wireshark.org/review/7278
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ica9cfe31b4e30fad2bb9de508af61baa1c455cc1
+    Reviewed-on: https://code.wireshark.org/review/10136
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 1a10f5f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 20 16:09:06 2015 +0100
+commit 2c260fa
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Sat Aug 15 21:12:17 2015 +0200
 
-    ui/gtk: fix control combos such as ctrl-a, ctrl-c
-    
-    Ignore any Ctrl combinations to allow pasting to work. Regression
-    introduced in "gtk: fix crash on Broadway GDK backend".
+    Use system's GeoIP database by default on Debian
     
-    Change-Id: I3d53db2d224cb604b52081002ff923c8684a8d0a
-    Reviewed-on: https://code.wireshark.org/review/7276
+    Change-Id: I58c1cbb242c20737dd16a0477858b0225c0b5d14
+    Reviewed-on: https://code.wireshark.org/review/10051
+    Petri-Dish: Balint Reczey <balint@balintreczey.hu>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-    Tested-by: Balint Reczey <balint@balintreczey.hu>
 
-commit bccb7f7
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Feb 20 15:02:08 2015 +0100
+commit bb96725
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Sat Aug 15 21:10:20 2015 +0200
 
-    [Diameter] It's MCC first in 3GPP AVP 909 RAI
+    Use system's OpenLayers.js on Debian
     
-    Change-Id: If4dd0d64d5a8d313ae9e62d2fcce3606ef8eb4f4
-    Reviewed-on: https://code.wireshark.org/review/7274
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Id790ee61d3443e2f96a83260514fa3a6d31d09da
+    Reviewed-on: https://code.wireshark.org/review/10050
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
 
-commit 9fe9505
+commit 9380d06
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Feb 20 12:47:52 2015 +0100
+Date:   Wed Aug 19 18:13:36 2015 +0200
 
-    addr_resolv.c: fix a stack buffer overflow detected by ASAN
+    ixiatrailer: remove execute bit
     
-    Issue reported by Alexis
-    
-    Change-Id: I0ef19625b6844fbc2996b75d51e86f949e358c8d
-    Reviewed-on: https://code.wireshark.org/review/7273
+    Change-Id: I6cd8f98518b21e935b329f5470b706ec059c91eb
+    Reviewed-on: https://code.wireshark.org/review/10129
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit a99cc2f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Feb 20 12:35:06 2015 +0100
+commit 89a8ad6
+Author: Pascal Artho <pascalartho@gmail.com>
+Date:   Tue Aug 18 08:44:04 2015 +0200
 
-    address_types.c: fix a "conditional jump or move depends on uninitialised value" error found by Valgrind
+    Preparation Host Flows: Tap Sequence Analysis
     
-    Change-Id: Ic752bb6aa1ba56e113895fcbed52f417ac0128f7
-    Reviewed-on: https://code.wireshark.org/review/7272
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    The tap_sequence_analysis was adapted to store the protocol of each
+    frame. Therefore a new variable was introduced. In case of an ICMP or
+    ICMPv6 packet, the ICMP message type and code is retrieved. The adapted
+    ICMP and ICMPv6 dissector stores both values in packet info (see [1]).
+    
+    In case of ICMP and ICMPv6 packets, the source and destination port is
+    not set or 0, respectively. Compared to that, the NetFlow service export
+    protocol [2] codes the ICMP message type and code into the port numbers.
+    The source port is zero while the destination is defined as: destination
+    port = ICMP type * 256 + ICMP code. This definition was implemented for
+    the ICMP and ICMPv6 packets.
+    
+    References
+    [1] https://code.wireshark.org/review/10097
+    [2] http://www.ietf.org/rfc/rfc3954.txt
+    
+    Change-Id: I07518e360975682a3f45e80cb24f82f58cfb15f0
+    Reviewed-on: https://code.wireshark.org/review/10098
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c84b022
+commit d05b6f9
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 19 22:55:11 2015 +0100
+Date:   Wed Aug 19 11:52:51 2015 +0200
 
-    MQTT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Bluetooth: ATT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-    Change-Id: I730b752680c85777a074a6b2bb4aef0c9f4d3ff5
-    Reviewed-on: https://code.wireshark.org/review/7265
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Found also by Coverity (CID 1316607)
+    
+    Change-Id: Ib6a4437fd24b51a8aa87d4bcdb5ee2a1dc43dae3
+    Reviewed-on: https://code.wireshark.org/review/10124
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 56356b8
+commit 03b78a0
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 19 22:43:47 2015 +0100
+Date:   Wed Aug 19 11:58:44 2015 +0200
 
-    MCPE: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Bluetooth: ATT: Fix  code will never be executed [-Wunreachable-code]
     
-    Change-Id: I7053c3c9e42cb4246ae504d31213bf95917a34f2
-    Reviewed-on: https://code.wireshark.org/review/7264
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I5048da723ddecde931956ed1af77438f823c1990
+    Reviewed-on: https://code.wireshark.org/review/10125
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
 
-commit f89edfd
+commit d470ff1
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 19 22:40:57 2015 +0100
+Date:   Wed Aug 19 12:33:06 2015 +0200
 
-    addr_resolv: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    btsnoop: Missing break in switch (CID 1316606)
     
-    Change-Id: I559151afab48892c51b702d008c1583570bd8754
-    Reviewed-on: https://code.wireshark.org/review/7262
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I105da06b7161a5b5f0cc2b4ce5303c4d5c989280
+    Reviewed-on: https://code.wireshark.org/review/10126
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 95382c3
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 19 16:05:49 2015 -0800
+commit fa40025
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 19 09:00:54 2015 +0200
 
-    Suppress a bunch of cast-qual warnings.
-    
-    Squelch
+    Recompile dfilter for all tap listeners when fields changed
     
-        warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type [-Wcast-qual]
+    When fields have changed the compiled display filter may be invalid
+    or need a recompile to be valid.
     
-    similar to g630f54f.
+    Filters which are not valid after a recompile is set to a filter
+    matching no packets (frame.number == 0) to indicate that this does
+    no longer match anything.  We should probably have a better filter
+    matching no packet for this purpose.
     
-    Change strtod to g_ascii_strtod to squelch a checkAPIs error.
-    
-    Change-Id: Ib2d26ef89f08827a5adc07e35eaf876cd7b8d14e
-    Reviewed-on: https://code.wireshark.org/review/7269
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Id27efa9f46e77e20df50d7366f26d5cada186f93
+    Reviewed-on: https://code.wireshark.org/review/10123
+    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 9423a13
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 19 16:23:39 2015 -0800
+commit b755a66
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Aug 19 05:28:17 2015 +0100
 
-    Just have init_progfile_dir() take a void pointer.
+    Use MAC address documentation range in filter examples
     
-    dladdr() takes a void * as a code pointer; have init_progfile_dir() do
-    so, and do the casting in the calls.  We don't care about the signature
-    of the function whose address we're passing, we just want to pass a
-    pointer to *something* in the main program.
+    https://www.iana.org/assignments/ethernet-numbers/ethernet-numbers.xhtml
     
-    Change-Id: I9372620a97b0eb53c2bb3c0c41a238b4408f3709
-    Reviewed-on: https://code.wireshark.org/review/7270
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I997440b7622dae4ea25d94e4041971f89b63fd04
+    Reviewed-on: https://code.wireshark.org/review/10121
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit ec6ec49
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 19 15:18:44 2015 -0800
+commit e328fa5
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Aug 19 07:11:23 2015 +0100
 
-    Qt: Fix automatic update status in welcome screen.
-    
-    Wait until the application has been initialized before checking
-    prefs.gui_update_enabled.
+    IPv6: Minor variable name fix
     
-    Change-Id: I6e52ba26064b6c5b882992c30c76b65d4a618848
-    Reviewed-on: https://code.wireshark.org/review/7268
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Iaef41fa2a212577f1fbdf7705eca65a928faa8c3
+    Reviewed-on: https://code.wireshark.org/review/10122
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 0d3b51a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 19 15:04:15 2015 -0800
+commit 9976f52
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 17 13:30:01 2015 +0200
 
-    Remove quotes from an Nmake macro.
+    .mailmap: sort using sort -u
     
-    Change-Id: Ibe6a544af49c39c12ce13264fb010ccdc54d471b
-    Reviewed-on: https://code.wireshark.org/review/7267
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I276331070c654e6c57bccb2c26cd0430ac656b26
+    Reviewed-on: https://code.wireshark.org/review/10069
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 999bbc9
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 10 13:48:48 2015 -0800
+commit dcaa64a
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Aug 17 19:22:42 2015 -0400
 
-    Qt: Add more version and packaging information to the main window.
+    Mergecap: add test suite for various merging scenarios
     
-    Add a "flavor" (for lack of a better word) banner, which can be set at
-    build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to
-    "Development Build" by default. This effectively migrates the
-    "DEVELOPMENT VERSION" logo image text from the GTK+ UI.
+    Add a test suite for mergecap (and indirectly capinfos I guess).
+    This is not exhaustive, but it's a start.
     
-    Add full release and automatic update information at the bottom.
+    Change-Id: I9442b4c32e31a74b1673961ad6ab50821441de3e
+    Reviewed-on: https://code.wireshark.org/review/10082
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit d64ad1d
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Aug 16 12:37:11 2015 -0400
+
+    capinfos: add more info about file and interfaces
     
-    Remove the short version from the welcome banner (top left).
+    Add more information about the capture file, and about the interface
+    descriptions in it. Also remove long-unused g_options code.
     
-    To do:
+    Change-Id: I93cbd70fc7b09ec1b8b2fd6c85bb885c7f749543
+    Reviewed-on: https://code.wireshark.org/review/10073
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 3268023
+Author: Andrew Chernyh <andrew.chernyh@gmail.com>
+Date:   Mon Jul 6 10:29:48 2015 +0600
+
+    Added TDMoP protocol dissector
     
-    - Add back support for gui_version_placement.
-    
-    - Move the version and repository branch to the flavor label?
-    
-    - Add update links as appropriate to the bottom.
-    
-    - Clean up layout and spacing.
-    
-    Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057
-    Reviewed-on: https://code.wireshark.org/review/7071
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Bug: 11340
+    Change-Id: I04408db376718c7a5392f9521d7d75d0481ec30e
+    Reviewed-on: https://code.wireshark.org/review/9514
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c200f1e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 19 13:29:20 2015 -0800
+commit d5caba6
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 17 20:07:58 2015 +0100
 
-    Rename packet-nbns.c to packet-nbt.c to reflect that it's not just NBNS.
-    
-    packet-nbt.c handles all of NetBIOS-over-TCP, not just the name service;
-    the file name is historical.
+    [IPv6] Make "ip.version" field pretty(er)
     
-    Change-Id: I333d331fd9453cea8d1d7595b4fd2650f0a92e98
-    Reviewed-on: https://code.wireshark.org/review/7259
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I1e32f666118e36f48edcc1678d75db3ca3f62776
+    Reviewed-on: https://code.wireshark.org/review/10075
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit a6c44c2
-Author: Ebben Aries <exa@fb.com>
-Date:   Mon Feb 9 10:20:20 2015 -0800
+commit a22bb87
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 17 13:27:53 2015 +0200
 
-    [bmp] Adding dissector for BGP Monitoring Protocol
+    Update .mailmap
     
-    * Support per draft-ietf-grow-bmp-07
-    
-    Change-Id: Iadb833157e7832077429c048e28e9814da29e2c6
-    Reviewed-on: https://code.wireshark.org/review/7192
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ib61ed614c3cfb6885d81a61d82b0974beba786f5
+    Reviewed-on: https://code.wireshark.org/review/10068
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 20e2c38
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Feb 18 20:00:38 2015 +0100
+commit c32c1f0
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Aug 18 18:51:32 2015 +0100
 
-    libnl: disable pedantic warning of libnl lib
-    
-    Part 2...
+    IPv6 Jumbogram expert info cleanup
     
-    Change-Id: I47b74c81ee7b7cd8296ce9da5a60ad6aecef8c78
-    Reviewed-on: https://code.wireshark.org/review/7239
-    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: Ic06e50a30330758d6ed0b1b1d9ba0d7f74929a9a
+    Reviewed-on: https://code.wireshark.org/review/10111
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 5c60289
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 10 11:02:42 2015 +0100
+commit 8352ff1
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 16 21:02:35 2015 +0100
 
-    Qt Wireshark - Once a live capture is stopped the title bar persists in reporting "Capturing from interface name"
+    Add IPv6 examples to capture/display filters
     
-    With Qt Wireshark the title bar persists in reporting "Capturing from <interface name>" even though capturing has stopped.
+    Also use TEST-NET-1 for IPv4 examples.
     
-    With GTK Wireshark once a live capture is stopped the title bar is updated to report the interface name(s) used for the unsaved capture file.
+    Replaced note using comma with parentheses
     
-    Issue reported by Jim Young
-    
-    Bug:10948
-    Change-Id: Ia6099f63f82b6610ade5c81af0cf257236f076ec
-    Reviewed-on: https://code.wireshark.org/review/7050
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I9855207aec7a335b80986aa63bd235edc4278d3a
+    Reviewed-on: https://code.wireshark.org/review/10061
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 2bc71d3
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Feb 19 15:16:51 2015 +0100
+commit fc1b48f
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Wed Aug 19 10:47:57 2015 +1000
 
-    openSAFETY: Merge both CT values
+    DVBCI: fix typo in comment
     
-     Both values mean the same thing and should be found using
-     the same hf_field, as this eases debugging scenarios.
-    
-    Change-Id: I23f675e22623b5e66354708319a41dcf34143e30
-    Reviewed-on: https://code.wireshark.org/review/7257
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I0f6e57b7f16526e7c1b96fb8bd69c003c89b7f42
+    Reviewed-on: https://code.wireshark.org/review/10119
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit b43fecb
-Author: Osman Sakalla <osman.sakalla@ericsson.com>
-Date:   Thu Feb 19 15:46:38 2015 +0100
+commit 0e8cc9a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 12 14:09:35 2015 -0700
 
-    patch for PMIPv6 MAG GPS coordinates
+    UDP multicast stream dialog.
     
-    Change-Id: I25bbd67775e19c2a0199507538b7dcfe5ce28bf6
-    Reviewed-on: https://code.wireshark.org/review/7256
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Add the UDP multicast stream dialog. Abuse TapParameterDialog a bit more
+    so that we can edit parameters.
+    
+    Remove some unused struct members and an unused function.
+    
+    Change-Id: I962c70344e792f0959527e4bcba8a20bd7e8acf9
+    Reviewed-on: https://code.wireshark.org/review/10084
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 9fba8c8
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 18 23:55:51 2015 +0100
+commit 9a3d4e6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 18 10:36:04 2015 -0700
 
-    Bugfix in nbns dissector.
+    Move an include guard.
+    
+    Move an include guard to match our conventions (and make it easier
+    to spot).
     
-    Change-Id: I5375a1ae2e48fe0c7ff6e3dde24b8d7b02b1f27f
-    Reviewed-on: https://code.wireshark.org/review/7251
+    Change-Id: I4bad61a0194219f69217713d051e0ff53ff5a76a
+    Reviewed-on: https://code.wireshark.org/review/10110
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d330cf7
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 18 19:07:22 2015 +0100
+commit 2eaaffe
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 18 21:56:52 2015 +0200
 
-    Documentation fix (reported by Richard Sharpe).
+    simple_statistics_dialog(.h): fix parameter 'st_table' not found in the function declaration [-Wdocumentation]
     
-    Change-Id: Ie4979c1be0e325178e3c662e0b2c5bbfc58456d9
-    Reviewed-on: https://code.wireshark.org/review/7252
+    Change-Id: I69814a05fa6ad65315e36fa75ae60634e934be5c
+    Reviewed-on: https://code.wireshark.org/review/10117
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ca68a7a
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Feb 19 15:21:34 2015 +0100
+commit 6ed3e08
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 18 21:10:13 2015 +0200
 
-    Add some casts to satisfy the various compilers.
+    pcapng(file): fix duplicate break
     
-    Change-Id: I7687fc0b433774fe447757af00bdaa2fc44ac59d
-    Reviewed-on: https://code.wireshark.org/review/7254
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ife7170c050402ab94d368acc6c233714be764824
+    Reviewed-on: https://code.wireshark.org/review/10114
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit adf6f89
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Feb 19 09:11:06 2015 -0500
+commit 857b144
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 18 21:15:27 2015 +0200
 
-    Add some casts to satisfy the various compilers.
+    Qt: Syntax check display filter when fields changed
     
-    Change-Id: Ic6a1124da986555d07cfeb71167b74f192c1c062
-    Reviewed-on: https://code.wireshark.org/review/7253
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I7179d7918e7958373806fb9627a36554ab4b9ddc
+    Reviewed-on: https://code.wireshark.org/review/10115
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 8d16ac4
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Feb 12 12:03:49 2015 -0500
+commit 4abec47
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 18 12:14:07 2015 -0700
 
-    Add name resolution support to address type.
+    Clean up handling of time stamps.
     
-    Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string.
+    Use common code for all time stamps, so it's handled the same for the
+    Packet Block, Enhanced Packet Block, and Interface Statistics Block.
     
-    Convert AT_FCWWN to using proper name resolution format
+    Show the high and low parts of the time stamp as fields; file dissectors
+    should show the raw file details.  Mark the calculated time stamp as
+    generated, as it's not the raw file data.
     
-    First use of address_with_resolution_to_str with field types in proto.c
+    Get the 64-bit time stamp by shifting the high part left 32 bits and
+    ORing in the low part; no need to play games with unions and byte order
     
-    Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2
-    Reviewed-on: https://code.wireshark.org/review/7196
-    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: I19b2c3227a3ca1e93ec653f279136aa18687581f
+    Reviewed-on: https://code.wireshark.org/review/10116
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7208355
+commit ea7cf08
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 19 02:14:39 2015 -0800
+Date:   Tue Aug 18 11:51:36 2015 -0700
 
-    Don't put CORBA IDL dissectors in ASN1_ variables.
+    Cast away 64 -> 32 narrowing complaints.
     
-    Put them into separate CORBA_IDL_ variables, to keep the two types of
-    generated dissectors separate.
+    "secs" in an nstime_t is a time_t; cast the calculated seconds portion
+    to time_t.
     
-    Change-Id: I4eb091a76ba5bc7d73533ef38fb29adc12a8ec42
-    Reviewed-on: https://code.wireshark.org/review/7250
+    Change-Id: Ieaad4c18bb21384a5781f50eadd3a537b414a369
+    Reviewed-on: https://code.wireshark.org/review/10113
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 6eae09f
-Author: Vincenzo Reale <smart2128@baslug.org>
-Date:   Tue Feb 17 18:39:32 2015 +0100
+commit 7a096c3
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Aug 18 15:58:34 2015 +0200
 
-    lupdate for Italian (new strings translated)
+    Init values set (found by American Fuzzy Lop).
     
-    Change-Id: I22ecf6950d47b63d5512c029d745b75be932554d
-    Reviewed-on: https://code.wireshark.org/review/7197
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
+    Change-Id: Iddd2b4a0ceb409db1afb1a412339134634de631c
+    Reviewed-on: https://code.wireshark.org/review/10104
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.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 c8f6d21
-Author: Hofer Manuel <manuel@mnlhfr.at>
-Date:   Wed Jan 14 21:15:05 2015 -0500
-
-    Add a dissector for Microsoft's SSTP protocol.
-    
-    ... with some changes from Jeff Morriss:
-    - Change how SSTP is "registered": rather than trying something complicated,
-      just put the intelligence for recognizing SSTP into the HTTP dissector.
-      (This does mean the SSTP dissector needs to do its own desegmentation now
-      but it makes things much cleaner.)
-    - Use proto_tree_add_subtree_format() instead of proto_tree_add_text() +
-      proto_item_add_subtree().
-    - The messagetype is 16 bits, use tvb_get_guint16() instead of tvb_get_guint8()
-      (fixes COL_INFO display)
-    - A few other few misc. cleanups
-    
-    (I didn't update NEWS because I can no longer build NEWS without adding UTF8
-    fancy quotes and so forth.)
-    
-    Bug: 8239
-    Change-Id: I3631ae65f67bea69815ccf43472fdbcac3ca3499
-    Reviewed-on: https://code.wireshark.org/review/7227
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+commit f49eb37
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 18 10:32:16 2015 -0700
 
-commit ff1c33c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Feb 18 13:01:33 2015 +0100
+    Update comment.
+    
+    Change-Id: I51e14a280ba898a321455168ac8ded1853f55e64
+    Reviewed-on: https://code.wireshark.org/review/10109
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 97f3c1b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 18 19:18:07 2015 +0200
+
+    Qt: Reload widgets using prefs when reloading Lua plugins
+    
+    Widgets using prefs must be closed because the prefs may have
+    been free'd when reloading Lua plugins.
+    
+    Change-Id: I4b79b7aff18d7923c77a9eb05acadc29b156edbf
+    Reviewed-on: https://code.wireshark.org/review/10108
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 8fcdcb9
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Aug 16 12:37:11 2015 -0400
 
-    ssl: check for minimal SSLv3/TLS record size
+    Improve file merging for mergecap and wireshark
     
-    When a TLS record is fragmented over multiple TCP segments, with its
-    first byte in one segment, and the remainder over the others,
-    ssl_looks_like_sslv3() throws an exception because it tries to access
-    the third byte.
+    Refactor the file merging code by removing the duplicate logic from mergecap.c
+    and file.c's cf_merge_files(), into a new merge_files() function in merge.c.
+    Also the following user-visible changes:
     
-    This breaks the encryption state, resulting in very weird (scrambled)
-    decrypted data. To fix this, check the record size before using it. Also
-    add TLSv1.1 and TLSv1.2 as known version.
+     * Removed the '-T' encap type option from mergecap, as it's illogical for
+       mergecap and would complicate common merge code.
     
-    Change-Id: Ie0ca78302a5d6c4241ea699d2ef6f7b873dd51ee
-    Reviewed-on: https://code.wireshark.org/review/7234
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+     * Input files with IDBs of different name, speed, tsprecision, etc., will produce
+       an output PCAPNG file with separate IDBs, even if their encap types are the same.
+    
+     * Added a '-I' IDB merge mode option for mergecap, to control how IDBs are merged.
+    
+     * Changed Wireshark's drag-and-drop merging to use PCAPNG instead of PCAP.
+    
+    Bug: 8795
+    Bug: 7381
+    Change-Id: Icc30d217e093d6f40114422204afd2e332834f71
+    Reviewed-on: https://code.wireshark.org/review/10058
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7d66c25
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 18 20:33:49 2015 -0800
+commit a3c175a
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 18 16:47:08 2015 +0200
 
-    That's not an ASN.1 dissector (and gets warnings).
+    Add casts to passify buildboot.
     
-    Change-Id: I55b49080c64a44c1e5752ab986cb6b27772d14db
-    Reviewed-on: https://code.wireshark.org/review/7248
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8aa4695f1f8dfdfc5bfcd4fb4f36e1b332581d5a
+    Reviewed-on: https://code.wireshark.org/review/10106
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 58f7788
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 18 12:51:43 2015 -0800
+commit db87e62
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Aug 18 16:29:19 2015 +0200
 
-    Move some ASN.1 dissectors to the clean list.
+    pcap: add init value.
     
-    Change-Id: If642132eb4a2b77db5e56b150b85f064b4b10b30
-    Reviewed-on: https://code.wireshark.org/review/7244
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Found compiling with gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04).
+    
+    Change-Id: I21bd3a5ab3365f0065c919aba7d6bd00b878d041
+    Reviewed-on: https://code.wireshark.org/review/10105
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 493ab6b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 18 17:16:04 2015 -0800
+commit da6f48d
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Tue Aug 18 15:34:53 2015 +0200
 
-    Check whether emmintrin.h can be used *without* -msse4.2.
+    Fix typo in makefile
     
-    If not, we can't use SSE 4.2, as we need to be able to include it in
-    files that use tvb_pbrk_compile()/tvb_pbrk_exec() even if they're not
-    compiled with -msse4.2 (most files aren't, as we need to isolate SSE 4.2
-    instructions to a small bit of code that uses them only if running on
-    hardware that supports them).
+    Typo:
+    file.pcapng.c -> file-pcapng.c
     
-    Change-Id: I62262a3c45fa14e200967916ac0ffc283f8e322c
-    Reviewed-on: https://code.wireshark.org/review/7246
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I72c40fd086f1b68b69e950c065877b2733279a04
+    Reviewed-on: https://code.wireshark.org/review/10102
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit e29dca7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 18 12:11:34 2015 -0800
+commit 22364bd
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Feb 15 19:05:44 2014 +0100
 
-    Not all compilers support turning of "format=".
+    File-format: BTSNOOP: Add option to dissect next layers
     
-    The clang on my machine doesn't; just do "format" instead.  (The best
-    way to handle this may be to do the formatting ourselves, so that we can
-    get thousands separators on *all* platforms, regardless of whether its
-    printf formatter supports it.)
+    Show next layers of each packet.
     
-    Change-Id: I1948d1799688cb3cf1d7b0de0696c09f6bf23f1c
-    Reviewed-on: https://code.wireshark.org/review/7241
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8c56eab969fef9a0a712b479dc2cdef6cc1578ae
+    Reviewed-on: https://code.wireshark.org/review/221
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit fcc05a4
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 18 12:00:36 2015 -0800
+commit dd57c6b
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Fri Jun 26 15:40:22 2015 +0200
 
-    Use plain old ASCII for the SimpleDialog delimiter.
+    File-format: Add PCAP and PCAPNG dissectors
     
-    Use a UUID for the SimpleDialog primary delimiter instead of trying to
-    leverage Unicode.
+    They have educational values and can be used to debugging some issues.
+    Now Wireshark can open three files (BTSNOOP, PCAP, PCAPNG)
+    in two modes: Capture (Traditional) and File-Format.
     
-    Bug: 10953
-    Change-Id: Ib518b32ef65b50f311b061ab5a267e7d1aa9f01b
-    Reviewed-on: https://code.wireshark.org/review/7240
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I833b2464d11864f170923dc989a1925d3d217943
+    Reviewed-on: https://code.wireshark.org/review/10089
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3a79d04
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Feb 17 18:30:14 2015 +0100
+commit c05df99
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 17 20:34:47 2015 -0400
 
-    H.248: fix dissection of ServiceChangeReason for version 1
+    Add udp_dissect_pdus.
     
-    My understanding of RFC 3015 is that the encoding of this field was not different in version 1 compared to newer releases
+    It works similar to tcp_dissect_pdus, but only works on a single packet.  Intended for protocols that go over TCP and UDP so that they can have a common dissection function.
+    Will of course, also work on UDP-only protocols with a fixed length header and size.
     
-    Bug: 10879
-    Change-Id: Iaa81679388860c0df4adc673ca6e56aff6f4591c
-    Reviewed-on: https://code.wireshark.org/review/7195
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Used DNP3 as a guinea pig since "multiple PDU support" over UDP was just added.
+    
+    Change-Id: Ib7af8eaf7102c96b4f8b5c1b891ae2d8f0886f9d
+    Reviewed-on: https://code.wireshark.org/review/10083
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit fb4252e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 17 21:29:37 2015 +0100
+commit db5b786
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Jun 6 19:37:20 2015 +0200
 
-    RADIUS: Add new dicto from FreeRADIUS
-    
-    commit 6c51e945a73844029f347c3fdaa0de1ec96473f1
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Tue Feb 10 13:22:39 2015 -0500
+    Bluetooth: Update Assign Numbers
     
-        New dictionary
+    +18 ATT attributes to be implemented (IPS 1.0 - 19 May 2015, etc.)
     
-    Change-Id: I60ba21dbadd3e35c1b0b01d7cea14b683f7f2a0c
-    Reviewed-on: https://code.wireshark.org/review/7237
+    Change-Id: Ib30ea20fe9b32a4be842f01ad5b8e8ee081a14ff
+    Reviewed-on: https://code.wireshark.org/review/10095
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit dd15191
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 18 10:34:20 2015 -0800
+commit a50a49e
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Thu Jan 22 08:27:40 2015 +0100
 
-    Suppress a printf grouping warning.
+    Bluetooth: ATT: Add some remaining attributes
     
-    Suppress
+    Add 14 attributes (not as easy as the previous),
+    there are still 19 + 3 (no idea for now [Valid Range, Report, IEEE 11073-20601
+    Regulatory Certification Data List]) attributes to be implemented (soon).
     
-        warning: ISO C does not support the ''' printf flag [-Wformat=]
+    Change-Id: Iee5cde4673b62f93084923a592b11824c0683605
+    Reviewed-on: https://code.wireshark.org/review/10094
+    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 df17ff3
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 17 13:18:30 2015 +0200
+
+    Qt: Fix use-after-free pattern
     
-    We verify that we *do* support it via HAVE_GLIB_PRINTF_GROUPING.
+    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.
     
-    Change-Id: Iedcf1d1856238e05babde5fe8ec23f64fbf2cdcf
-    Reviewed-on: https://code.wireshark.org/review/7238
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I8f54ede75577719008835038934e935cd5feba3f
+    Reviewed-on: https://code.wireshark.org/review/10067
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0dd7714
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu May 22 21:44:06 2014 +0200
+commit 9e72779
+Author: Pascal Artho <pascalartho@gmail.com>
+Date:   Tue Aug 18 08:43:06 2015 +0200
 
-    Add AddressSanitizer (ASAN) build option
-    --enable-asan for autotools
-    -D ENABLE_ASAN:BOOL=TRUE for CMake
+    Preparation Host Flows: Dissector Packet ICMP and ICMPv6
     
-    Need Clang/LLVM >= 3.1 or GCC >= 4.9
+    see https://code.wireshark.org/review/#/c/9976/
     
-    More information about ASAN https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer
-    
-    Change-Id: I833d4216d9508b8f7550ebc1dff6326734bdb53a
-    Reviewed-on: https://code.wireshark.org/review/1727
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ic301db4deea1a02b9e08c123b3e21e70817a2c85
+    Reviewed-on: https://code.wireshark.org/review/10097
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b356887
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 18 14:45:53 2015 +0100
+commit 318c3a5
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Jul 22 17:38:51 2015 +0200
 
-    Bugfix in ui/qt/CMakeLists.txt (missing file).
+    Qt: Add another C++ missing header: <algorithm> for std::sort()
     
-    Change-Id: I1db046f2e0555c8fc78d71ec6646c18cbb6f31eb
-    Reviewed-on: https://code.wireshark.org/review/7235
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Fix build error:
+    ui/qt/packet_list_model.cpp:270:5: error: 'sort' is not a member of 'std'
+         std::sort(visible_rows_.begin(), visible_rows_.end(), recordLessThan);
+    
+    Change-Id: I3a577a268f6c12e8fd97b7b6fd2429989c28e2f5
+    Reviewed-on: https://code.wireshark.org/review/10092
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 4342333
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 17 21:30:59 2015 +0100
+commit 0375244
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Jul 18 18:25:36 2015 +0200
 
-    libnl: disable pedantic warning of libnl lib
+    Qt/Minimap: Fix for Qt < 4.8
     
-    /usr/include/libnl3/netlink/types.h:25:15: warning: comma at end of enumerator list [-Wpedantic]
-    /usr/include/libnl3/netlink/handlers.h:65:9: warning: comma at end of enumerator list [-Wpedantic]
-    /usr/include/libnl3/netlink/handlers.h:81:18: warning: comma at end of enumerator list [-Wpedantic]
-    /usr/include/libnl3/netlink/handlers.h:113:18: warning: comma at end of enumerator list [-Wpedantic]
-    /usr/include/libnl3/netlink/utils.h:43:13: warning: comma at end of enumerator list [-Wpedantic]
-    /usr/include/libnl3/netlink/attr.h:47:16: warning: comma at end of enumerator list [-Wpedantic]
-    /usr/include/libnl3/netlink/route/link.h:95:23: warning: comma at end of enumerator list [-Wpedantic]
-    ...
+    I hope it is quite right solution.
     
-    Change-Id: I3f14e9d4887569e5d7befe1adb77561c8793437e
-    Reviewed-on: https://code.wireshark.org/review/7201
+    Change-Id: Ia9c883a832ddd03985eda37a9b344c4d7c8135e2
+    Reviewed-on: https://code.wireshark.org/review/10091
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit e25562b
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Jul 20 11:09:06 2015 -0400
+
+    Pcapng: clean up Section Header Block handling
+    
+    Change-Id: I8516d0c561ed0b63e49a3594027c9c15bb789258
+    Reviewed-on: https://code.wireshark.org/review/9726
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 4048ca0
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 13 23:00:29 2015 +0200
+
+    rewrite the H1 dissector
+    
+    * use the offset variable to keep track of where we are,
+      remove the position variable
+      (previously, offset remained 0 all the time...)
+    * use proto_tree_add_item()
+    * highlight the correct bytes for each field
+    * define a block type and block length instead of
+      naming these fields differently for each block
+    * indent by 4 spaces
+    
+    Change-Id: Ie0995e5fe6364605fd30020f171e51458844fa59
+    Reviewed-on: https://code.wireshark.org/review/10080
+    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 7263af8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 18 00:03:42 2015 -0800
+commit acc0c14
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 17 23:06:21 2015 -0400
 
-    Eliminate some DIRTY_ file lists.
-    
-    We don't want to encourage people to add to those lists, we want to
-    encourage people to subtract *from* those lists (either by fixing
-    warnings or, if an infelicitous API, or an infelicitous declaration of
-    an API on some platforms, or a program generator that doesn't take
-    sufficient care to avoid warnings - I'm looking at *you*, Flex - makes
-    it impossible to fix without introducing other problems, using the
-    DIAG_OFF()/DIAG_ON() macros if possible).  Eliminate the empty lists, to
-    make it harder to fill them up again.
+    Eliminate proto_tree_add_text from XMPP dissectors.
     
-    Change-Id: I298d07952c0cb1842a4ea71ba7e07c68e94a04e9
-    Reviewed-on: https://code.wireshark.org/review/7229
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I32fdf085ef484d147d9f0b27c56efba41bb827bf
+    Reviewed-on: https://code.wireshark.org/review/10086
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9707ff8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 17 21:18:43 2015 -0800
+commit 8fd7197
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Aug 17 23:06:50 2015 -0400
 
-    Uninstall wireshark.appdata.xml.
+    Lua: add FT_PROTOCOL as a ProtoField type
     
-    Change-Id: Ic955e008b686af448f2091de891f8457623ae7d5
-    Reviewed-on: https://code.wireshark.org/review/7228
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Bug: 11450
+    Change-Id: Ic77ddd193246c0202efcc9c11e61e8f6f85329c5
+    Reviewed-on: https://code.wireshark.org/review/10087
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 630f54f
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 17 13:33:15 2015 -0800
+commit 300bb98
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Aug 17 16:50:39 2015 -0400
 
-    Fix various warnings in wireshark-qt.cpp.
-    
-    Squelch warnings due to (char *) casts.
+    Install GTK3 too.
     
-    Use "include_directories(SYSTEM..." in CMakeLists.txt so that we
-    don't get pedantic warnings about things we can't easily fix such
-    as QList loop optimizations. Not sure if there's an easy way to do
-    this in Autotools.
+    It was in the list of packages but not in the final command line.
     
-    Pass get_gui_compiled_info to init_progfile_dir. C++ don't have to
-    show you any stinkin' ::main.
+    Change-Id: I361e660cc4ac91121314a3f8a7388b48fb2c61b7
+    Reviewed-on: https://code.wireshark.org/review/10081
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+
+commit c57f585
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 17 10:47:46 2015 -0700
+
+    Fixup tap listener registration.
     
-        warning: ISO C++ forbids taking address of function ‘::main’ [-Wpedantic]
+    Make sure we run make-tap-reg.py on files that register tap
+    listeners.  Make sure Qt-specific registration routines start with
+    register_tap_listener_qt_.
     
-    Change-Id: If1c77284ab0d1b4786bce4e926a4109dd9b1ae34
-    Reviewed-on: https://code.wireshark.org/review/7207
+    Change-Id: Idca382180f475db71e4d1965a70ae4cc2fa4f9d5
+    Reviewed-on: https://code.wireshark.org/review/10074
     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 b3f3d66
-Author: Gerald Combs <gerald@zing.org>
-Date:   Tue Feb 17 18:11:01 2015 -0800
+commit 41cb3bd
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 13 22:44:29 2015 +0200
 
-    Update Qt version checks.
-    
-    It looks like QPaintDevice::devicePixelRatio() was added in 5.1.
-    
-    Back out some debugging code.
+    h1: remove if (tree) checks, indent according to the modelines
     
-    Change-Id: I40f19c0d7901ce95f587531983e5c6644daf64f4
-    Reviewed-on: https://code.wireshark.org/review/7226
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I878aa23b5d718653b9039aeb94a0ece88c9c03cf
+    Reviewed-on: https://code.wireshark.org/review/10079
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit a5aab24
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Sep 18 11:47:21 2014 -0400
+commit c78d7c8
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 13 22:32:43 2015 +0200
 
-    Add an appdata entry for Wireshark.
+    h1: don't THROW() an exception from a dissector
     
-    Based on the one from Richard Hughes.
+    leaving the parsing loop should be enough in this case...
     
-    A French translation of the description field is included.
-    
-    Links to two screenshots are provided--they are stored in my home directory
-    on wireshark.org (for lack of a better place that I can put them).
+    Change-Id: Ic250961aeb4d3cfcd74ee8caacb59657c32444de
+    Reviewed-on: https://code.wireshark.org/review/10078
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit ec1d25d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 17 22:00:57 2015 +0200
+
+    Qt: Avoid double call to toUtf8()
     
-    Bug: 10479
-    Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54
-    Reviewed-on: https://code.wireshark.org/review/4178
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I4d31063b4aa37e4b0a68b5dbc17be22ef2cd151a
+    Reviewed-on: https://code.wireshark.org/review/10077
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 909d891
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 17 17:21:25 2015 -0800
+commit 68c5172
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 17 21:39:41 2015 +0200
 
-    Some additional UAT update callback changes.
+    Qt: Always rebuild columns when fields changed
     
-    I guess the signature mismatch must just be a warning with Clang; it's
-    not with MSVC.
+    The columns must be recreated even if no capture file is loaded
+    because custom columns may have reference to deregistered fields.
     
-    Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73
-    Reviewed-on: https://code.wireshark.org/review/7225
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I4ed7345b3200e5af211695f1a6511ee229d5f13c
+    Reviewed-on: https://code.wireshark.org/review/10076
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit b10bad1
+commit 0368b82
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 17 16:01:39 2015 -0800
+Date:   Wed Aug 12 15:11:39 2015 -0700
 
-    Fix QCustmPlot retina problems.
-    
-    Make sure our intermediate pixmaps have the same number of pixels as the
-    screen.
+    Improve multicast address checking.
     
-    A merge request with the same changes has been made upstream.
+    Check for IPv4 and IPv6 multicast addresses. We might have captured on
+    an "any" interface, or on a PPP link, or used some other method that
+    doesn't result in dl_dst.type == AT_ETHER.
     
-    Change-Id: I19950181d52f347e3aa7f5abb6e9ad33a4097abf
-    Reviewed-on: https://code.wireshark.org/review/7224
+    Change-Id: I18b0597fd432e4cec8c388a3c7d2d18ac4da0fad
+    Reviewed-on: https://code.wireshark.org/review/10009
+    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 9d1ea65
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 17 16:48:10 2015 -0800
+commit 821ea20
+Author: Selvamegala <sselvamegala@gmail.com>
+Date:   Sat Aug 8 20:35:30 2015 -0400
 
-    Fix comments to reflect reality.
+    Add Decryption support for Lwmesh
     
-    Change-Id: I63aeb49e442eb6eba5cdf35ded221894c1d0ea6c
-    Reviewed-on: https://code.wireshark.org/review/7223
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 10783
+    Change-Id: Id598838f036b1f312791d9dddbf3767dcbfd1aee
+    Reviewed-on: https://code.wireshark.org/review/9937
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 859511d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 17 16:40:28 2015 -0800
+commit b660fd4
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Aug 17 11:12:12 2015 -0400
 
-    Make UAT record update callbacks return a success/failure indication.
-    
-    Have them return TRUE on success and FALSE on failure.  Check the return
-    value rather than whether the error string pointer is null or not.
+    Pcapng: set interface description's tsprecision when reading file
     
-    Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c
-    Reviewed-on: https://code.wireshark.org/review/7222
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 11447
+    Change-Id: I5fe14616ed6e86e0bfe02c58cc9fb31e43bc23ef
+    Reviewed-on: https://code.wireshark.org/review/10071
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 3f765b3
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Feb 15 17:58:12 2015 -0800
+commit 2eec7fe
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 17 13:35:40 2015 +0200
 
-    Add a CF_FUNC macro for casting BASE_CUSTOM functions.
-    
-    Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid
-    the following warning:
+    BPDU: Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-        warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic]
-    
-    We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be
-    more consistent with the other macros in proto.h. Update each instance
-    of BASE_CUSTOM to use CF_FUNC.
+    Change-Id: I91cc96f92ae2e6b07144120d70f8db5b7ad45fce
+    Reviewed-on: https://code.wireshark.org/review/10070
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 77193ef
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 17 06:00:27 2015 +0100
+
+    dissect_ip_heur(): Remove TODO (done)
     
-    Adjust a dummy variable name generated by asn2wrs.py that was triggering
-    an invalid error in checkhf.pl.
+    Change-Id: I0c36179b63f5d60037de80badfea352c903c2525
+    Reviewed-on: https://code.wireshark.org/review/10065
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 9a6e36d
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Aug 16 20:06:50 2015 -0400
+
+    Remove proto_tree_add_text from packet-xml.c
     
-    Fix an encoding arguement in packet-elasticsearch.c found by
-    fix-encoding-args.pl.
+    Required introducing packet_info* to xml_frame_t structure.
     
-    Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22
-    Reviewed-on: https://code.wireshark.org/review/7150
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ie777fe3bc8c7ea052d3441dd31e0631ce47324cb
+    Reviewed-on: https://code.wireshark.org/review/10063
+    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 be5e595
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 17 14:56:31 2015 -0800
+commit af62264
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 13 16:08:18 2015 +0200
 
-    Make it a bit more like the way it was before all these changes.
+    DNP3: add support for udp multi frame packets.
     
-    Change-Id: I9fc0ef50574a7e068c32e3f6ffeb3634df9474d4
-    Reviewed-on: https://code.wireshark.org/review/7212
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 11435
+    Change-Id: I1f3006a4276e8a95d028294ebb9635f71be0f75e
+    Reviewed-on: https://code.wireshark.org/review/10013
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit efd18e6
+commit 2ba0ea3
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Feb 17 14:54:37 2015 -0800
+Date:   Sun Aug 16 12:33:31 2015 -0700
 
-    A UAT's update is expected to set *error; do so.
+    Fix the conversion of milliseconds to seconds and nanoseconds.
     
-    Its callers treat a non-null error pointer as a failure and a null error
-    pointer as a success, so it has to set *error, even if it's only setting
-    it to NULL.
+    1 millisecond = 1000000 nanoseconds, not 1000 nanoseconds, and
+    nstime->nsecs is nanoseconds, not microseconds.
     
-    Change-Id: I48b2faa4bc013e4a754180dfae487829c8fe35a6
-    Reviewed-on: https://code.wireshark.org/review/7211
+    Change-Id: I6925ff80f6443015f83ca00bad2a347d10eadd7c
+    Reviewed-on: https://code.wireshark.org/review/10060
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 23c8bb8
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Feb 17 23:13:00 2015 +0100
+commit 8b8d378
+Author: Petr Gotthard <petr.gotthard@honeywell.com>
+Date:   Sun Aug 16 16:50:52 2015 +0200
 
-    [zvt] dissect some more fields
+    AMQP 1.0: Fix OSX build errors
     
-    Change-Id: I93ffcfddd59a196a7e4f9f354b99884a7f5a814c
-    Reviewed-on: https://code.wireshark.org/review/7208
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit eca4d29
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 17 19:31:14 2015 +0100
-
-    STUN : fix indent (use 4spaces)
+    packet-amqp.c:10660: warning: implicit conversion shortens 64-bit value into a 32-bit value
+    packet-amqp.c:10661: warning: implicit conversion shortens 64-bit value into a 32-bit value
     
-    Change-Id: Ifbaf0f396b24d5506722f0e0df0dd17c1969a435
-    Reviewed-on: https://code.wireshark.org/review/7202
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ic1c19edf10432dccb5fc4f3ea07defd45b9eef17
+    Reviewed-on: https://code.wireshark.org/review/10054
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+
+commit 6f7811e
+Author: ff <francesco.fondelli@gmail.com>
+Date:   Sun Aug 16 17:27:01 2015 +0200
+
+    A new Early Allocation Request for draft-ietf-pce-lsp-setup-type and
+    draft-ietf-pce-segment-routing has been issued.  Reference:
+    https://mailarchive.ietf.org/arch/msg/pce/Zdsc0HHl1SLvpANRWhpLvIzJQyI
+    There are implementations out there that are using 5 as SR-ERO subobject
+    identifier (instead of 36 that will be assigned by IANA) and 27 as the
+    PATH-SETUP-TYPE TLV identifier (instead of 28 that will be assigned by
+    IANA).  This patch decodes both 5/36 as SR-ERO subobject and 27/28 as
+    PATH-SETUP-TYPE.  It is unlikely that IANA will re-assign code points 5
+    and 27 in the near future.
+    
+    Change-Id: Ie2efa869344e4c1121f19f1ee3a71711d566a037
+    Signed-off-by: ff <francesco.fondelli@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/10057
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 47f27e3
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Feb 13 17:19:48 2015 +0100
+commit 3755bc6
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 16 07:35:24 2015 +0100
 
-    [Qt] don't clear the display filter when a capture file is closed
+    Fix IP Destinations stats tree
     
-    Bug: 10951
-    Change-Id: I958aa9e88c30ac20cd7d7971ee903ac97265c1f4
-    Reviewed-on: https://code.wireshark.org/review/7098
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I875ecb05e0919e81e6d8d1d00f802c8d5df5b214
+    Reviewed-on: https://code.wireshark.org/review/10053
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit da62086
+commit c643cbf
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 17 12:35:07 2015 -0800
+Date:   Sat Aug 15 17:05:17 2015 -0700
 
-    WSUG: Add more dialog guidelines.
+    Run abicheck commands at compile time.
+    
+    The CMake dumpbabi targets collectively copy over 800 files. Do
+    that when when we build the actual targets instead of at configure
+    time. Hopefully this will speed up initial CMake runs.
     
-    Change-Id: I59a14bf9712c05d75398b8ed2dc103fe3443f7af
-    Reviewed-on: https://code.wireshark.org/review/7203
+    Change-Id: I6e4d691e24c73ea05d638a0f897f570541c84e38
+    Reviewed-on: https://code.wireshark.org/review/10052
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 2c43b68
+commit 8d1a549
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Feb 17 12:29:31 2015 -0800
+Date:   Sun Aug 16 08:10:40 2015 -0700
 
-    Set a window icon for WiresharkDialog.
+    [Automatic update for 2015-08-16]
     
-    Otherwise it ends up with a generic icon.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I47292c966332073d07ef358316cf8b40bcf1329b
-    Reviewed-on: https://code.wireshark.org/review/7200
+    Change-Id: Idb8a2cff075a1ffe5e3cd1d6f4d3fb1b6c357cdb
+    Reviewed-on: https://code.wireshark.org/review/10055
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit e61f3d5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Feb 17 21:21:06 2015 +0100
+commit b1d33db
+Author: Petr Gotthard <petr.gotthard@honeywell.com>
+Date:   Sat Jul 4 01:19:02 2015 +0200
 
-    802.11: fix no previous prototype for 'wlan_col_filter_str' & 'wlan_bssid_col_filter_str' [-Wmissing-prototypes]
+    AMQP 1.0: Refactor to fix parsing of timestamps
     
-    Fix also some indent typo (3spaces -> 2spaces)
+    Timestamps are currently dissected as integer numbers; two aspects need to
+    be recatored to correctly dissect timestamps:
+     - the add_1_0_proto_item() function
+     - protocol fields (hf_xxx) and the get_amqp_1_0_value_formatter()
     
-    Change-Id: I1aa9df1540e80946b85dde0e6bd87bf39e8d8f19
-    Reviewed-on: https://code.wireshark.org/review/7199
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit fd870e3
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Feb 13 17:58:25 2015 +0100
-
-    CMIP: get rid of some evil global variables
+    (1)
+    The AMQP 1.0 dissector rely on the proto_tree_add_item. There is only one
+    invocation common for all datatypes (in add_1_0_proto_item), which cannot
+    pass any type-specific ENC_xxx specifiers and it cannot handle custom
+    datatypes like AMQP timestamp.
     
-    Fixes an ASAN failure reported by Alexis
-    Note that some global variables remain as I do not know enough on this protocol to safely remove them
+    I propose to replace the add_1_0_proto_item() by type-specific dissectors that
+    will correctly set the ENC_xxx specifiers and handle exceptional cases like
+    the AMQP timestamp or the zero-length true/false datatypes.
     
-    Change-Id: If392a8f09ef2fc2f2d46871a71149e29fe5e292c
-    Reviewed-on: https://code.wireshark.org/review/7099
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    (2)
+    The get_amqp_1_0_value_formatter implements a table-driven magic to select
+    alternate hf_xxx field based on the actual datatype. This however
+     - defines alternate fields where the standard permits only one datatype
+     - does not support fields that can contain any datatype ("*")
+     - does not support FT_TIMESTAMP
+    
+    I propose to make this mechanism less table-driven (more explicit and more
+    flexible) and allow all alternates permitted by the standard.
+    
+    Change-Id: Ib2cbda632d4c81ec3e6b81f539fe77bb913afc1c
+    Reviewed-on: https://code.wireshark.org/review/9528
+    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: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit edf05db
-Author: Robert Cragie <robert.cragie@gmail.com>
-Date:   Tue Feb 17 17:56:06 2015 +0000
+commit 8fa4016
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 15 18:07:10 2015 +0100
 
-    Corrected display format for EUI-64
+    make-taps.pl: Remove duplicate slash in pathname
     
-    Change-Id: I0913337a29efac5c39e30897cad7e90195fa984a
-    Reviewed-on: https://code.wireshark.org/review/7198
+    Change-Id: Id5e13df24409267c405cdd05479610a8ba898289
+    Reviewed-on: https://code.wireshark.org/review/10047
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c621a77
-Author: Ryan Doyle <ryan@doylenet.net>
-Date:   Sat Jan 31 14:00:08 2015 +1100
+commit 2e2129a
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Aug 15 09:39:05 2015 -0400
 
-    PCP: updated protocol dissection for new PDU types
-    
-    Introduce basic dissection for AUTH PDU type as well as detecting if a
-    conversation is about to initiate a secure sockets connection (kind of
-    like STARTTLS) and then pass all packets through the SSL dissector
-    if that is the case. Also clean up some duplication with constants.
+    Conversion of random proto_tree_add_text calls.
     
-    Change-Id: I66f663ca6ab4291f8d0321430e3e126a0be77a93
-    Reviewed-on: https://code.wireshark.org/review/7109
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I6505ce34de84bfe46d5bc7b4d6a3c6044f3fb4b5
+    Reviewed-on: https://code.wireshark.org/review/10041
+    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 a355daf
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Mon Feb 16 15:14:57 2015 -0500
+commit 8b45727
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 11:34:46 2015 -0700
 
-    Give users a more helpful error message if they enter an SSL protocol we don't
-    know.
+    Un-reference actions after adding them to an action group.
     
-    First, if we know the protocol (by filter name) tell them that the dissector
-    just isn't set up to run over SSL but it could be--if they contact the Wireshark
-    developers.
+    When created, they have a reference count of 1; when added to an action
+    group, the reference count is increased as a pointer is held by the
+    action group.  Release the reference we got, as we're not holding onto
+    it.
     
-    Second, don't tell them that the dissectors which have called
-    ssl_dissector_add() are the only ones that are valid; those are just commonly
-    used ones.
+    Also, rename "menu_item" to "menu_action", to indicate that it's an action.
     
-    Change-Id: I1b72bccd4c96c21c73a19fa2d87fe2c0b875a0fa
-    Reviewed-on: https://code.wireshark.org/review/7185
-    Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I54543dcc2e6c3b341a9f584fe1b6099a134771b3
+    Reviewed-on: https://code.wireshark.org/review/10049
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0da88ba
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Mon Feb 16 22:32:25 2015 -0500
+commit 1b46738
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 11:20:36 2015 -0700
 
-    Don't send an effectively empty message (no TVBs) to the SCTP tap.
+    Do the "plugin" menu stuff in one pass.
     
-    This prevents the tap from crashing (asserting out) because there's no
-    (initialized) TVB to look at.
+    Also, use g_strconcat() in other places where we prepend / to action
+    names.
     
-    Bug: 9849
-    Change-Id: I370a49ef32a67e504c30cf1762a2180bf13c56ca
-    Reviewed-on: https://code.wireshark.org/review/7190
-    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 9150a92
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Feb 17 13:12:53 2015 +0100
-
-    Add missing json.h
+    Hopefully, this will make it easier to find common code between all the
+    N different places where we add menus and menu items.
     
-    Change-Id: Ib1d67fdcc016532ab6e4140df357a6d0dd5cf09d
-    Reviewed-on: https://code.wireshark.org/review/7193
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Iee876866730cada64428df17f1f3c4552cc3ac93
+    Reviewed-on: https://code.wireshark.org/review/10048
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit bd91109
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Mon Jan 19 19:54:41 2015 +0100
+commit c222719
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 10:49:51 2015 -0700
 
-    Added JSON native file support.
+    Fix creation of menu actions in ws_menubar_create_action_group().
     
-    libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap.
-    
-    Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c
-    Bug: 10878
-    Reviewed-on: https://code.wireshark.org/review/6716
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 1478db0
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Mon Feb 16 22:39:27 2015 -0500
-
-    Fix up formatting and indentation a bit.
+    Action names are expected to begin with /, so prepend a /.
     
-    Change-Id: Ifdc6b8b2525efdc9e0f73519e73afbd4adbf65f4
-    Reviewed-on: https://code.wireshark.org/review/7191
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 5ebc577
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 16 13:35:16 2015 -0800
-
-    Fix FSF address.
+    Fixes the "plugin" menu mechanism (which could be used by built-in code
+    as well, so it's not really a "plugin" menu mechanism).
     
-    Change-Id: I3881fcd211bbfbecd92c3a8c2a440da30b20393f
-    Reviewed-on: https://code.wireshark.org/review/7188
+    Change-Id: Ic45412399078796359649cc876d2c8bfc9a790c6
+    Reviewed-on: https://code.wireshark.org/review/10046
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit be5259d
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Feb 16 22:26:23 2015 +0100
+commit 88f334b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 15 19:31:51 2015 +0200
 
-    OK, at least on my system uic is called uic-qt5, same for moc and rcc.
-    Found while doing an accidental autofoo build instead of cmake build.
+    Fixed a comment in cleanup_dissection
     
-    Change-Id: Ie8ab648561f88e0a28a64c06d4d78652643c91dd
-    Reviewed-on: https://code.wireshark.org/review/7187
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Change-Id: I445e09803023d1a22a663ba0501c013f113b5bfe
+    Reviewed-on: https://code.wireshark.org/review/10045
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit a5f4389
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sat Feb 7 20:56:53 2015 +0100
+commit 5f13933
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 15 19:25:13 2015 +0200
 
-    Whitespace fix (space before tab)
+    Lua: Free true_false_string values at reload
     
-    Change-Id: Iccbac2ff5d95639d478437eefa16d1dd2757128b
-    Reviewed-on: https://code.wireshark.org/review/7186
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Change-Id: I8ab194bf094e82f08ddafb0a1451aec42989b93d
+    Reviewed-on: https://code.wireshark.org/review/10044
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit db2395f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 16 11:50:40 2015 -0800
+commit 0a16350
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 15 17:55:27 2015 +0100
 
-    Fix declaration and export the routines.
+    Add a newline for readability
     
-    Add a missing semicolon, and export the routines with WS_DLL_PUBLIC, so
-    they can be used by plugins.
-    
-    Change-Id: Iaf52e70ce9fbfce3cfa675c453b7d39a0341dfeb
-    Reviewed-on: https://code.wireshark.org/review/7184
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I7dbfa8f82454bd93ca5a66f22c29982923803918
+    Reviewed-on: https://code.wireshark.org/review/10043
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 907f4e8
+commit 2bc6f01
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 16 11:37:21 2015 -0800
+Date:   Sat Aug 15 09:26:45 2015 -0700
 
-    We now get that from common libwireshark code.
+    *More* issues.
     
-    Change-Id: If3b15d01689c6bbfad6422c4a30f9ece5e2b3b83
-    Reviewed-on: https://code.wireshark.org/review/7183
+    Change-Id: Ib415582f4bf2529c412bed329b3ee7daccde29b0
+    Reviewed-on: https://code.wireshark.org/review/10042
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit cfb1bc3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 16 11:32:39 2015 -0800
+commit 7f38b65
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Aug 9 08:03:21 2015 -0400
 
-    Put the 64-bit hash routines into a common file.
+    Don't clear the tcp_analysis if a conversation is not provided to get_tcp_conversation_data().
     
-    Some or all are used by the Infiniband, MBIM, and RSVD dissectors; put
-    them into a common source file, with a header for them, and just include
-    the header in the dissectors.
+    Callers may need to know information like retransmissions, etc which will be lost.
     
-    Change-Id: I724f0c2232ba751ccbd491222af6f03bafd6d63c
-    Reviewed-on: https://code.wireshark.org/review/7182
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I3f8b6b0aeb308701eb34ae6f6f735af6995ed441
+    Reviewed-on: https://code.wireshark.org/review/9940
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 4765bbc
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Feb 16 20:24:51 2015 +0100
+commit 85e2018
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 15 08:29:51 2015 +0100
 
-    RSVD: fix compilation with GLib < 2.22.0
+    udp: fix minimum jumbo length
     
-    Change-Id: Ia82d42faa766f68e167b1c1affa5307980909fb8
-    Reviewed-on: https://code.wireshark.org/review/7181
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I5ab4974cc60cdec0c3571bdec815c8cb9e8f7255
+    Reviewed-on: https://code.wireshark.org/review/10040
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit febc2e1
-Author: Richard Sharpe <realrichardsharpe@gmail.com>
-Date:   Mon Feb 16 07:48:57 2015 -0800
+commit 85d2eef
+Author: Evan Huus <eapache@gmail.com>
+Date:   Tue Aug 11 18:35:45 2015 -0400
 
-    Fix a portability problem raised by Guy Harris. My first implementation would
-    not work on 32-bit platforms because I assumed that pointers were 64-bit
-    items. I have now moved to a slightly different scheme suggested by Evan Huus.
+    btatt: guard against incomplete reassembly
+    
+    If we try and reassemble a fragment whose end does not line up exactly with the
+    start of the following fragment, abort or else we will leave uninitialized gaps
+    in the resulting buffer.
     
-    Change-Id: I34f4dceea9952d5633603e71a8e8ae8f4b9154cc
-    Signed-of-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/7179
-    Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
+    Bug: 11436
+    Change-Id: I4cd05c1a9ac4404bf70a3945f80b12f7bf5f74ee
+    Reviewed-on: https://code.wireshark.org/review/9983
     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: Richard Sharpe <realrichardsharpe@gmail.com>
-
-commit 6331755
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 16 10:37:58 2015 -0800
-
-    Get rid of duplicate typedef.
-    
-    Change-Id: I389132ec27405394ca73fb9c09950d8a91ea32a7
-    Reviewed-on: https://code.wireshark.org/review/7180
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5955efc
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Sat Feb 14 22:24:58 2015 -0800
+commit 677d4d6
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 9 23:13:06 2015 +0100
 
-    [80211ac] Change VHT MIMO Control to use add_bitmask
+    Add IPv6 Jumbogram support (RFC 2675)
     
-    Change-Id: If3d597dd6dbf746e0f971e52073f9790b6a0ceda
-    Reviewed-on: https://code.wireshark.org/review/7128
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Icea1659395d7bc16e367b74a695586926b33149b
+    Reviewed-on: https://code.wireshark.org/review/9968
+    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 17828b5
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Thu Feb 12 01:32:02 2015 -0800
-
-    [80211ac] Add partial beamforming support
-    
-    Adds support to decode beamforming report, but actual beamforming
-    matrices are not decoded. Requires bit level manipulation of varying lengths
-    of data which is not currently supported, and section spec only seems to
-    mention size and contents, not representation
-    
-    Bug 10169
-    Change-Id: Icc2188b79f95b5e38b64ded348b7a0696b5504ed
-    Reviewed-on: https://code.wireshark.org/review/7111
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 7fee7df
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Feb 16 15:13:25 2015 +0100
-
-    [Diameter] Use proto_tree_add_bitmask() to add the diameter flags.
-    
-    Change-Id: I9cb6e46551b0a25a458311a53365469552d5c195
-    Reviewed-on: https://code.wireshark.org/review/7177
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b2c81bb
+commit 8282540
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 11 22:16:01 2015 -0500
+Date:   Wed Aug 12 09:01:45 2015 -0400
 
-    Make get_manuf_name return a const string.
+    Eliminate proto_tree_add_text from GSM dissectors.
     
-    Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table.  This will make name resolution of addresses perform a little better because it doesn't have to worry about the wmem_allocator.
-    
-    Change-Id: If976fe7b0c3f9cd053225096c2ac05418f061af6
-    Reviewed-on: https://code.wireshark.org/review/7081
+    Change-Id: I36a3d15a4fa86847a83d1dbea40111d36d7cfd61
+    Reviewed-on: https://code.wireshark.org/review/10036
+    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 b2d23ec
-Author: Anders <anders.broman@ericsson.com>
-Date:   Mon Feb 16 10:53:05 2015 +0100
-
-    [STUN] Avoid fetching stuff twice from the tvb.
-    
-    Change-Id: I923818ea41791b2f41c5bce3c5927014580eb2b7
-    Reviewed-on: https://code.wireshark.org/review/7174
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0ce7fd4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Feb 16 00:14:18 2015 +0100
+commit 8368f3b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 14 20:54:22 2015 -0700
 
-    Trivial Dead assignment fixes in configure
+    Update the previously-added comment.
     
-    Fixes a Dead assignment and unused variable warning.
+    At least with kqueues, NOTE_REVOKE is delivered if the file system
+    containing the vnode in question is unmounted, and that gets mapped to a
+    change notification by QFileSystemWatcher, so the right thing should
+    happen.
     
-    With this patch and http://www.cmake.org/Bug/view.php?id=15203,
-    `scan-build cmake` will give zero warnings!
+    I'm not sure whether the right thing happens on Windows.
     
-    Change-Id: Idc7a03fbf1e8196bc139a2c6663ec48b897f2897
-    Reviewed-on: https://code.wireshark.org/review/7144
-    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: I1e4c0d510f31f68d574c4d4cf20524666382930f
+    Reviewed-on: https://code.wireshark.org/review/10039
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a4b3be5
-Author: Richard Sharpe <realrichardsharpe@gmail.com>
-Date:   Sat Feb 14 15:28:01 2015 -0800
+commit 463caf8
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 14 18:49:17 2015 -0700
 
-    Complete the RSVD Dissector further by handling SCSI requests.
+    Discuss alternatives to polling all the recent files every 2 seconds.
     
-    Still have to handle response, but this points the way, I think.
-    Handle responses. Still have to handle sense info.
-    
-    Change-Id: Ic692de15b8178fbe274791ffbc000e8f35b40653
-    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/7127
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit e56f34e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Feb 15 19:25:05 2015 -0800
-
-    Suppress more pedantic warnings.
+    Somebody asked about repeated SMB traffic when running the Qt Wireshark:
     
-    Suppress
+    https://ask.wireshark.org/questions/45036/permanent-smb2-traffic-with-1997
     
-        warning: initialization of a flexible array member [-Wpedantic]
+    and that's due to said polling.  On the main desktop platforms (Windows,
+    OS X, Linux) we can use QFileSystemWatcher plus, on Windows and OS X,
+    some additional stuff to check for unmounts (and get FreeBSD as a
+    freebie, as it works the same as OS X), and avoid timeout-based polling.
     
-    Change-Id: I49c2cf8b97539660742ef1b19752a0f56404d78a
-    Reviewed-on: https://code.wireshark.org/review/7155
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I3a1d0110fedcdb442ed09c16dab4bf0cb06ca331
+    Reviewed-on: https://code.wireshark.org/review/10038
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7c3fd2a
+commit 6137197
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 16 03:13:25 2015 +0000
+Date:   Fri Aug 14 17:19:37 2015 -0700
 
-    Revert "Revert "Fix duplicate Display Filter Macro check""
-    
-    This reverts commit 876c322df8b6a944cb4358c313c4fc46afe99719.
+    Fix for the current wireshark.desktop.
     
-    Wrong branch.  It builds in master; it does *not* build in 1.12 or 1.10.
+    The default version doesn't use GTK+ any more, so the version we
+    distribute doesn't have "Categories=System;Monitor;GTK;", and the Debian
+    version presumably shouldn't put it into category "GNOME".
     
-    Change-Id: I3a2409d5a37f08965d6caac64dc97a48a1c5d1b8
-    Reviewed-on: https://code.wireshark.org/review/7152
+    Change-Id: I4e59026b5c4f26d02e4a96686e339f8d54bdcd1e
+    Reviewed-on: https://code.wireshark.org/review/10035
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 876c322
+commit 0ddae1b
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 16 03:10:46 2015 +0000
+Date:   Fri Aug 14 16:19:13 2015 -0700
 
-    Revert "Fix duplicate Display Filter Macro check"
+    Put it in the Qt category, not the GTK category.
     
-    This reverts commit f5902a677e24ff96869d3c335f4fb8aaa6d0e543.
+    The default binary, "wireshark", is now a Qt binary; "wireshark-gtk" is
+    the GTK+ one.
     
-    This is not a simple cherry-pick; backporting this fix will have to be done manually.
-    
-    Change-Id: I53efc06a8e35c6b1aa793edf4e702cabee2e929b
-    Reviewed-on: https://code.wireshark.org/review/7151
+    Change-Id: Ibfec5d796a9796c2588c4305b18dc4506a435228
+    Reviewed-on: https://code.wireshark.org/review/10034
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 45674b7
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Feb 16 00:37:03 2015 +0100
+commit 4c6da64
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Fri Aug 14 10:44:11 2015 -0400
 
-    Qt: fix "Assigned value is garbage or undefined"
-    
-    Clang Static Analyzer reported that function link_changed uses a garbage
-    value for "device.links" which is indeed the case when
-    global_capture_opts.all_ifaces->len == 0.
+    Ident the merge.c/h files by 4 spaces
     
-    There seem to be some issues here:
-     - When global_capture_opts.all_ifaces->len == 0, then device is
-       uninitialized.
-     - When no interface name matches, the last entry will always be
-       updated.
-     - There is duplicate code querying for the interface by name.
+    Using 2 spaces for indent is way past its prime.
     
-    This patch addresses the above issues by extracting the interface name
-    check into a new utility function which returns NULL when a device is
-    not found. Then the callers (such as link_changed) will check this
-    value.
-    
-    While at it, stop storing a copy of (interface_t), use a pointer
-    instead. This allows for removal of g_array_remove_index followed by
-    g_array_insert_val.
-    
-    Verified with clang 3.5.1.
-    
-    Change-Id: I03e0f179577a23a3f1efdca768e67922273192f0
-    Reviewed-on: https://code.wireshark.org/review/7145
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I80caf89f15e576f9aeb25754576a9f18215ccb3c
+    Reviewed-on: https://code.wireshark.org/review/10032
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit ea5f5be
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 15 18:32:14 2015 +0100
+commit 46d6e8c
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 14:48:49 2015 +0200
 
-    Update Release Notes
-    
-    Add QNEX6 (QNET) and add description for some other protocol (GVSP, corosync...)
+    Added some missing breaks
     
-    Change-Id: Ia515a134e73835e6d2c81e8ccc210e9fcc424701
-    Reviewed-on: https://code.wireshark.org/review/7134
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I3b2f25832ca878ec3e7f9e4dcce258dc870fc5ad
+    Reviewed-on: https://code.wireshark.org/review/10031
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 2bec642
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 15 18:08:38 2015 +0100
+commit 7833b93
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 13:46:01 2015 +0200
 
-    proto(.h): fix parameter 'offset' not found in the function declaration [-Wdocumentation]
+    Free all hfi->strings in free_deregister_field
     
-    Change-Id: Ib79831e02a9a6457ca49c21536ce46df7d4cafa0
-    Reviewed-on: https://code.wireshark.org/review/7133
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I6fe78266a2e881fa80e1e3a3423b685d3c1764de
+    Reviewed-on: https://code.wireshark.org/review/10029
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 4f3646f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Feb 14 15:36:09 2015 +0100
+commit 12ff69d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 11:02:10 2015 +0200
 
-    Fix handling of invalid UAT items
-    
-    If the UAT file failed a field check, then the user_data pointer may be
-    empty. As a result uat_save() triggers an invalid write.
+    Qt: Fixed funnel text dialog append and prepend
     
-    (Discovered while working with a dfilter_macros file having duplicate
-    names for bug 10957, caught by ASAN.)
+    Append to end and prepend to start, not the opposite.
     
-    The second issue fixed in this patch is that the validity of an item is
-    only calculated when a new record is added. So even if the user edits
-    the UAT and makes the entry valid, it would not be saved. This is solved
-    by adding a new uat_update_record() function which got wires up into GTK
-    and Qt.
-    
-    Some open-coded g_array_index and UAT[_USER]_INDEX_PTR are also
-    converted.
+    Change-Id: Ic0e2a7f04a0d9ff18a6fd7063d0550ad35eece1a
+    Reviewed-on: https://code.wireshark.org/review/10027
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 28b5206
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 09:26:50 2015 +0200
+
+    Free protocol in proto_free_deregistered_fields
     
-    Even after this patch, Qt has some issues with UAT handling. In
-    particular, it saves new, but empty/invalid, items. It also it does not
-    check individual fields when saving all fields (unlike Gtk). This patch
-    focused on getting Gtk fixed first so ignores those existing issues.
+    This fixes some issues with use-after-free when reload Lua plugins.
     
-    Change-Id: Ia35cfe9d2b793c65144ae7e29a1ed706b6668d99
-    Reviewed-on: https://code.wireshark.org/review/7120
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I63f3fd9ebe8a19008f560e72067f2078f5eaf759
+    Reviewed-on: https://code.wireshark.org/review/10026
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit f5902a6
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Feb 14 17:59:27 2015 +0100
+commit 8426225
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 07:54:51 2015 +0200
 
-    Fix duplicate Display Filter Macro check
+    Qt: Avoid redissect twice when changing fields
     
-    Since commit 4a1bd75b60171d781dc9f2d3ffd6d498acc74b1a
-    (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7471), the data
-    pointer does not match anything from the macros array.
+    Changing fields in http, imf or ldap used to trigger redissect twice
+    because of UAT_AFFECTS_FIELDS and UAT_AFFECTS_DISSECTION.
+    Also changed from redrawVisiblePackets() to columnsChanged() because
+    fields in a custom column may have changed.
     
-    This patch fixes a false warning by checking for duplicates before the
-    name is committed.
+    This also fixes reloading Lua plugins with Lua fields in custom columns.
     
-    Bug: 10957
-    Change-Id: Id61110bf63de1de80b85524705a2df6a5e7be33a
-    Reviewed-on: https://code.wireshark.org/review/7119
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I805a765690decbe7434dbf1c33ebd1113e23d16d
+    Reviewed-on: https://code.wireshark.org/review/10025
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit fea325d
+commit 6cc1c8d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 15 14:46:30 2015 -0800
+Date:   Thu Aug 13 20:05:43 2015 -0700
 
-    Handle DLT_LOOP differently from DLT_NULL.
+    Clean up heuristic checks.
+    
+    Fix heuristic checks to handle sliced packets correctly.  "Correctly"
+    means "fail the heuristic", as the heuristic checks every single byte of
+    the putative Ixia trailer, as one thing it does is check the checksum,
+    which is in the last 2 bytes of the trailer and checks everything before
+    it.  So just return 0 if the full trailer isn't part of the captured
+    data.
+    
+    Try to handle being handed a tvbuff that contains an FCS by looking at
+    the putative "magic number" locations where it would be if the tvbuff
+    didn't include the FCS and, if that doesn't match, where it would be if
+    it *did* include the FCS.  If the former doesn't match but the latter
+    does, assume that means it does include the FCS, and do all other
+    processing under that assumption.
     
-    That's a little cleaner, and lets us preserve the LINKTYPE_ value for
-    DLT_LOOP captures.  ("Preserve" here doesn't mean "write files with a
-    link-layer header type of 12", as that's ambiguous; we write it with a
-    link-layer header type of LINKTYPE_LOOP, i.e. 108.  If programs on
-    OpenBSD don't recognize that as DLT_LOOP, that's a bug in OpenBSD's
-    libpcap or in the program.)
+    Clean up some comments.
     
-    Change-Id: I48a2e04aed41c013823ffb5c588d2a8e8b376e15
-    Reviewed-on: https://code.wireshark.org/review/7143
+    Fix an hf_ variable name to match the field name, and put the tvbuff
+    value fields in the order of their types.
+    
+    Don't fail if the field length is 0 - it's a value length, so it could
+    in theory be 0.  Rely on the length checks for individual types to catch
+    problems.
+    
+    Change-Id: Idc834aa6637cfbbafd6499060a007e720378154e
+    Reviewed-on: https://code.wireshark.org/review/10024
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1917023
+commit 3c5fd58
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Feb 15 14:03:12 2015 -0800
+Date:   Thu Aug 13 16:36:03 2015 -0700
 
-    Don't base interpretation of LINKTYPE_ values on DLT_ value definitions.
-    
-    Instead, explicitly check for particular build platforms.  This means
-    that the interpretation of the link-layer type values with different
-    meanings on different platforms won't be dependent on the particular
-    version of libpcap with which Wireshark happens to be built, and also
-    means that we don't have to fix pcap-common.c to include pcap.h or
-    net/bpf.h.
-    
-    Fix some comments while we're at it.
+    Get rid of trailing whitespace.
     
-    Bug: 10956
-    Change-Id: If331d9b92081fb0bdf416620fb2ad8dce57dea6b
-    Reviewed-on: https://code.wireshark.org/review/7140
+    Change-Id: I035fad79dd8d01aa3121732f2a9b07d20cc4384f
+    Reviewed-on: https://code.wireshark.org/review/10023
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ad6d259
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Feb 15 10:25:17 2015 -0800
+commit 814f617
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Aug 13 16:30:51 2015 -0700
 
-    EtherCAT: Suppress pedantic warnings.
+    Update to reflect reality.
     
-    Try to suppress
+    The Ixia trailer is a variable-length sequence of TLVs followed by some
+    fixed-length fields.  Describe it as such.
     
-    warning: type of bit-field 'foo' is a GCC extension [-Wpedantic]
+    Realign some #defines while we're at it.
     
-    Change-Id: If161a509db2d6aaad3bb656318902f0bc7b0d0a9
-    Reviewed-on: https://code.wireshark.org/review/7136
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I5fc45a1d44978f1dc1f13e7098c3f797838db7b3
+    Reviewed-on: https://code.wireshark.org/review/10022
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit bfde04b
+commit 5931da9
+Author: Ionut Ceausu <ionut.ceausu@gmail.com>
+Date:   Mon Aug 3 18:06:54 2015 +0300
+
+    ixiatrailer: Change format of the protocol so that is supports future fields.
+    
+    Protocol is TLV protocol and with this change I add one more field to it.
+    It is entire backward compatible.
+    Format is as follow:
+      Fields   Trailer Length  0xAF12(Signature)       Trailer Checksum
+    
+    The fields portion of the trailer is a series of 2-byte fields followed by variable
+    length data. The first byte indicates the field type, the 2nd byte indicates the
+    field length.   The values supported are listed below:
+       1       Reserved (Original Packet Size)
+       3       Timestamp (From Local Timebase)
+       4       Timestamp (From NTP source)
+       5       Timestamp (From GPS)
+       6       Timestamp (From 1588)
+       7       Timestamp (From Holdover)
+    
+    Change-Id: I0a3b31cfbc5b6273e1f5326d9841e449735967fe
+    Reviewed-on: https://code.wireshark.org/review/9854
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
+
+commit 66f784a
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Feb 15 13:58:39 2015 -0500
+Date:   Thu Aug 13 12:02:33 2015 -0400
 
-    ui/gtk/*.c: Add editor modelines; As needed: Fix indentation
+    [config.nmake] Add minor comment about /Zo option for MSVC-2015
     
-    Change-Id: I8cd9d9fe5f12c284f46b8f725766f681faccd753
-    Reviewed-on: https://code.wireshark.org/review/7138
+    Change-Id: Ia4ffc543965160aaf6c39dc19764e62e9e82faa8
+    Reviewed-on: https://code.wireshark.org/review/10020
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 7229c54
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Feb 14 22:31:53 2015 -0500
+commit cd76cf6
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 13 17:27:10 2015 +0200
 
-    epan/ftypes/*.[hc]: As needed: Add editor modelines & Fix indentation
+    ieee802.11: changed blurb to stop checkAPI complains.
     
-    Change-Id: Ib0bd1ea7801ab450b300a94c4757f16d0dd75760
-    Reviewed-on: https://code.wireshark.org/review/7137
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I9ec74a7af229a1af3ca946acc5af94ede1913c29
+    Reviewed-on: https://code.wireshark.org/review/10016
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 0ed1b0f19
+commit 7661bb2
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Feb 14 23:36:47 2015 +0100
+Date:   Thu Aug 13 17:38:09 2015 +0200
 
-    Add ws_mempbrk_sse42_compile to Valgrind suppression list
+    Qt: fix copy of newer files when building with qmake
     
-    When running Valgrind 3.10.0 on an Ubuntu 10.10 x64 guest with Virtualbox 4.3.22, ws_cpuid_sse42() call triggers a false positive when checking ECX bit 20
-    Guy kindly verified the assembler code and confirmed that everything seems fine
-    Let's remove the error to avoid noise when running Valgrind on a capture
-    Change-Id: I357633950249a0c781482865c3221a1babdc74e2
-    Reviewed-on: https://code.wireshark.org/review/7124
+    Change-Id: I8ea5e2770a0c5be3d981d986fa96fe30445db167
+    Reviewed-on: https://code.wireshark.org/review/10018
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit e326318
+commit 2d5f2ae
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Aug 13 16:16:03 2015 +0200
+
+    GVCP: fix dissection of Stream Channel Packet Size register
+    
+    Bug: 11442
+    Change-Id: I1c187bdf7ffd14b2a4f66d29883a4b112486bd35
+    Reviewed-on: https://code.wireshark.org/review/10014
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit 738cf42
 Author: Anders <anders.broman@ericsson.com>
-Date:   Sun Feb 15 18:54:28 2015 +0100
+Date:   Fri May 29 10:33:58 2015 +0200
+
+    Make building with MSVC2015 work
+    TODO:
+    
+    - LUA is commented out probably needs to be built with MSVC 2015.
+    - GeoIP is commented out, causes packet-ip* to not build.
+    - Qt not built, needs Qt with MSVC 2015
+    
+    Change-Id: I1658077931b89b9a22ee32e5ed7de38e07fb6a55
+    Reviewed-on: https://code.wireshark.org/review/8683
+    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 6087f2a
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 13 10:13:52 2015 +0200
+
+    fuzz-test.sh: added missing option in help.
+    
+    Change-Id: I7651e18ec6e8338cddc82be90257c5f183804c7c
+    Reviewed-on: https://code.wireshark.org/review/10011
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit beb5c0b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Aug 11 19:50:43 2015 -0400
 
-    Only call tvb_get_ptr() once to set src and dst addresses-
+    Eliminate proto_tree_add_text from some dissectors.
     
-    Change-Id: I206b25ec512b3665b36307276ab3748e0a5ff73b
-    Reviewed-on: https://code.wireshark.org/review/7135
+    Change-Id: I1e6bf52fad1b1fffefc174a557ff836f400e8fd7
+    Reviewed-on: https://code.wireshark.org/review/9996
+    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 bf15134
+commit 61d1ea4
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Feb 15 08:04:51 2015 -0800
+Date:   Wed Aug 12 15:19:25 2015 -0700
 
-    [Automatic manuf, services and enterprise-numbers update for 2015-02-15]
+    Initialize another variable.
     
-    Change-Id: Ie7aa5657e123ef609e05fc6f09782cc5d2443308
-    Reviewed-on: https://code.wireshark.org/review/7130
+    Change-Id: Ie53a16dc482a9c38538077f6d6a2717cfaddbaa4
+    Reviewed-on: https://code.wireshark.org/review/10010
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 29e1b45
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 15 12:37:36 2015 +0100
+commit 0b7d161
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Aug 11 23:58:54 2015 +0200
 
-    IS-IS (LSP): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    editcap: add change offset.
     
-    Change-Id: I1b68151f0cb09afd6a6aeba2a71a15624c2fbc97
-    Reviewed-on: https://code.wireshark.org/review/7129
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    This option skips some bytes when fuzzing, that prevents some headers from being changed. This focuses fuzzer to a smaller part of the packet.
+    
+    Change-Id: I1db83235e93f2774a9991e3af70f633487b816fa
+    Reviewed-on: https://code.wireshark.org/review/9982
+    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 65763cf
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Feb 14 13:36:45 2015 -0800
+commit 99e3244
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 12 14:12:24 2015 -0700
+
+    Initialize a couple of variables.
+    
+    Change-Id: I10471b770356ad46a10740198156055e1480eeb3
+    Reviewed-on: https://code.wireshark.org/review/10008
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit db2692c
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 12 20:58:14 2015 +0200
 
-    Try to fix diagnostic suppression.
+    Qt (main_window) fix no previous prototype for '...' [-Wmissing-prototypes]
     
-    Test the compiler for "-Wpedantic" instead of "-pedantic" since DIAG_OFF
-    and DIAG_ON expect a "-W" flag prefix. Be more strict about the compiler
-    versions that DIAG_OFF and DIAG_ON support.
     
-    Change-Id: I9304c544912102f1719b79e9250f97b40a324430
-    Reviewed-on: https://code.wireshark.org/review/7123
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I43901d37817f9b79d508336253e766d740939e70
+    Reviewed-on: https://code.wireshark.org/review/10003
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1b43a80
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 14 14:52:24 2015 -0800
+commit 2449c7a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 12 21:06:08 2015 +0200
 
-    Note why some header checks are done even if unnecessary on UN*X.
+    GTP: fix indent (use 4 spaces)
     
-    Change-Id: I0ea8cbaed65922e4dd5e49bbb7578b392deb8c02
-    Reviewed-on: https://code.wireshark.org/review/7125
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I2f0645adee2aff32122a8ccb60843e1bfd0897e1
+    Reviewed-on: https://code.wireshark.org/review/10004
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit bade5f3
-Author: Richard Sharpe <realrichardsharpe@gmail.com>
-Date:   Sat Feb 14 11:41:47 2015 -0800
+commit 451dd05
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Aug 12 16:47:36 2015 -0400
 
-    A small correction to the documentation to bring it in line with the code.
+    [lwres] Fix (32 bit ?) MSVC-2015 warning: "conversion from 'size_t' to 'guint16', possible loss of data"
     
-    Change-Id: I5818b9f3348a70d817bf885697cd67440d812889
-    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/7121
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ifc71d1c2afc3ff16f950f2f1c3c9e7142d62fc16
+    Reviewed-on: https://code.wireshark.org/review/10007
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit f80a720
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Feb 14 10:18:26 2015 -0800
+commit d20f2b6
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Aug 12 16:24:03 2015 -0400
 
-    WSUG and image updates.
+    [pdc] Fix a few [msvc-2015?] warnings about 'constant compared to constant'
     
-    Update the protocol hierarchy, conversation, and endpoint sections of
-    the User's Guide. When everything is an admonition nothing stands out.
-    Make a series of "NOTE"s plain old paragraphs. Scale the new
-    conversation and endpoint images to fit the page width. This looks funny
-    in my browser but I'm not sure about the best way to fix it.
+    Essentially: Do the version checks at compile time using
+                 #if statements (even though the compiler
+                 probably optimized out the run time checks).
+    
+    Change-Id: I4879b39729ba5bd6b1c478ac43c107cb9fb445b3
+    Reviewed-on: https://code.wireshark.org/review/10006
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit 6ae8df4
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Aug 12 16:15:05 2015 -0400
+
+    [pdc] [msvc-2015] Change a variable type to prevent 32-bit MSVC-2015 "internal error"
     
-    Move image/compress-pngs to the tools directory. Use it to reduce the
-    size of the WSUG and WSDG images.
+    [...]\packet-pdc.c(205) : fatal error C1001: An internal error has occurred in the compiler.
     
-    Fixup traffic table column names and window titles.
+    (compiler file 'f:\dd\vctools\compiler\utc\src\p2\main.c', line 246)
+     To work around this problem, try simplifying or changing the program near the locations listed above.
+    Please choose the Technical Support command on the Visual C++
+     Help menu, or open the Technical Support help file for more information
     
-    Change-Id: I674342ed901fc64563b384ee5e1f35413736cb19
-    Reviewed-on: https://code.wireshark.org/review/7122
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    INTERNAL COMPILER ERROR in 'C:\Program Files\Microsoft Visual Studio 14.0\VC\BIN\cl.EXE'
+        Please choose the Technical Support command on the Visual C++
+        Help menu, or open the Technical Support help file for more information
+    
+    Change-Id: I505898d0c76244a56d75af1a1c5bf30554dd9a2b
+    Reviewed-on: https://code.wireshark.org/review/10005
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit e11d7ef
+commit 5c80f08
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 13 13:51:05 2015 -0800
+Date:   Tue Aug 11 11:48:07 2015 -0700
 
-    Fix diagnostics macros and squelch a gcc warning.
+    Add DCE-RPC and ONC-RPC service response time dialogs.
+    
+    Add RpcServiceResponseTimeDialog, which handles DCE-RPC and ONC-RPC
+    service response time statistics. Try to make it as lightweight as
+    possible, since we might want to pull this into the RPC dissectors
+    similar to the other SRT statistics.
+    
+    Allow program names on the command line in place of numbers or UUIDs. Make
+    matches case-insensitive. E.g. the following are equivalent:
     
-    Both clang and gcc define __GNUC__. Make sure we account for that when
-    defining diagnostic macros.
+        -z rpc,srt,100003,3
+        -z rpc,srt,nfs,3
+        -z rpc,srt,NFS,3
     
-    Use DIAG_OFF + DIAG_ON to suppress gcc -pedantic warnings about
-    frame_data.
+    as are the following:
     
-    Get rid of packet_char_enc casts.
+        -z dcerpc,srt,f5cc5a18-4264-101a-8c59-08002b2f8426,56
+        -z dcerpc,srt,nspi,56
+        -z dcerpc,srt,NSPI,56
     
-    Change-Id: Idbcc61bcdb35c1d20f185461c69451dcdf73bae9
-    Reviewed-on: https://code.wireshark.org/review/7106
+    Change-Id: Ie451c64bf6fbc776f27d81e3bc248435c5cbc9e4
+    Reviewed-on: https://code.wireshark.org/review/9981
     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 5cc0ad8
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Feb 14 09:00:36 2015 -0800
+commit 412f5b3
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 12 10:49:34 2015 -0700
 
-    Remove a duplicate typedef.
+    Expert information dialog performance improvements.
+    
+    Inserting QTreeWidgetItems individually is slow. This isn't a problem if
+    you only have a few items but the Expert Information dialog can have
+    thousands. Add "packet" tree items in groups, which should be much
+    faster. Note that we still add "group" tree items individually since
+    that gives us a nice progress indicator.
+    
+    While we're here, make sure we show the dialog before tapping packets.
     
-    Change-Id: Ie26785cc3577bda84cb4d244aab5a607797b99fb
-    Reviewed-on: https://code.wireshark.org/review/7118
+    Bug: 11439
+    Change-Id: I8a182f4158d078cae5f42b8d1355414197f423e1
+    Reviewed-on: https://code.wireshark.org/review/10000
+    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 ca534b1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Feb 14 13:03:45 2015 +0100
+commit bde416a
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 12 15:21:46 2015 +0200
 
-    MIP6: Local Mobility Anchor Address mobility option code is treated incorrectly
+    Lua: Moved deregister out of wslua_cleanup
     
-    The first packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=1. Wireshark parses its address as IPv4 address.
+    Change-Id: Ia43aa0e5f09400ef9923288b362256094a1241b8
+    Reviewed-on: https://code.wireshark.org/review/9998
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 5a92694
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 12 14:51:29 2015 +0200
+
+    Initialize is_reloading_lua at startup
     
-    The second packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=2. Wireshark parses its address as IPv6 address.
+    Change-Id: I211e0f4b86cff1c311d4ae67cbb47de14846144f
+    Reviewed-on: https://code.wireshark.org/review/9997
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit dc7443f
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 12 14:07:24 2015 +0200
+
+    Added guards for deregistered fields
     
-    According to RFC 5949 (https://tools.ietf.org/html/rfc5949#section-6.2.2), Option-Code=1 means IPv6 and Option-Code=2 means IPv4, exactly the opposite to what Wireshark does.
+    This is functions used when redissecting after a Lua plugins reload.
     
-    Bug: 10961
-    Change-Id: I03b76dda8beae211e67e6c9e1f40d122e851b1b5
-    Reviewed-on: https://code.wireshark.org/review/7113
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ida14526faec1992006938a6732ee894ac83c2d12
+    Reviewed-on: https://code.wireshark.org/review/9995
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 847f590
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Feb 14 12:47:38 2015 +0100
+commit a3e3d60
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Aug 12 13:24:06 2015 +0200
 
-    MIP6: AUTH mobility option parses Mobility SPI and Authentication Data incorrectly
+    Align comments
     
-    The authentication data in the AUTH option in attached IPv6 packet contains one byte too much. This byte is read beyond the option data.
-    In Wireshark, clicking on the AUTH shows that the option ends at 0xCE while clicking on the Authentication Data shows that it ends at 0xCF.
-    
-    Reported by Boaz
+    Change-Id: Iab59ba51700b018337552018c76e30dcbd41f3f6
+    Reviewed-on: https://code.wireshark.org/review/9993
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit cd16301
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Aug 12 10:00:01 2015 +0200
+
+    [GTP] Direct Tunnel Flags  7.7.81 is currently specified with one data
+    octet.
     
-    Bug:10626
-    Change-Id: I0bcfd6331bc1de30f25d16590487c0e3bf5c002f
-    Reviewed-on: https://code.wireshark.org/review/7112
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Iab7917b23e6be03f63a92ef0aaf0814c9cbea2c3
+    Reviewed-on: https://code.wireshark.org/review/9992
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 91b5042
+commit bfdc2cb
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 11 20:13:36 2015 -0500
+Date:   Mon Aug 10 19:28:54 2015 -0400
 
-    "Hide" hashether_t structure.
-    
-    One use in a GUI function isn't really enough to justify making the structure public.
+    Eliminate proto_tree_add_text from some dissectors.
     
-    Change-Id: Ic7dee275ba0a2bd4e19c06702a867417c5624c27
-    Reviewed-on: https://code.wireshark.org/review/7080
+    Change-Id: I7a7778802c442b254626a7676cb74ca2855fa65e
+    Reviewed-on: https://code.wireshark.org/review/9977
     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 a64fc6c
+commit 50b51a6
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 14 00:04:36 2015 -0800
+Date:   Tue Aug 11 22:42:26 2015 -0700
 
-    Don't check for C89 headers.
+    Some further questions, asked in comments.
     
-    1988 called, they want their lack of a C standard back.  We don't need
-    to check whether we have stdarg.h, stddef.h, stdlib.h, or string.h, as
-    they're specified by C89 and I don't think there are any platforms we
-    care about that don't have a C89 environment in which we could be built.
+    Change-Id: I41c7918b7396934c651fb957d3b61db0c7a19527
+    Reviewed-on: https://code.wireshark.org/review/9990
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 260ae6a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 11 19:00:26 2015 -0700
+
+    Clean up the file header description.
     
-    Change-Id: I447551181284fab7722354b62774625ed8ee94bc
-    Reviewed-on: https://code.wireshark.org/review/7110
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I4928f99cdc2b8fc2a3aef648b613ce0b93ed3563
+    Reviewed-on: https://code.wireshark.org/review/9989
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit f623537
+commit 1100ba9
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Feb 13 18:08:47 2015 -0800
+Date:   Tue Aug 11 18:38:08 2015 -0700
 
-    We use GLib's directory-reading routines, so we don't need <dire[cn]t.h>.
+    Update comments.
     
-    Change-Id: Id86e5d6d0ab24adb1bfff0688f33a40f2fdaed8d
-    Reviewed-on: https://code.wireshark.org/review/7108
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I4b0b4bb31901208e09a535ef922e134116309531
+    Reviewed-on: https://code.wireshark.org/review/9988
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b5a3b65
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 13 16:18:57 2015 -0800
+commit 36c50fe
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 11 18:32:18 2015 -0700
 
-    Qt: Fix side effects of recent WiresharkDialog changes.
+    Document Colasoft Capsa file support.
     
-    Quit the application when the main window closes. This cleans up any
-    other top-level windows that might be open.
+    Change-Id: I89374413f3e08e2a35923b8bd4c128b3c659158a
+    Reviewed-on: https://code.wireshark.org/review/9987
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 7b39eac
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 11 18:27:10 2015 -0700
+
+    It looks as if the origin of the time stamps is the UN*X epoch.
     
-    Don't dereference a NULL pointer when opening the sequence dialog from
-    the VoIP calls dialog.
+    If we assume that, the time stamps of the sample captures on the
+    Colasoft site are in the range 2000-2014, and the HTTP time stamps in
+    the HTTP capture from there are close to the packet time stamps.
     
-    Change-Id: I9902d40ead1c5f2e541b6d79f3d957228e4e9687
-    Reviewed-on: https://code.wireshark.org/review/7107
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Id0e29c03dc8ada40f1040b95f169b4f3a8954a0f
+    Reviewed-on: https://code.wireshark.org/review/9986
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit f85d1c8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 13 11:18:30 2015 -0800
+commit 14c7525
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Tue Aug 11 21:57:11 2015 +0200
 
-    WSUG: Add a note about dialogs vs windows.
+    [Qt Expert Info dialogue] remove our tap listener when the dialogue is destroyed
+    
+    if we don't do this, there'll be a dangling tap listener and we'll see a
+    crash when its reset method is called
     
-    Change-Id: I38d7838db2be59af8a31d94b7cafeeef62698215
-    Reviewed-on: https://code.wireshark.org/review/7105
+    this can be triggered by opening another expert info dialogue, this will
+    invoke cf_retap_packets() and reset_tap_listeners() which in turn calls
+    the reset method of each registered tap listener
+    
+    Bug: 11432
+    Change-Id: I8fc13351666c875e1a3641f31bada8e80d167ab2
+    Reviewed-on: https://code.wireshark.org/review/9979
+    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 3e3fc9f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Feb 13 14:02:43 2015 -0500
+commit f1a4db3
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 11 22:04:58 2015 +0200
 
-    epan/dfilter/*.c: As needed: Add editor modelines & Fix indentation
+    Lua: Remove unneeded call in wslua_cleanup
     
-    Change-Id: I410839329a98bd806c60961dfb9693d5eeeeb702
-    Reviewed-on: https://code.wireshark.org/review/7104
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I0cda00001b40e5951d680d72dbc8043cbe8b9309
+    Reviewed-on: https://code.wireshark.org/review/9980
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 6040bcd
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Feb 13 13:43:32 2015 -0500
+commit 58ec64c
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 11 21:52:32 2015 +0200
 
-    caputils/*.c: As needed: Add editor modelines & Fix indentation
+    wmem: Fix wmem_tree_remove_string
     
-    Change-Id: I081446fbbc242c01f8ac9dede575c3ea77421c42
-    Reviewed-on: https://code.wireshark.org/review/7103
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Always set is_removed when insert data in a node.
+    
+    Change-Id: I8fb50932a369e3f4fe8a1f743462683fff705cc2
+    Reviewed-on: https://code.wireshark.org/review/9978
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 82f081d
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Feb 13 13:25:19 2015 -0500
+commit 4309b96
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 11 12:16:23 2015 -0700
 
-    wslua*: Add editor modelines; Fix indentation, etc as needed.
+    Sort dump_open_table_base[] in the right order.
     
-    Change-Id: I6df5d46f4b263104aa9cb6353cc987087cdb867e
-    Reviewed-on: https://code.wireshark.org/review/7102
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    As the comment says, "Entries must be sorted by
+    WTAP_FILE_TYPE_SUBTYPE_xxx values in ascending order."  If they're not,
+    the file type to file type string routines don't give the right answer.
+    
+    Change-Id: I06afe7bb98cb36c54ddc831113bb632598ab2eb0
+    Reviewed-on: https://code.wireshark.org/review/9975
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 9c866ff
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Feb 13 12:05:26 2015 -0500
+commit de70d2a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 19:11:20 2015 +0200
 
-    Replace tabs by spaces when editor modelines has "expandtab"
+    H225: fix indent (use 2 spaces) and add modelines info
     
-    Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7
-    Also: tabs-stops should be 8
-    Reviewed-on: https://code.wireshark.org/review/7100
+    Change-Id: Ibe4cf8d004c6c94f745e5c620100af9483fa6a31
+    Reviewed-on: https://code.wireshark.org/review/9934
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 936f685
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 13 08:36:53 2015 -0800
+commit d6c6b08
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 11 16:11:46 2015 +0200
 
-    Qt: Allow shift-double-clicking on a frame link.
+    wmem: Mark removed strings with is_removed
     
-    You can open a new packet window in the GTK+ UI by holding down the
-    shift key and double-clicking on a frame link in the protocol tree. Add
-    this behavior to the Qt UI. Document the different ways of opening a new
-    packet window and update the image.
+    This will allow integer value 0 again.
     
-    Change-Id: I55caf6cc8089a6c305fafd47b4870e7c69dbfb10
-    Reviewed-on: https://code.wireshark.org/review/7101
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ibfa4249ea8b887971d3b3214ad9e4d095d20d155
+    Reviewed-on: https://code.wireshark.org/review/9973
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 4d5bdf4
-Author: Richard Sharpe <realrichardsharpe@gmail.com>
-Date:   Sat Jan 24 21:08:06 2015 -0800
+commit ecc4f75
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 11 14:08:08 2015 +0200
 
-    A dissector for the RSVD Protocol (see [MS-RSVD].pdf).
-    
-    There is still a little more work to do here, especially we should call the
-    SCSI dissector for handling SCSI CDBs etc ...
+    Added Reload Lua plugins.
     
-    This is a potential fix for bug 10913.
+    This is initial support for reloading Lua plugins without
+    restarting the application.
     
-    Ping-Bug: 10913.
+    Still todo:
+    - Deregister FileHandlers
+    - Support deregister ProtoField with existing abbrev (same_name_hfinfo)
+    - Add a progress dialog when reloading many plugins
+    - Search for memory leakages in wslua functions
     
-    Change-Id: Ia8ff1a8207bb5b1cd18079086ff8c472ae3f8736
-    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/7022
-    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: I48870d8741251705ca15ffe1068613fcb0cb18c1
+    Reviewed-on: https://code.wireshark.org/review/5028
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 8843606
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 12 19:31:13 2015 -0800
+commit 70d06de
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 11 13:52:34 2015 +0200
 
-    Qt: Try to make some dialogs behave like windows.
+    [SMCR] Minimum 4 bytes is required to perform the heuristic check.
     
-    Initialize WiresharkDialog with a NULL parent. This should make its
-    subclasses behave like independent windows.
+    Change-Id: I29426147cb1443af3c9cc9dc1b60beabe9a94277
+    Reviewed-on: https://code.wireshark.org/review/9972
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit f233824
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 11 13:32:41 2015 +0200
+
+    [Diameter] Add expert info to subdissection of 3GPP AVP:s
     
-    Change-Id: If84609eeba53a92780c0873a1243888998d2b26b
-    Reviewed-on: https://code.wireshark.org/review/7094
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ic2ec0696f1f6b8bb918dd04aa898dccdb8b90ece
+    Reviewed-on: https://code.wireshark.org/review/9971
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 2579607
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 11 13:06:40 2015 +0200
+
+    [ENEA LINX over TCP] Make the TCP port registration a preference defalted
+    to 0.
+    
+    Change-Id: I837bf8ac9d5724dd485f0bc62f3fe32bedd3eb0e
+    Reviewed-on: https://code.wireshark.org/review/9970
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit c262bf2
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 11 11:08:20 2015 +0200
+
+    [GIOP] A GIOP message can have size = 0 (CloseConnection)
+    
+    Change-Id: I1feb6135c79191aa3ac7f36bbc969e6b36314107
+    Reviewed-on: https://code.wireshark.org/review/9969
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 56a9b53
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Aug 10 23:09:16 2015 +0200
+
+    zbee-nwk-gp: fix a memory leak when keys are defined in the preferences
+    
+    ==5932== 33 (32 direct, 1 indirect) bytes in 1 blocks are definitely lost in loss record 2,124 of 4,121
+    ==5932==    at 0x4C28BED: malloc (vg_replace_malloc.c:263)
+    ==5932==    by 0xA024F30: g_malloc (gmem.c:159)
+    ==5932==    by 0xA03A9E5: g_memdup (gstrfuncs.c:384)
+    ==5932==    by 0x70754D2: gp_init_zbee_security (packet-zbee-nwk-gp.c:1459)
+    ==5932==    by 0xA03A78C: g_slist_foreach (gslist.c:840)
+    ==5932==    by 0x67E867C: init_dissection (packet.c:249)
+    ==5932==    by 0x67DC202: epan_new (epan.c:160)
+    ==5932==    by 0x414B16: cf_open (tshark.c:2464)
+    ==5932==    by 0x40CF8A: main (tshark.c:2169)
+    
+    Change-Id: I7c0ce0717957525ca18eb4888ed3389debc89a49
+    Reviewed-on: https://code.wireshark.org/review/9967
+    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 48a95de
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Feb 12 17:23:46 2015 -0500
+commit b1be6bc
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Aug 10 22:41:13 2015 +0200
 
-    Register the Mongo dissector by name so it can be used with TLS.
+    zigbee: remove some more if (tree) checks
     
-    Change-Id: Ic9d688603747312aa29e5af038363f70c3cbae33
-    Reviewed-on: https://code.wireshark.org/review/7097
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I81b46ec7d9d919ff2779d1005063e9ef6c92e097
+    Reviewed-on: https://code.wireshark.org/review/9966
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit 52a7b79
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Aug 10 22:27:58 2015 +0200
 
-commit c1610c7
+    remove some unnecessary if (tree) checks
+    
+    Change-Id: Ib0f4cc47ede7b840cba38ecad04bd17bb6bccd55
+    Reviewed-on: https://code.wireshark.org/review/9965
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit 94bb276
 Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Feb 13 14:40:29 2015 +0100
+Date:   Mon Aug 10 13:19:25 2015 +0200
 
-    Micro optimization, only do tvb_get_ptr() once for dst and src
-    respectivly.
+    Try to fix the build bou by copying tha cast made in glib.
     
-    Change-Id: I1cdc5742057830a47ea71769fb54ab8dfdd3de14
-    Reviewed-on: https://code.wireshark.org/review/7096
+    Change-Id: I6da06b8e6ae272b940ef4ee47ce6b253bf9f3699
+    Reviewed-on: https://code.wireshark.org/review/9961
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 91a6e5e
-Author: Vincenzo Reale <smart2128@baslug.org>
-Date:   Fri Feb 13 07:51:47 2015 +0100
+commit e1003ee
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Aug 7 16:29:50 2015 +0200
 
-    Italian translation update
+    editcap: fix -T <encapsulation type> option when output format is pcapng
     
-    Change-Id: Ibf66f25a257051ba12c3fb9687ac57377117138f
-    Reviewed-on: https://code.wireshark.org/review/7036
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Dario Lombardo <lomato@gmail.com>
+    Right now the output encapsulation type is ignored if the output (default) format is set to pcapng.
+    
+    Change-Id: Ibffaaed5979bf63ed4e3fa3b1f859a82b401d80b
+    Reviewed-on: https://code.wireshark.org/review/9911
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     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 7fb514f
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:52:38 2015 +0200
+
+    GSM (a_common): fix indent (replace tab by 8 spaces)
+    
+    Change-Id: Id1d6bfcb04ac75d767fe6f09454dc8235de7bc75
+    Reviewed-on: https://code.wireshark.org/review/9928
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 76d4b80
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Aug 10 10:26:16 2015 +0200
+
+    g_slist_free_full () does not exist until GLIB 2.28
+    
+    Change-Id: I81df5b4dbe1916eca51cdb72199de7a90471bd07
+    Reviewed-on: https://code.wireshark.org/review/9960
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 75d46fe
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Aug 10 00:53:34 2015 -0700
+
+    Get rid of trailing white space.
+    
+    Change-Id: I3c0091612bdd518f749abbfbefbd0e2097b8c18b
+    Reviewed-on: https://code.wireshark.org/review/9958
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 43c2e57
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Aug 10 00:30:33 2015 -0700
+
+    Don't try to decrypt the payload if it was cut short by the snapshot length.
+    
+    It's not clear that the decryption code can handle an incomplete
+    payload.  If it can, please fix this (bear in mind that you won't have
+    all the MIC, and may not have *any* of the MIC, so...).
+    
+    Bug: 11389
+    Change-Id: Ie863ddc5c4aa7fbf6cde317823a413d226a41c0d
+    Reviewed-on: https://code.wireshark.org/review/9954
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 3157114
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Aug 9 23:55:55 2015 -0700
+
+    Use the reported length where appropriate.
+    
+    Use the captured length to know how much data to decrypt.  Use the
+    reported length to determine whether we have a null payload and to se
+    the reported length of the decrypted payload and of tvbuffs for the
+    un-decrypted payload.
+    
+    Bug: 11389
+    Change-Id: I4395c5a48c16110fcf31b611b99749c61000d489
+    Reviewed-on: https://code.wireshark.org/review/9953
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit d108f28
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 9 18:06:47 2015 +0200
+
+    zigbee: fix two memory leaks
+    
+    ==17992== 4 bytes in 1 blocks are definitely lost in loss record 68 of 4,102
+    ==17992==    at 0x4C28BED: malloc (vg_replace_malloc.c:263)
+    ==17992==    by 0x9FB2F30: g_malloc (gmem.c:159)
+    ==17992==    by 0x9FC89E5: g_memdup (gstrfuncs.c:384)
+    ==17992==    by 0x703F977: dissect_zbee_aps (packet-zbee-aps.c:1300)
+    ==17992==    by 0x67B4F1E: call_dissector_through_handle (packet.c:618)
+    
+    ==17992== 8 bytes in 1 blocks are definitely lost in loss record 580 of 4,102
+    ==17992==    at 0x4C272B8: calloc (vg_replace_malloc.c:566)
+    ==17992==    by 0x9FB2F88: g_malloc0 (gmem.c:189)
+    ==17992==    by 0x703F962: dissect_zbee_aps (packet-zbee-aps.c:1299)
+    ==17992==    by 0x67B4F1E: call_dissector_through_handle (packet.c:618)
+    
+    second version that uses glib memory routines and does not mix
+    g_hash_table and wmem
+    
+    remove an obsolete comment and an unnecessary return; while at it
+    
+    Change-Id: I2e92db0613f01b6c3009e8ad82ceb65a87cba12e
+    Reviewed-on: https://code.wireshark.org/review/9830
+    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 c462f1b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Aug 9 18:33:30 2015 -0400
+
+    Eliminate proto_tree_add_text from packet-wbxml.c
+    
+    While I was at it, some (mostly) duplicate functionality allowed rearranging of functions to eliminate most forward declarations.
+    
+    Change-Id: I2d7027d336c391d81dfe81c7a1ebf0d56c0826b2
+    Reviewed-on: https://code.wireshark.org/review/9951
+    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 6d8b4af
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Aug 6 22:35:23 2015 +0100
+
+    Cleanup variable name in dissect_frag6()
+    
+    Change-Id: Ib6bdea5dbc95b5221e41ca30c11288ff8c1dbb7f
+    Reviewed-on: https://code.wireshark.org/review/9952
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 655b0dc
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Aug 10 00:00:21 2015 +0200
+
+    use the captured length as payload length for zigbee decryption
+    
+    this length is used for allocating a buffer and for crypto calculations
+    we should use the bytes that were actually captured, not the reported
+    length
+    
+    the capture in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11389
+    has one packet with a stupidly large reported length and a reasonable
+    capture length (and one completely bogus packet) - this fix ensures that
+    the decryption does not break for the former packet
+    
+    also, tvb_reported_length_remaining() does not return values < 0 any
+    more, remove the check for this
+    
+    Bug: 11389
+    Change-Id: I42cb4526483160416b51e3cb72442148b5fac4f3
+    Reviewed-on: https://code.wireshark.org/review/9950
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit aafc7ff
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:55:15 2015 +0200
+
+    H225: fix no previous prototype for 'h225_stat_init' [-Wmissing-prototypes]
+    
+    Change-Id: I945bbbb3b10258f22c60b04b19cf55671fc6ed94
+    Reviewed-on: https://code.wireshark.org/review/9933
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit a051961
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Aug 9 14:55:27 2015 -0400
+
+    [wiretap/nettrace_3gpp_32_423] Add editor modelines
+    
+    Change-Id: Ie2b9da2b3a08d18fc913a00cf076aa881a583552
+    Reviewed-on: https://code.wireshark.org/review/9949
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit a29f513
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Aug 9 14:16:22 2015 -0400
+
+    [skinny] Add missing change to source (.in); Also do minor cleanup.
+    
+    packet-skinny.c is generated from packet-skinny.in and etc.
+    So: Change committed in gceb8d95 to packet-skinny.c should really
+    have been applied as well to packet-skinny.c.in.
+    
+    Minor cleanup:
+     Remove a few unneeded initializers;
+     Remove unneeded code in proto_reg_handoff_skinny();
+     Replace a tab by spaces;
+     Change editor tab-width specification to be 8 (not 2). No actual
+      indentation change since tabs not used in the file.
+    
+    packet-skinny.c regenerated using 'cog'
+    
+    Change-Id: Ib3510c257e0b98bb7da8fae9aa010e134ec381cb
+    Reviewed-on: https://code.wireshark.org/review/9948
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit 2ef3cda
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Aug 9 10:36:18 2015 -0400
+
+    t124: kill evil global variables
+    
+    Bug: 11430
+    Change-Id: Ia4196ff693806dc1e20eae4075dda7dfe272c5b6
+    Reviewed-on: https://code.wireshark.org/review/9941
+    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+
+commit b3207c0
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 9 18:33:04 2015 +0200
+
+    zigbee: remove a numer of unnecessary if (tree) checks
+    
+    Change-Id: Ifd0dcc220cfdd0809f2e7cf2fc54fc8bdeb987be
+    Reviewed-on: https://code.wireshark.org/review/9947
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit c5af152
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Aug 9 12:20:54 2015 -0400
+
+    Trivial: Convert 'tabs' indentation to '4 space' indentation
+    
+    Change-Id: If71dd8a04050ce11e37ad88ee862419313c06639
+    Reviewed-on: https://code.wireshark.org/review/9946
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit f0b4b72
+commit dbf314a
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Aug 9 12:14:39 2015 -0400
+
+    Trivial: Change editor-modelines tab-width specification from 4 to 8.
+    
+    [There were no actual indentation changes since since none of the files
+     contained tabs].
+    
+    Change-Id: I92ff551e70274f459c466e1c1d449905e0e7dc92
+    Reviewed-on: https://code.wireshark.org/review/9945
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit 394773c
 Author: Gerald Combs <gerald@zing.org>
-Date:   Thu Feb 12 20:13:09 2015 -0800
+Date:   Sun Aug 9 08:57:29 2015 -0700
 
-    Qt: Revert g6e88978 for main_status_bar.
+    Switch the guides back to html output.
+    
+    DocBook's xhtml5 stylesheet output didn't render correctly in Firefox.
     
-    It made some slot signatures unusable.
+    This reverts commit dc09d18e8ecdc55de2361d8ff6d2b0bf36345a70.
+    This reverts commit 62e56ad92a50c7dd58e83447207b8be0cc0bbb76.
+    This reverts commit 53a80334bcb3ca40a5aaef504e2aca0f04bcc9f3.
     
-    Change-Id: I0f7cdad9e84a5ffb2bdfe4042ac93b3ea19b4893
-    Reviewed-on: https://code.wireshark.org/review/7095
+    Change-Id: Iafcf18cfce25772146fc2e155728401fd105a44b
+    Reviewed-on: https://code.wireshark.org/review/9944
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 80342e4
-Author: Gerald Combs <gerald@zing.org>
-Date:   Thu Feb 12 19:03:50 2015 -0800
+commit a8af51d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 9 08:10:47 2015 -0700
 
-    Qt: Make WiresharkDialog act like a window.
+    [Automatic update for 2015-08-09]
     
-    Set Qt::Window when we initialize QDialog. This should add a minimize
-    button to most of the dialogs that need one.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I8595dee9c6a28a4e0a8518213176ba10a6d8dcc6
-    Reviewed-on: https://code.wireshark.org/review/7093
+    Change-Id: I14806e32e93b7f189ccc68834afa4645bda3e1aa
+    Reviewed-on: https://code.wireshark.org/review/9942
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit a0498f1
+commit 4bba83b
 Author: Gerald Combs <gerald@zing.org>
-Date:   Thu Feb 12 19:00:59 2015 -0800
+Date:   Sat Aug 8 16:29:24 2015 -0700
 
-    Qt: Double clicking a packet opens the packet window.
+    Reset the splash timer after processing events.
     
-    Connect the packet list's doubleClicked signal to the main window's
-    openPacketDialog slot.
+    Change-Id: Id71a3ac5e8f04df6a19e92021e47ea64728c2595
+    Reviewed-on: https://code.wireshark.org/review/9936
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit de872cb
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Aug 8 15:44:02 2015 -0700
+
+    Generate DocBook conditionally.
+    
+    Add back a check when generating DocBook.
     
-    Change-Id: I5bc20c113fb1f22e2257fc1dbdef76c9920e05d0
-    Reviewed-on: https://code.wireshark.org/review/7092
+    Change-Id: I00679853d537f543db6f37a60ae4c46b3cce76e6
+    Reviewed-on: https://code.wireshark.org/review/9935
+    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 6e88978
+commit 0626e76
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 12 15:35:59 2015 -0800
+Date:   Fri Aug 7 18:17:04 2015 -0700
 
-    Qt: More #include → forward declarations.
+    CMake: Try to fix generated docbook dependencies.
     
-    Change-Id: Ib6de71f801cd3053374b6c867370acd594dcd396
-    Reviewed-on: https://code.wireshark.org/review/7089
+    Add custom {developer,user}_guide_docbook targets for docbook output. Make
+    sure the HTML, PDF, and CHM outputs depend on their associated docbook
+    target and not on the output .xml file. This keeps us from running a2x
+    instances in parallel.
+    
+    Change-Id: I73b0db50ae92f62eb08ae284d498cdf2d697ac00
+    Reviewed-on: https://code.wireshark.org/review/9920
     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 a5652c7
+commit 11e5422
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:50:17 2015 +0200
+
+    GSM (a_common): fix no previous prototype for 'gsm_a_*_init' [-Wmissing-prototypes]
+    
+    Change-Id: I2990cb3432ad377cbed7039ad8fe15019eb7e7f5
+    Reviewed-on: https://code.wireshark.org/review/9927
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 524db99
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:46:45 2015 +0200
+
+    GSM (a_common): fix comma at end of enumerator list [-Wpedantic]
+    
+    Change-Id: I0ea06451861412b642d033a70e0a639aae753beb
+    Reviewed-on: https://code.wireshark.org/review/9926
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit f6fb630
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 8 10:04:47 2015 -0700
+
+    Fix another typo.
+    
+    Change-Id: I1fee679b4b0f582806b0e9302c3e404c0222cd6d
+    Reviewed-on: https://code.wireshark.org/review/9930
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit c60c1b9
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:37:58 2015 +0200
+
+    IEEE802.11: Fix typo
+    
+    Pseduo -> Pseudo
+    
+    Change-Id: I34700b3392bfd7e47e79cb2cad0f65a1046a26a2
+    Reviewed-on: https://code.wireshark.org/review/9925
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 454f08d
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Aug 8 09:57:14 2015 -0400
+
+    If SOCKS server doesnt't require authentication, then client should be ready for commands.
+    
+    Bug: 11417
+    Change-Id: I62c6d94923dcda2ef8297086faac7d7c4b85a3fb
+    Reviewed-on: https://code.wireshark.org/review/9923
+    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 9a16a69
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:10:48 2015 +0200
+
+    NCP2222.py : fix generate indent (use 4 spaces)
+    
+    Change-Id: Ibe55260e837f0a839649675c08e1bf66d8bcdb52
+    Reviewed-on: https://code.wireshark.org/review/9924
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 39ad1bf
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 13:20:52 2015 +0200
+
+    NCP2222(.inc): fix indent (use 4 spaces)
+    
+    Change-Id: I8161423ae270f685c28003eac36adf15be83c5fd
+    Reviewed-on: https://code.wireshark.org/review/9922
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit b703f47
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 13:08:57 2015 +0200
+
+    GTPv2: fix indent (use 4 spaces)
+    
+    Change-Id: I7836360ae4fe67098776911a496ecc969d3e093d
+    Reviewed-on: https://code.wireshark.org/review/9921
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 5cf66db
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 15:38:34 2015 -0700
+
+    Add a missing dependency.
+    
+    Change-Id: I2c9814419882f9bee30e70697d6f284393f275a9
+    Reviewed-on: https://code.wireshark.org/review/9919
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 7cb2b11
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 12 10:17:05 2015 -0800
+Date:   Fri Aug 7 15:08:22 2015 -0700
 
-    Qt: ElidedLabel doesn't support rich text / HTML.
+    Rework CMake dependendencies in the docbook directory.
     
-    Change-Id: Ia5ca9784c60325c01ba5e6378997008f8ef1dd6e
-    Reviewed-on: https://code.wireshark.org/review/7091
+    Create dependencies explicitly using add_dependencies. Otherwise MSBuild
+    only builds one output per run.
+    
+    Change-Id: If42605d7e7df499cf4d4b70336d97ac6d37e8ba6
+    Reviewed-on: https://code.wireshark.org/review/9918
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit f1d1354
+commit a001ed6
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 7 15:27:11 2015 -0700
+
+    Avoid (unlikely) NRB record size overflows.
+    
+    If a host name is *so* long that an entry for it won't fit in a
+    65535-byte Name Resolution Block record, ignore the entry for that host.
+    
+    Use more appropriate data types (guint32 for sizes that are 32-bit
+    unsigned integers, guint16 for the host name length as it'd better fit
+    in 16 bits).
+    
+    Clean up some comments.
+    
+    Remove a _U_ that's applied to a variable that *is* used.
+    
+    Change-Id: I153d5aa885105149c62a5e5d2b78b54cf6ed7b4e
+    Reviewed-on: https://code.wireshark.org/review/9917
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 817d9bd
+Author: Timothy Geiser <slimshady007@inbox.lv>
+Date:   Wed Aug 5 15:19:48 2015 -0400
+
+    Add SHA2 algos to certificate dissection in SSL
+    
+    Change-Id: If1315496d231e5c8efc44b9235ec8ffb3ce9d8a9
+    Reviewed-on: https://code.wireshark.org/review/9880
+    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 240105e
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 12 16:11:21 2015 -0800
+Date:   Fri Aug 7 12:37:33 2015 -0700
 
-    Try to fix compilation on OS X.
+    Fixup the Qt splash overlay progress calculations.
+    
+    Fix a couple of issues in the way we calculate the splash overlay
+    progress.
     
-    Change-Id: I63d1f639bf5fd56aeaea112c797efedca8c0bf6e
-    Reviewed-on: https://code.wireshark.org/review/7090
+    Avoid unnecessary repaints.
+    
+    Change-Id: I1f4800b2c2836b67ca9ff3d6d24af150f4379ba9
+    Reviewed-on: https://code.wireshark.org/review/9916
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 931807e
+commit 0a1d1bd
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 11 15:00:27 2015 -0800
+Date:   Fri Aug 7 10:19:22 2015 -0700
 
-    Qt: Add the "new packet" window^Wdialog^Wwindow.
+    More casting issues with older versions of GLib.
+    
+    Try to fix
     
-    Allow persistence across files. Preserve the use of "window" even
-    though we're really a dialog.
+    packet-btl2cap.c: In function 'btl2cap_cid_value':
+    packet-btl2cap.c:425: warning: cast to pointer from integer of different size
+    packet-btl2cap.c: In function 'btl2cap_psm_value':
+    packet-btl2cap.c:448: warning: cast to pointer from integer of different size
     
-    Update ByteViewTab and ProtoTree to support multiple instances.
+    packet-btrfcomm.c: In function 'btrfcomm_directed_channel_value':
+    packet-btrfcomm.c:287: warning: cast to pointer from integer of different size
     
-    Remove the need for a cast in frame_data.
+    packet-btobex.c: In function 'btobex_profile_value':
+    packet-btobex.c:1134: warning: cast to pointer from integer of different size
     
-    Add more forward declarations.
+    on the 32-bit OS X builder.
     
-    Change-Id: I50d3d9d1455b8ecc158a37218f9e41fe696d5ae2
-    Reviewed-on: https://code.wireshark.org/review/7086
+    Change-Id: Ieb2fe6c31fdad0cf776c24bada7a6a83e8aa91ec
+    Reviewed-on: https://code.wireshark.org/review/9915
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 147ab19
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 08:39:09 2015 -0700
+
+    Switch the floats in stat_tap table items to doubles.
+    
+    Use doubles instead of floats in stat_tap_table_item_type. This should
+    make stat taps easier to use with a lot of our API (e.g. nstime) along
+    with Qt and the C math library.
+    
+    This reverts commit 5bbb6ff5e43511ddc57b0b771f3d60da1eb82c02.
+    
+    Change-Id: I113b44fb944a883cde016b7a8961597658be4c0a
+    Reviewed-on: https://code.wireshark.org/review/9912
     Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+
+commit c90fcba
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 7 14:55:50 2015 +0200
+
+    Lua: Count Lua plugins in splash screen
+    
+    This will avoid slow startup when having many Lua plugins.
+    
+    Change-Id: I67b5f38108a5c500682bc727734375da5fa762c8
+    Reviewed-on: https://code.wireshark.org/review/9910
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit b3e2c56
+commit c8ca0ae
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 12 13:49:31 2015 -0800
+Date:   Fri Aug 7 09:10:39 2015 -0700
 
-    Docbook: Don't build PDF release notes by default.
+    Try to fix casting issues with older versions of GLib.
+    
+    Try to fix
     
-    Move the release-notes-*.pdf targets to a release_notes_pdf metatarget
-    which must be built manually.
+    packet-btatt.c: In function 'btatt_handle_value':
+    packet-btatt.c:1420: warning: cast to pointer from integer of different size
+    packet-btatt.c: In function 'btatt_uuid16_value':
+    packet-btatt.c:1443: warning: cast to pointer from integer of different size
     
-    Change-Id: I067a4e248e6e68d1ff60aafad5d75c1180536e0f
-    Reviewed-on: https://code.wireshark.org/review/7088
+    on the 32-bit OS X builder.
+    
+    Change-Id: I02884c02e7f7f5f7b50da122127fa96c41c3603a
+    Reviewed-on: https://code.wireshark.org/review/9913
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit d2aa2c6
+commit 7171ee5
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Thu Aug 6 17:44:42 2015 -0400
+
+    [ieee80211] Rework QoS Capability and QoS info code.
+    
+    Specifically:
+    - Replace/remove much of 'dissect_qos_capability()' code to use
+      existing 'fixed field' code to dissect QoS_Info field.
+      Note: Much of the code added in g40d6131 to dissect the QoS Info
+            field duplicated already existing (but unused) "fixed field"
+            code to do same.
+    - Rework some QoS Info field filter names, variable names and
+      value-strings to better match the text used in 802.11-2012.
+    
+    - Rename 'dissect_qos_info()' to 'dissect_wme_qos_info()' to
+      reflect the fact that this code is only for the (now preumably obsolete)
+      original WME(WMM) specification for the QoS Info field.
+    
+    Change-Id: Id89780dfe60b2e4c63332bdb946cc29c67b5127a
+    Reviewed-on: https://code.wireshark.org/review/9903
+    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>
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit f657e6a
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 7 14:50:02 2015 +0200
+
+    [GTPv2] Mark a parameter as unused.
+    
+    Change-Id: I37c983d756f23469e4cf1abd31b9c591f5612542
+    Reviewed-on: https://code.wireshark.org/review/9909
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 5bbb6ff
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 7 14:19:30 2015 +0200
+
+    Try to fix packet-rpc.c:3909: warning: implicit conversion shortens 64-bit value into a 32-bit value
+    
+    Change-Id: I8962f93662047d01ef71ba9689b338d095f31300
+    Reviewed-on: https://code.wireshark.org/review/9908
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 99873f7
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 7 14:04:52 2015 +0200
+
+    [GTPv2] Dissect IE MM Context for CS to PS SRVCC, update value strings.
+    
+    Bug: 11423
+    Change-Id: I5a845e40fcbd4e06dec60c64edca9e8fea1459e1
+    Reviewed-on: https://code.wireshark.org/review/9907
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit fd19aaf
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 12 12:33:24 2015 -0800
+Date:   Thu Aug 6 10:56:22 2015 -0700
 
-    WSDG: Start adding Qt material.
+    Add ONC RPC program stats.
+    
+    Convert ONC RPC program stats to the stat_tap API.
     
-    Move some text from README.qt to the Developer's Guide. Add an overview.
+    Add a "user_data" member to the stat_tap_table_item_type struct.
     
-    Change-Id: Ia20ed837939e34871b157566c38cd0c6e590bc38
-    Reviewed-on: https://code.wireshark.org/review/7087
+    Change-Id: I5cbf000a447ff93d30fa7f098124bdcbc34f2935
+    Reviewed-on: https://code.wireshark.org/review/9904
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit bdcac17
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Feb 12 09:07:02 2015 +0100
+commit 0c9998d
+Author: Jan-Hendrik Bolte <jabolte@uos.de>
+Date:   Mon Jul 20 14:37:49 2015 +0200
 
-    Fix crash at startup in SSE4.2 code when running a 32 bits Windows build
+    Add dissector for MQTT-SN v1.2
     
-    There is no guarantee that a g_malloc'ed memory block will be aligned on a 128 bits boundary
-    Instead use a static variable definition (at the cost of exposing the HAVE_SSE4_2 compilation flag in ws_mempbrk.h)
+    Bug: 11388
+    Change-Id: I5d961b19132a9904080e9494467826d15659c54e
+    Reviewed-on: https://code.wireshark.org/review/9711
+    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 4557c17
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Aug 5 17:30:47 2015 +0200
+
+    androiddump: Try to make MVS14.0 happy
     
-    Change-Id: I661bf479a9d458d64c96bafc940c519d29a4780b
-    Reviewed-on: https://code.wireshark.org/review/7070
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    I guess using glib's gssize instead of ssize_t should be enough for:
+    
+    extcap/androiddump.c(736): error C2220: warning treated as error - no 'object' f
+       ile generated
+    extcap/androiddump.c(736): warning C4477: 'fprintf' : format string '%I64i' requ
+       ires an argument of type '__int64', but variadic argument 3 has type 'ssize_t'
+    extcap/androiddump.c(736): note: to simplify migration, consider the temporary
+       use of /Wv:18 flag with the version of the compiler with which you used to
+       build without warnings
+    extcap/androiddump.c(736): note: consider using '%i' in the format string
+    extcap/androiddump.c(736): note: consider using '%I32i' in the format string
+    
+    Change-Id: I1030694aed61d413be1aad54531f99db45e99c9d
+    Reviewed-on: https://code.wireshark.org/review/9876
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 678a9b6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Feb 12 17:14:12 2015 +0100
+commit dc33bba
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Thu Aug 6 21:47:37 2015 -0400
 
-    BT ATT: memory given to add_new_data_source() must be allocated in pinfo scope
+    [ieee80211] Change one ENC_LITTLE_ENDIAN MAC address to ENC_NA; byte order doesn't
+    apply to them.
     
-    Bug: 10952
-    Change-Id: I0eb8e6891c35c70c9d405db87824c442caaa2f30
-    Reviewed-on: https://code.wireshark.org/review/7085
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I4b0fcfe5d970877d7f8453e6c6f8c48ee69c2e38
+    Reviewed-on: https://code.wireshark.org/review/9905
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit ef21740
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Feb 12 14:32:12 2015 +0100
+commit ff24ecc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 6 11:23:55 2015 -0700
 
-    Gryphon: do not use col_set_str with non constant strings
+    Fixup stat_tap table freeing.
     
-    Fixes an ASAN failure reported by Alexis
+    As it turns out we *do* need to free table elements. We also need to
+    free the tables themselves and clear the table array. Do so.
     
-    Change-Id: I68e5c55ec4090766ef5f003f44093ce3c268a82a
-    Reviewed-on: https://code.wireshark.org/review/7082
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ic1c81388eac8f47f74caea0169c79685a83aaff9
+    Reviewed-on: https://code.wireshark.org/review/9901
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 7594d96
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Feb 12 10:03:37 2015 +0100
+commit 9fd3bcc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 6 12:31:21 2015 -0700
 
-    nmake: Allow Cygwin path to be provided
+    Add an elide mode preference for the Qt packet list.
     
-    I have installed cygwin at a different location then the default
-    location. Therefore the nmake steps tend to fail, and I will have
-    to adapt the config.nmake script every time.
+    Change-Id: I081cc1e9b2a0eea7f0a3ef1157561c50beb4c4db
+    Reviewed-on: https://code.wireshark.org/review/9902
+    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 fda29e1
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 6 08:39:22 2015 -0700
+
+    Use int_to_qstring in a few more places.
     
-    This patch allows the CYGWIN_PATH variable to be set outside
-    the build-script
+    Change-Id: Id324fe21f436a233088d106553db2ed6f6e410ac
+    Reviewed-on: https://code.wireshark.org/review/9899
+    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 5fa57ec
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Thu Aug 6 13:30:59 2015 +0200
+
+    [MSVC 2015]Once agin revert tho original, now as a separate patch.
     
-    Change-Id: Iaecdd2aa72a0529574fab7e6aeae18fbfd621721
-    Reviewed-on: https://code.wireshark.org/review/7078
-    Reviewed-by: Roland Knall <rknall@gmail.com>
+    Change-Id: If25a1e4ced74d88c87def010b9d8032b5d870307
+    Reviewed-on: https://code.wireshark.org/review/9898
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 34acb73
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Mon Feb 9 18:39:27 2015 -0800
+commit 544bca7
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Thu Aug 6 13:21:26 2015 +0200
 
-    [IS-IS-LSP] Add support for Prefix-SID subTLV
+    include <stdlib.h> to make windows build boot happy.
     
-    Bug: 10679
-    Change-Id: I4f2627aa22c64593258121a7e70b3f341e025d2e
-    Reviewed-on: https://code.wireshark.org/review/7048
-    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: I7a8b259698fdca0707464929a77c0b320f6a19f1
+    Reviewed-on: https://code.wireshark.org/review/9897
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 60cc8b4
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Feb 4 10:25:16 2015 +0100
+commit aa2184f
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Thu Aug 6 13:01:45 2015 +0200
 
-    Support for looking for incomplete dissectors.
+    Fix pcapng.c:3788: warning: implicit conversion shortens 64-bit value into a 32-bit value
     
-    Change-Id: I03e592dd3d54fc0e1c4af09d5d5336dda93f950e
-    Reviewed-on: https://code.wireshark.org/review/6978
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Change-Id: Ie796cee755470bea0416b46ff8ff6a94cd8d93d3
+    Reviewed-on: https://code.wireshark.org/review/9896
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 8906e93
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Thu Aug 6 10:59:51 2015 +0200
+
+    Bluetooth: Fix some MSVC2015 warnings/errors
+    
+    packet-btobex.c(1134): error C2220: warning treated as error - no 'object' file generated
+    packet-btobex.c(1134): warning C4312: 'type cast': conversion from 'gulong' to ' gpointer' of greater size
+    packet-btatt.c(1420): error C2220: warning treated as error - no 'object' file generated
+    packet-btatt.c(1420): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
+    packet-btatt.c(1443): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
+    packet-btl2cap.c(425): error C2220: warning treated as error - no 'object' file generated
+    packet-btl2cap.c(425): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
+    packet-btl2cap.c(448): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
+    packet-btrfcomm.c(287): error C2220: warning treated as error - no 'object' file generated
+    packet-btrfcomm.c(287): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
+    
+    Change-Id: Ie5b4fd1c47725b966f9b98d9480c1858b553efff
+    Reviewed-on: https://code.wireshark.org/review/9894
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit b4dea54
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 20:44:09 2015 -0700
+
+    Try to fix dist.
+    
+    Change-Id: I04c4a06f8d2db4d9ac1a09fea25d4f587c1f1fc1
+    Reviewed-on: https://code.wireshark.org/review/9893
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 910438b
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Jul 20 10:35:06 2015 -0400
+
+    Pcapng: support Name Resolution Block options
+    
+    Make pcapng decode options in an NRB during read, and store the comment
+    option, and write it back out as well. Also make it handle plugin handlers
+    for unknown options in received NRB(s).
+    
+    Change-Id: I81863ef8d85cb1c8b5ba6673ba0e562efe77714f
+    Reviewed-on: https://code.wireshark.org/review/9723
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.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 207b52a
+commit 1420f3d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 12 02:25:31 2015 -0800
+Date:   Wed Aug 5 20:12:31 2015 -0700
 
-    tvb_length is a macro wrapper for tvb_captured_length; use tvbuff_length.
+    Add ui_gsm_map_summary_dialog.h so it goes into the source tarball.
     
-    This squelches a compiler warning on some platforms.
+    Change-Id: Ib0780e5ba62d069d2b41ef7ac7da513981660c7f
+    Reviewed-on: https://code.wireshark.org/review/9892
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit c6889d8
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Aug 5 19:45:12 2015 -0700
+
+    Fix some encoding arguments.
+    
+    802.11 is overwhelmingly little-endian; change all 1-byte fields that
+    were ENC_BIG_ENDIAN to ENC_LITTLE_ENDIAN.
+    
+    Change one ENC_BIG_ENDIAN MAC address to ENC_NA; byte order doesn't
+    apply to them.
     
-    Change-Id: Ibee5c2fe07fc58e22a860b4c4467a501c2b8a979
-    Reviewed-on: https://code.wireshark.org/review/7079
+    The remaining ENC_BIG_ENDIANs should be checked.
+    
+    Change-Id: I3dc51a5555b99c25dce0d3b7f3be4c441b13d1a3
+    Reviewed-on: https://code.wireshark.org/review/9890
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7075223
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Feb 9 08:56:28 2015 +0100
+commit f30ac4a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Aug 5 19:08:36 2015 -0700
+
+    Fix a bunch of typoes in variable and field names.
+    
+    Fix spelling, get rid of period at end of some field names.
+    
+    Change-Id: I1963cdc92657dca8708133796f8835bdffee0c47
+    Reviewed-on: https://code.wireshark.org/review/9888
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit b7f5eaa
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 17:42:53 2015 -0700
+
+    Convert the GSM MAP stats to new "generic stat API".
+    
+    Convert both the MAP statistics and summary. As with the GSM A stats
+    this are mostly untested.
+    
+    Change-Id: Ibd3a7346b09d1401e78724c0197ec2a38deb97a3
+    Reviewed-on: https://code.wireshark.org/review/9883
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 05eb9b6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 17:03:03 2015 -0700
+
+    Add proper base prefixes in display filter expressions.
+    
+    When the user selects an enum in the display filter expression dialog
+    make sure we add the proper base prefix
+    
+    Add a Qt UI convenience routine for formatting integers. Because
+    deprecating QString::sprintf was a well-thought-out decision that will
+    be regarded highly for decades to come.
+    
+    Fix search visibility while we're here.
+    
+    Bug: 11421
+    Change-Id: I1368bc8f464983793bdc90760cf3b7c18b6bd859
+    Reviewed-on: https://code.wireshark.org/review/9885
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit ef0bdbc
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Aug 5 18:23:53 2015 -0700
 
-    Little tuning of proto_tree_add_bytes_with_length
+    Cleanup a bunch of 802.11ad stuff.
     
-    Change name from proto_tree_add_new_bytes to
-    proto_tree_add_bytes_with_length and other tweaks
-    pointed by Peter Wu.
+    Make all the multi-byte fields, except for OUIs, little-endian -
+    including fields that contain bitfields.  Make the bits in the bitfields
+    little-endian as well.
     
-    Change-Id: I6058c28a74a154e2882e4eb04558bedcede6f508
-    Reviewed-on: https://code.wireshark.org/review/7039
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 4359cb8
-Author: Anders Broman <a.broman58@gmail.com>
-Date:   Thu Feb 12 08:33:21 2015 +0000
-
-    Revert ""Hide" hashether_t structure."
+    For the "number of taps" bitfields, interpret the values.
     
-    This reverts commit 297ef07b9b2f5b681234d0c31269996413262cbc.
+    Fix a typo ("pseduo" -> "pseudo").
     
-    Change-Id: Id47f5fd221b631c95ca71e3f9315f5263bab22de
-    Reviewed-on: https://code.wireshark.org/review/7077
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 53228c4
-Author: Anders Broman <a.broman58@gmail.com>
-Date:   Thu Feb 12 08:33:02 2015 +0000
-
-    Revert "Make get_manuf_name return a const string."
+    The length of an OCT MMPDU is 16 bits, not 8 bits, and it's not a text
+    string, it's an octet string.
     
-    This reverts commit 797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac.
+    The Beacon Interval Control is 48 bits, not 64 bits.
     
-    Change-Id: I9bc2cef0051d88c6374c6f1868b0250cba3edbd4
-    Reviewed-on: https://code.wireshark.org/review/7076
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Handle the beam refinement UI as a 2-byte field that overlaps with a
+    4-byte field - *none* of the bitfields align on nice 8-bit boundaries,
+    so that's the best we can do.
+    
+    Bug: 11419
+    Change-Id: Ib00ad030ecb33cf676bec23c05b15a4211c75c07
+    Reviewed-on: https://code.wireshark.org/review/9886
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 797ea88
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 11 22:16:01 2015 -0500
+commit dc09d18
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 16:19:24 2015 -0700
 
-    Make get_manuf_name return a const string.
+    Output xhtml guides everywhere.
     
-    Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table.  This will make name resolution of addresses perform a little better because it doesn't have to work about the wmem_allocator.
+    Update Autotools / Nmake to generate xhtml5 user and developer guides.
     
-    Change-Id: I80f465ae0845290255a659ab63310ac3cc35506e
-    Reviewed-on: https://code.wireshark.org/review/7075
-    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>
+    Change-Id: I5024151aecaee62ea6d8469807fabda552d3f663
+    Reviewed-on: https://code.wireshark.org/review/9884
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 297ef07
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Feb 11 20:13:36 2015 -0500
+commit 6aabad5
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Wed Aug 5 09:36:20 2015 +0200
 
-    "Hide" hashether_t structure.
+    epl: Fix Payload sub-dissection
     
-    One use in a GUI function isn't really enough to justify making the structure public.
+     Current implementation gives all remaining data to sub-dissector.
+     This is not correct, as with "Write Multiple by Index" the data
+     given includes the following indeces and their datasets
     
-    Change-Id: I6d70b9bacbc0fa1898150f59c0c69779a6cd5d51
-    Reviewed-on: https://code.wireshark.org/review/7074
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I5343bf61431a7b5507b51f53f0de8c6e3dc72cf1
+    Reviewed-on: https://code.wireshark.org/review/9870
+    Reviewed-by: Roland Knall <rknall@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 d3d0a0a
+commit 504f5b3
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 11 14:19:57 2015 -0800
+Date:   Wed Aug 5 13:00:38 2015 -0700
 
-    Fix SSE 4.2 checks.
+    Clean up some fields.
+    
+    The "LEN" field is the "length of the MAC frame", in bytes; confusingly,
+    it includes the extended header length, but not the fixed-length part of
+    the header (including the FCS), so it's not the "length after HCS".
     
-    CMake has "normal" and "cache" variables, and unexpected things happen
-    if you have a normal and a cache variable with the same name.
-    Apparently, check_c_compiler_flag() currently sets its result variable
-    as a cache variable, and set(), by default, sets it as a normal
-    variable.
+    Rename it to "docsis.len", as it's always LEN, not SID; there's a
+    separate field for the SID.
     
-    This means that there are two different HAVE_SSE4_2 variables, and the
-    top-level CMakeLists.txt looks at the cache variable when it creates
-    config.h; this means that if the nmmintrin.h test fails, config.h still
-    says we have SSE 4.2.
+    Rename the Extended Header Length field to docsis.ehdrlen, and the
+    Number of Concatenated Frames to docsis.concat_cnt, so that different
+    uses of the "MACPARM" part of the header are flagged differently.
     
-    Instead, use separate variables for the "compiler can be made to
-    generate SSE 4.2 code" test and the "nmmintr.h works" test; that way we
-    don't have to worry about normal vs.  cache variables (and don't have to
-    worry about CMake changing what type of variable particular
-    functions/macros set).
+    Update some comments while we're at it.
     
-    Change-Id: I618ad402b248f35fffd822974b6a569d4e5d6398
-    Reviewed-on: https://code.wireshark.org/review/7073
+    Change-Id: Ib7c4a0cda65cef25dcaf0051b3de89758ef4c29c
+    Reviewed-on: https://code.wireshark.org/review/9881
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0dbf741
-Author: Jiří Engelthaler <engycz@gmail.com>
-Date:   Wed Feb 11 13:57:15 2015 +0100
+commit f0beaa1
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Wed Aug 5 09:39:08 2015 +0200
 
-    packet-iec104: fix packet information text
+    openSAFETY: Better display of packet info
     
-    Change I6abc157368a78e1abfde672728b88a36ba6e76cc adds break in "switch case" but there was missing break deliberately. Code modified to let break on his place - copied code from the following condition.
+     If multiple packets of openSAFETY are present in a single network
+     packet, searching for the packet needed is complicated. This patch
+     increases the information along the same lines as the eth and frame
+     subdissectors
     
-    Change-Id: Id008955fbc122c0f8cfe06af2b96f0b643e9417f
-    Reviewed-on: https://code.wireshark.org/review/7066
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Id3d237135cfadb35c839208749aeeb1652b29830
+    Reviewed-on: https://code.wireshark.org/review/9871
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 0cd2582
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Feb 11 11:56:25 2015 -0500
+commit 62e56ad
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 10:59:51 2015 -0700
 
-    Prevent two false positive MSVC2013 Code Analysis warnings
-    
-     Message: "Using uninitialized memory"
+    Make sure we use "*.html" in our chunked output.
     
-    Change-Id: Ib7d381beb9f9c1f3ec19a376c0c8c0d5ef85f373
-    Reviewed-on: https://code.wireshark.org/review/7069
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Idb441084ec50ec336b7f514895aba799832e8f66
+    Reviewed-on: https://code.wireshark.org/review/9879
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 3c9c9bc
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Feb 11 11:51:56 2015 -0500
+commit 3b2e6d9
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Aug 5 16:25:16 2015 +0000
 
-    capture_dlg.c: Fix (possibly valid)  "Using uninitialized memory" MSVC2013 Code Analysis warning
+    Revert "[MSVC 2015] Fix errors seen with the released version by reverting the code to what failed on the RC version *sigh*"
     
-    Change-Id: I849b731420d779b68ab4335eb8d06482ecd649e7
-    Reviewed-on: https://code.wireshark.org/review/7068
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Reverted commit break DecodeAs for Bluetooth, also caused crashes.
+    
+    This reverts commit 2221153a9cc083a50248a72a4b4009908d84e38b.
+    
+    Change-Id: Idb91747b986f110fffa3444f8c52d800c128e141
+    Reviewed-on: https://code.wireshark.org/review/9877
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9db51df
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Feb 10 22:57:47 2015 -0500
+commit 53a8033
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 09:30:40 2015 -0700
 
-    Remove address_to_str_buf from hsrp dissector "heuristics" as its much faster to just compare the IPv4 address as a 32-bit value.
+    Generate XHTML5 documentation.
     
-    Change-Id: If5a819b74112e92636d036509cb30ea15b2d5e3d
-    Reviewed-on: https://code.wireshark.org/review/7067
-    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>
+    When converting from DocBook to HTML, use DocBook's xhtml5 XSL
+    stylesheets.
+    
+    Change-Id: I7a49d60c46a17e1e639b78ee10c4b9fa832d4a77
+    Reviewed-on: https://code.wireshark.org/review/9878
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit a822d85
+commit 2221153
 Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Feb 11 12:27:52 2015 +0100
+Date:   Wed Aug 5 14:37:20 2015 +0200
 
-    Try to fix the debian symbols
+    [MSVC 2015] Fix errors seen with the released version by reverting the
+    code to what failed on the RC version *sigh*
     
-    Change-Id: I234f42e5488d2044d0c68f499814fe9a51b220dd
-    Reviewed-on: https://code.wireshark.org/review/7064
+    Change-Id: I1b7f6d57da4cb71473a074291da7e5a0d5242c95
+    Reviewed-on: https://code.wireshark.org/review/9874
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a837570
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Fri Feb 6 13:52:37 2015 -0500
+commit 5de487a
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Aug 5 14:30:27 2015 +0200
 
-    Combine SSE and pre-compiled patterns for faster pbrk
+    [MSVC 2015] Compiler and visual studio version are off by 5 not 6 in MSVC
+    2015.
     
-    This combines the SSE4.2 instructions usage, with pre-compiled
-    pattern searching usage, for a faster pbrk search method.
-    
-    Testing against large files of HTTP and SIP, there is about
-    a 5% performance improvement by using pre-"compiled" patterns
-    for guint8_pbrk() instead of passing it the search string and
-    having it build the match array every time.
-    Similar to regular expressions, "compiling" the pattern match array
-    in advance only once and using the "compiled" patterns for
-    the searches is faster than compiling it every time.
-    
-    Change-Id: Ifcbc14a6c93f32d15663a10d974bacdca5119a8e
-    Ping-Bug: 10798
-    Reviewed-on: https://code.wireshark.org/review/6990
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I5476656789893af2c8aeb5dfe5cf06972fd8bd4b
+    Reviewed-on: https://code.wireshark.org/review/9873
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a618f1c
+commit 8bf1237
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Feb 10 11:04:48 2015 +0100
+Date:   Mon Aug 3 22:21:24 2015 +0200
 
-    USB: put back interface class when dissecting URB_CONTROL
+    MAC CTRL: fix dissection of PAUSE frame
     
-    Also ensure that USB COM dissection is done with the parent tree and not setup one
+    According to 802.3 table 31A-1, only opcodes from 0x0002 to 0x0006 have a timestamp
+    While we are at it, rename the opcodes to a name matching the specification
     
-    Change-Id: Iae9f933ff29b3854879375df320a23e623ea785f
-    Reviewed-on: https://code.wireshark.org/review/7051
+    Bug: 11403
+    Change-Id: Iaadc2b801e86523e962b4eb319541bc74de22071
+    Reviewed-on: https://code.wireshark.org/review/9857
     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: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c34ded4
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Feb 8 12:24:19 2015 -0800
+commit ad4ab2a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 14:56:46 2015 -0700
 
-    Qt/C++: Change a bunch of includes to forward declarations.
+    Convert the GSM A stats to new "generic stat API".
     
-    In theory this this should reduce compilation times. On my particular
-    system it makes no difference but hopefully it will elsewhere.
+    These are largely untested, but the two abis captures on the wiki seem
+    to work OK. The menu item names could also use some work. Patches
+    welcome.
     
-    Change-Id: I570177d3ca4eec691c82d46b4dbbce74092aac1d
-    Reviewed-on: https://code.wireshark.org/review/7060
+    Change-Id: I19a5b5fe3476b49d1dd0b684cbb7f367c6ebd4b4
+    Reviewed-on: https://code.wireshark.org/review/9869
     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 88d62df
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Feb 10 17:30:58 2015 +0000
+commit 4d673b2
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 08:56:28 2015 -0700
 
-    Remove unneeded includes from plugins folder
+    Convert Camel tap stats to new "generic stat API".
     
-    Change-Id: Ifdad0fb786a97a6f84a64d442fcca0c20116552f
-    Reviewed-on: https://code.wireshark.org/review/7059
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Migrate the Camel stats similar to the recent BOOTP and H.225
+    migrations.
+    
+    Change-Id: If82617068ff4b8fa186899f66dc34a08585f66cb
+    Reviewed-on: https://code.wireshark.org/review/9865
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit d5f0df4
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Feb 10 15:48:57 2015 +0000
+commit 3e6b527
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 10:16:23 2015 -0700
 
-    Add script to automatically remove includes that appear not be needed
+    Remove the CLI H.225 counter.
     
-    Change-Id: I5474d8a906e96c688020737ca4bd4c3319ae279f
-    Reviewed-on: https://code.wireshark.org/review/7058
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Stats were moved to the dissector in g03802cc.
+    
+    Change-Id: I1aaf43789695ba3aae54cfaf201263cd0aed74ea
+    Reviewed-on: https://code.wireshark.org/review/9867
+    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 e915db7
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Feb 10 13:49:28 2015 +0100
+commit 4e14a26
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 11:45:24 2015 -0700
 
-    Do not iterate over reported length when using tvb_find_line_end
+    Don't zero stat tap elements.
     
-    if captured length < reported length, this will trigger an infinite loop
+    Let the reset callback take care of resetting our rows.
     
-    Change-Id: I6557b455e7bbff12658a934e5bb13a42c023e133
-    Reviewed-on: https://code.wireshark.org/review/7053
-    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>
+    Change-Id: I59b0e9d36a9a1cedc5a5893664c875b7416a5229
+    Reviewed-on: https://code.wireshark.org/review/9868
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 7369c25
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Feb 10 12:07:47 2015 +0100
+commit d51d83b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 10:00:23 2015 -0700
 
-    IMAP: do not iterate over reported length when using tvb_find_line_end
+    Fix the selected packet indicator width.
     
-    This function can only search in captured length buffer
-    This fixes an ASAN failure reported by Alexis
+    Change-Id: Ic792c232524b4124bb4607cbe1979cdce8fd7e23
+    Reviewed-on: https://code.wireshark.org/review/9866
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 03802cc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 3 10:30:04 2015 -0700
+
+    Convert H.225 tap stats to new "generic stat API".
     
-    Change-Id: Ib936f918e057423d63ff34a5fc79fed602e56dfc
-    Reviewed-on: https://code.wireshark.org/review/7052
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Migrate the H.225 stats similar to the recent BOOTP migration.
+    
+    Change-Id: I70ff7ab6cf3e9796f257412ba7d65ec9fe7f77ad
+    Reviewed-on: https://code.wireshark.org/review/9859
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 29be26c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Feb 10 07:09:56 2015 +0100
+commit 632b402
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 3 21:25:00 2015 -0700
 
-    FTAM: get rid of an evil global variable
+    Zero stat table elements instead of freeing them.
     
-    Fixes an ASAN failure reported by Alexis
+    Stat table element arrays are allocated once at startup. Reset each
+    element in free_stat_table() instead of freeing them.
     
-    Change-Id: Id0ddad6451e22ffc53d42985e9b2071c7388d15b
-    Reviewed-on: https://code.wireshark.org/review/7049
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ia63af93c76a1348bbb809137a521eead58a52dd1
+    Reviewed-on: https://code.wireshark.org/review/9860
+    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: Gerald Combs <gerald@wireshark.org>
+
+commit 3413ddf
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Jul 25 20:07:59 2015 +0200
 
-commit 3b29542
-Author: Kevin Grigorenko <kevin.grigorenko@us.ibm.com>
-Date:   Mon Feb 9 17:20:38 2015 -0800
-
-    Add a "Sum" column to the Service Response Time (SRT) window.
-    
-    The Service Response Time (SRT) window currently provides the
-    columns: Index, Procedure, Calls, Min SRT, Max SRT, and Avg SRT.
-    A Sum column has been found useful in some customer situations
-    to understand the total time spent doing a set of procedures.
-    For example, in one case we were trying to isolate whether most
-    time was being spent on a client thread or in the act of making
-    outbound calls. We knew the start and end time of the client call,
-    so with the "Sum" of time spent in that period, we could isolate
-    a particular set of procedures driving the slow down.
-    
-    Additional changes made in this patch:
-    * Add " (s)" to Min, Max, Avg, and Sum columns to make it clear
-      that times are in seconds.
-    * Refactor out width and height constants used in calls to
-      gtk_window_set_default_size in most of the SRT users into
-      #define SRT_PREFERRED_WIDTH and SRT_PREFERRED_HEIGHT. Also
-      increase the common width of 550 to 650 to account for the
-      additional column.
-    
-    Change-Id: I20f152eecbcd0bbf69f71c6c6b9f9463e8867e23
-    Reviewed-on: https://code.wireshark.org/review/7047
+    EPL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    
+    Change-Id: Id8fac193a2f3521986c0f91df84950ff581d4b6b
+    Reviewed-on: https://code.wireshark.org/review/9790
+    Reviewed-by: Roland Knall <rknall@gmail.com>
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 895b013
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Feb 9 11:31:59 2015 -0800
+commit 992c892
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 4 16:48:06 2015 +0200
 
-    Use G_GINT64_MODIFIER when formatting g{u}int64 values.
+    MIB/OID Fix assertion in proto.c tmp_fld_check_assert().
+    It seems like oid_data->name may get freed so do a g_strdup() as it's done
+    for hf.hfinfo.abbrev.
     
-    Remove extra trailing blank from output while we're at it.
-    
-    Change-Id: Ie415afa76a3eaba630ee3d59b177b44de75413a4
-    Reviewed-on: https://code.wireshark.org/review/7046
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ie05fb42d59556aec300d4e007b1db5cc79d8d6f1
+    Reviewed-on: https://code.wireshark.org/review/9864
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e88a11f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Feb 9 13:42:51 2015 -0500
+commit 8421af3
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Tue Aug 4 19:42:19 2015 +1000
 
-    (Trivial) Fix printf-related 'Mismatch on sign' warnings
+    Rename nettrace3gpp324423 to 3gpp32423
     
-     Found by MSVC2013 Code Analysis
+    Use "3gpp32423" instead of "nettrace3gpp324423":
+    - There were too many "4"s in the previous name ("324423" vs "32423").
+    - "nettrace" isn't an official name, per 3GPP TS 32 423
+    - It's shorter.
     
-    Change-Id: I58063946dd558e98308c87b36eeac0ddbe1a6e79
-    Reviewed-on: https://code.wireshark.org/review/7045
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ic981d0351a3014fb79702955ebef7b13f6ce4a2e
+    Reviewed-on: https://code.wireshark.org/review/9863
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2078a95
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 6 12:31:46 2015 +0100
+commit 4908c75
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 4 10:58:45 2015 +0200
 
-    pgsql,imap: add STARTTLS support
-    
-    The PGSQL "STARTTLS" protocol is documented at
-    http://www.postgresql.org/docs/9.4/static/protocol-flow.html
-    While at it, convert some tvb_length[_remaining] users.
+    [ISUP] Read the country code at offset
     
-    Tested against pgsql-ssl.pcapng,
-    Tested against imap-ssl.pcapng,
-    http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys
-    
-    Change-Id: I1a00a6daa7f03de93339c2c13b07b4cfb8cdbd86
-    Reviewed-on: https://code.wireshark.org/review/6821
-    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: I5a03fdbdf7079c354bc9b63acba3d205f82a4e8a
+    Reviewed-on: https://code.wireshark.org/review/9862
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a58cf52
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon Feb 9 14:18:27 2015 +0000
+commit 6e87802
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 4 10:46:48 2015 +0200
 
-    file-jpeg: Allow 'Exif' as identification in first App block, but flag as expert info warning if seen
+    tvb_new_octet_aligned() should return both the captured and reported
+    length set to datalen in the returned tvb.
     
-    Change-Id: Id16e0b4fbca3b29b01138a9aea758b8beb8d9ed8
-    Reviewed-on: https://code.wireshark.org/review/7042
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Ie6649a285a9fa4a0564e29ce18ec9459b8da2541
+    Reviewed-on: https://code.wireshark.org/review/9861
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e36a2ad
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon Feb 9 11:48:25 2015 +0000
+commit 2964c28
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Aug 3 14:14:50 2015 -0700
 
-    Netflow: rework how transport (port) resolution is done, adding support for SCTP
+    Update a comment to reflect reality as of 1997.
     
-    Change-Id: I09b2cc3739628b5de706659731e37fa345804254
-    Reviewed-on: https://code.wireshark.org/review/7043
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    "IEEE 802.3" has, since IEEE 802.3y-1997, supported a type/length field,
+    not just a length field (i.e., they acknowledged reality), so it's no
+    as if there are "802.3" as opposed to "D/I/X" or "Ethernet II" frames.
+    
+    Change-Id: Ie7f61e48cb2a343a7c83e0747a6eee46964fc335
+    Reviewed-on: https://code.wireshark.org/review/9858
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 929a4f2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 6 11:43:54 2015 +0100
+commit ae05f77
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Aug 3 11:58:36 2015 -0700
 
-    ldap: simplify Start TLS handling
-    
-    RFC 2830 describes the Start TLS operation as follows:
-    
-     1. ExtendedRequest is sent by client with the requestName OID set to
-        "1.3.6.1.4.1.1466.20037".
-     2. Server responds with an ExtendedResponse having a resultCode and
-        optionally a responseName (OID).
+    Give an I-D reference for this.
     
-    The text mentions that the field *must* be set but the definition allows
-    it to be optional. The previous code then made assumption that once (1)
-    was seen, then any ExtendedResponse signals an acknowledgement.
-    
-    That is not entirely correct, a server could reject the request. This
-    patch corrects that by checking the ExtendedResponse_resultCode for
-    success, and then uses the new ssl_starttls_ack() helper to kick off
-    SSL. This simplifies the code a bit.
-    
-    Tested against ldap-ssl.pcapng (which has no responseName) from
-    http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys
-    The result is the same as before, except that "Protocols in frame"
-    changed from "...:ldap:ssl:ldap" to "...:ssl:ldap".
-    
-    Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd
-    Reviewed-on: https://code.wireshark.org/review/6982
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I5bbc1b390215e11cba86af9b325ae94d3708ae93
+    Reviewed-on: https://code.wireshark.org/review/9855
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e190253
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Feb 6 12:35:09 2015 +0100
+commit 56ee4b1
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Mon Aug 3 12:02:37 2015 +0100
 
-    Fix STARTTLS handling in various dissectors
-    
-    This patch lets a dissector hand over control to the SSL dissector which
-    simplifies dissector code ("TCP | App | SSL | App" becomes
-    "TCP | SSL | App").
-    
-    After this patch, all of the affected dissectors will now be dissected
-    as SSL with its Application Data being treated as the protocol before
-    STARTTLS. This was previously not the case because the port was not
-    registered for dissection via ssl_dissector_add.
-    
-    The desegmentation issue within the MySQL dissector is now also gone.
-    Convert some tvb_length[_remaining] users in pop and smtp as well.
-    
-    Tested against mysql-ssl.pcapng and mysql-ssl-larger.pcapng(*1),
-    Tested against pop-ssl.pcapng (note: only first stream is decrypted,
-    either the key after negotiation is wrong or there is a bug),
-    Tested against smtp-ssl.pcapng and smtp2525-ssl.pcapng (with Decode As)
-    and smtp-ssl.pcapng with filter "tcp.len>0",
-    Tested against xmpp-ssl.pcapng,
-    http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys
-    
-     *1) mysql-ssl-larger has MySQL dissector errors for the fragmented
-         SSL packet, but reassembly seems to work. Needs further
-         investigation.
+    TFTP: strengthen heuristic used over STUN/TURN
     
-    Bug: 9515
-    Change-Id: I408ef8ff30d9edc8954dab9b3615900666dfa932
-    Reviewed-on: https://code.wireshark.org/review/6981
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 93ed726
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Feb 5 19:54:52 2015 +0100
-
-    ssl,dtls,ssl-utils: Prepare for STARTTLS handling
-    
-    All STARTTLS-like dissectors (protocols which can switch to SSL/TLS
-    after a protocol command) currently fail to get called after decryption.
-    The reason for this is that the port is not registered for SSL
-    dissection via ssl_dissector_add. Besides this, the MySQL dissector
-    breaks in the event of multiple segments because it does not properly
-    set desegmentation.
-    
-    The call path TCP | App | SSL | App is a bad, error-prone pattern which
-    requires duplication of required functionality in dissectors. This patch
-    enables to bypass the App (TCP | SSL | App) by registering a SSL as
-    conversation dissector after a STARTTLS switch.
-    
-    Logical overview of changes:
-    
-     - Move srv_addr, srv_ptype and srv_port to SslSession and adjust the
-       users. This allows passing SslSession around which will never be null
-       unlike SslDecryptSession. This is needed for looking up the packet
-       direction (server or client) before calling a subdissector.
-     - Add app_handle to store the dissector and last_nontls_frame the
-       frame that initiated STARTTLS.
-     - The same app_handle is now used to store the dissector handle from
-       a ssl association.
-     - Moved conversation data (SslDecryptSession) to ssl-utils to avoid
-       code duplication. Merge ssl_session_init into it. The new
-       ssl_session_get() is needed for STARTTLS frame/handle storage.
-     - Introduce new "ssl_starttls_ack" function to signal the last non-TLS
-       packet.
-     - Ensure that match_uint is set before calling the conversation
-       dissector. This ensures that dissectors using match_uint to check
-       the direction of a packet (client vs. server) see the TCP port
-       instead of the IP proto. At least the MySQL and SMTP dissectors
-       require such special treatment.
-     - Move epan/conversation.h outside HAVE_LIBGNUTLS, remove from dtls
-       (as it is already included by ssl-utils).
-     - Various comment/debug string updates. Remove outdated comment before
-       SSL association lookup.
-    
-    Besides setting match_uint and caching the app_handle, existing
-    dissectors should not be affected by this patch. Follow-up patches
-    will update existing dissectors to use the new ssl_starttls_ack
-    interface.
-    
-    Bug: 9515
-    Change-Id: I795d16b6a901e672a5d89e922adc7e5bbcda0333
-    Reviewed-on: https://code.wireshark.org/review/6872
-    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>
+    Change-Id: I133199abda100a89e219804c3003dee76389c43a
+    Reviewed-on: https://code.wireshark.org/review/9839
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
 
-commit 5b2a05c
-Author: Anish Bhatt <anish@chelsio.com>
-Date:   Fri Feb 6 02:07:53 2015 -0800
+commit 9557c73
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sun Aug 2 15:33:07 2015 -0700
 
-    [IS-IS LSP] Add support for Adj-SID & LAN-Adj-SID subTLV
+    Make sure per-packet tap callbacks return gbooleans.
     
-    Bug: 10677
-    Change-Id: Ia936ee4af6779b2b7dde61f33c490f545060dbe8
-    Signed-off-by: Anish Bhatt <anish@chelsio.com>
-    Reviewed-on: https://code.wireshark.org/review/6980
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    The tap API changed the return type of per-packet listener callbacks
+    from int to gboolean back in 2009. Update a bunch of functions and some
+    documentation accordingly.
+    
+    Change-Id: I79affe65db975caed3cc296a7e2985b7b9cdf4cc
+    Reviewed-on: https://code.wireshark.org/review/9853
+    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 3222cd1
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Feb 7 13:16:59 2015 +0100
+commit 08e80b1
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Aug 2 08:41:27 2015 -0400
 
-    ssl-utils: use ALPN hint for improved spdy/http2 recognition
+    Skip files larger than 8MB in valgrind fuzzing
     
-    This patch improves detection of a SPDY/3.1 in SSL capture. While at it,
-    add other protocols from the RFC/drafts.
+    Follow-up to g2eabd35 which added a 20MB limit, this lowers it quite a bit since
+    we're still seeing out-of-memory failures with files slightly larger than 8MB.
     
-    spdy was tested against a private capture from spdy/3.1 communication
-    between Chromium 40 and ssl.gstatic.com.
-    http2 was tested against http2-16-ssl.pcapng from
-    http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys
+    Based on a quick scan of the menagerie this only excludes another dozen or so
+    files so we won't lose much coverage.
     
-    Change-Id: I111efae34d614b7d8e37eaaa686b391d332753dd
-    Reviewed-on: https://code.wireshark.org/review/7000
-    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>
+    Ping-Bug: 11395
+    Change-Id: I8d684bebad553408c68b125330f2878deedc3bff
+    Reviewed-on: https://code.wireshark.org/review/9849
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 702618f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Feb 7 10:02:13 2015 +0100
+commit 7c46b25
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Aug 2 09:12:23 2015 -0400
 
-    Fix use-after free in RTP player
+    qt: fix scrollbar crash applying conv. filter
     
-    Clicking "Decode" in the RTP player triggered an ASAN
-    heap-use-after-free in update_progress_bar(). Explicitly set
-    progress_bar to NULL to prevent this.
+    When applying a conversation filter via context menu on the packet list,
+    something triggers the scrollbar to redraw when it has a maximum value of 0,
+    leading to a div-by-0. Guard against that (for now) though there may be a better
+    long-term fix.
     
-    Change-Id: Ice3105a11642a1cc5a54b8fbdf7dbf0ed430d965
-    Ping-Bug: 10714
-    Reviewed-on: https://code.wireshark.org/review/6999
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I5fa0cac3e67f50a6c603a6fa10b117de5540d444
+    Reviewed-on: https://code.wireshark.org/review/9850
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit d56a3c9
-Author: Lev Stipakov <lstipakov@gmail.com>
-Date:   Sun Feb 8 17:21:18 2015 +0200
+commit 78ca0af
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 1 11:38:03 2015 +0200
 
-    This adds support for P_DATA_V2 OpenVPN packets.
+    HTTP2: remove weak part of the heuristic
     
-    On the wire P_DATA_V2 is same as P_DATA-V1 plus 3 bytes "peer-id" value
-    after opcode. Client-side support has been added since OpenVPN 2.3.6,
-    server side is in master branch and will appear in 2.4.
+    It is so fragile that it triggers too many false positives and it was not
+    activated by default prior to g21e5a95.
+    If required, a user can still use 'Decode As' functionality.
     
-    Peer-id is especially useful for mobile clients (they often float
-    between 3G/Wi-Fi) and in general for Wi-Fi clients (solves UDP NAT
-    timeout issue).
-    
-    Change-Id: Ic5d2e05e62c27bed18c2368a1bbc5c7bf4d358f1
-    Reviewed-on: https://code.wireshark.org/review/7023
+    Change-Id: I0236609665c57c6f3961cb9596c47b54da777641
+    Reviewed-on: https://code.wireshark.org/review/9842
+    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: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 8ff944d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Feb 8 20:36:03 2015 -0500
+commit d12283b
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 1 18:38:15 2015 +0200
 
-    Add fixed length function for address types.
+    proto.c: exclude hf_text_only from proto_registrar_is_protocol()
     
-    This allows for even more cleanup with respect to how address types are handled, including removing address_to_str.c.  Most of the functionality was folded into address_types.c, but the remainder was just dispersed because it didn't make sense to keep the file.
+    This pseudo field is a specific case that is not linked to any protocol (despite parent being set to -1).
+    This prevents a crash in Qt GUI when selecting a line added with proto_tree_add_subtree() or similar.
     
-    Change-Id: Id4e9391f0c3c26eff8c27b362e4f7a1970d718b4
-    Reviewed-on: https://code.wireshark.org/review/7038
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I3b1cc2e6c7e71a71898f2ee9a02e9158eccf6fac
+    Reviewed-on: https://code.wireshark.org/review/9845
+    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 2875cd3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Feb 8 16:36:07 2015 -0500
+commit 37a1bb8
+Author: Hauke Mehrtens <hauke@hauke-m.de>
+Date:   Mon Jul 20 23:31:43 2015 +0200
 
-    Eliminate the hf member out of the address structure.
+    CoAP: add media type number for application/cbor
     
-    Using the new address type registration, dissectors can create their own address types with their own (column) filters attached to them, eliminating the need for an address to keep track of a hf_ field.
+    application/cbor got the number 60 by the IANA, see
+    https://www.iana.org/assignments/core-parameters/core-parameters.xml#content-formats
     
-    Change-Id: I2bbec256a056f403a7ac9880d5d76a0b2a21b221
-    Ping-Bug: 7728
-    Reviewed-on: https://code.wireshark.org/review/7037
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I4dbfd9eff8bacb46e815140c4640359f9a951869
+    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+    Reviewed-on: https://code.wireshark.org/review/9847
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 2042385
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Feb 8 13:49:57 2015 -0500
+commit b1ce653
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 2 08:10:45 2015 -0700
 
-    Add "column filter string" support to address types.
-    
-    Information about dissector (filter) fields should be kept in a dissector as much as possible. Supporting "column filter string" also allows other dissectors to create their own "address types" with different column filters (because AT_ETHER isn't always an "Ethernet" address).
+    [Automatic update for 2015-08-02]
     
-    This feature also allowed a few "dissector specific" address types to be moved to their own dissector.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: Ie9024af4db62bc2ee4f8c9d28a1d807f706f45bf
-    Ping-Bug:7728
-    Reviewed-on: https://code.wireshark.org/review/7029
-    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: I1c6b1044870e93459bcf4743f00be68ff8ce8ff6
+    Reviewed-on: https://code.wireshark.org/review/9851
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 4497bb4
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Feb 7 22:15:55 2015 -0500
+commit 711edcf
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 1 11:27:09 2015 -0700
 
-    Add address type registration.
+    Set the reported length of chunk data correctly.
     
-    Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future).  Address types that are limited to a single dissector are registered by the dissector.  More "common" ones are globally registered.  There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support.
+    The reported length should be the size of the chunk, not the remaining
+    size of dechunked data.
     
-    Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h)
+    Update some comments while we're at it.
     
-    Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented
-    
-    Change-Id: I494f413e016b22859c44675def11135f228796e0
-    Reviewed-on: https://code.wireshark.org/review/7019
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ia71948fb5ecebdaae3e171c53fd88cf72dcf76a3
+    Reviewed-on: https://code.wireshark.org/review/9846
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 3b81c36
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Feb 7 21:54:39 2015 +0100
+commit 86a8b9c
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 1 13:28:01 2015 +0200
 
-    DNS: LOC Precision missing units
-    
-    The DNS packet's 3rd additional RR is a LOC RR.
-    In the LOC RR, Wireshark marks the Size field with meters unit.
-    However, the Horizontal and Vertical Precision fields have no units
+    MS-WSP: fix some Coverity warnings
     
-    Issue reported by Boaz
+    - prevent some NULL pointer deference pointer
+    - remove DISSECTOR_ASSERT calls: it should be used only for dissector bugs
+    - replace g_slist_next macro calls as the NULL pointer checks are already performed in the for loop
     
-    Bug:10940
-    Change-Id: If177757d2bba6ea012a320aceaea2f8d8e50155c
-    Reviewed-on: https://code.wireshark.org/review/7014
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: If4efd5bb055c7806107ec9646e9864c7e345246d
+    Reviewed-on: https://code.wireshark.org/review/9843
+    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 0a2832c
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 8 20:31:49 2015 +0100
+commit f8cac8e
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 1 16:41:52 2015 +0200
 
-    WMEM (allocator): fix warning: redeclaration of already-defined enum '_wmem_allocator_type_t' is a GNU extension [-Wgnu-redeclared-enum]
+    PNRP: add support for message reassembly
     
-    Change-Id: Ied0428324c14f248bf6857fd288b4fb5d4591230
-    Reviewed-on: https://code.wireshark.org/review/7033
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Bug: 11412
+    Change-Id: I2e8ca62e1babbca20654e8907e8a0b04991bb18f
+    Reviewed-on: https://code.wireshark.org/review/9844
+    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 58f8076
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 8 20:28:48 2015 +0100
+commit 1afe288
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 16:52:37 2015 -0700
 
-    Menubar (GTK): fix warning: no previous prototype for ‘set_menus_capture_start_sensitivity’ [-Wmissing-prototypes]
+    More packet detail context menu items.
     
-    Change-Id: I11c805b285d277ecb963622385154c310f6d1c67
-    Reviewed-on: https://code.wireshark.org/review/7032
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 3c10841
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Feb 8 20:28:20 2015 +0100
-
-    USB HID: fix no previous prototype for 'dissect_usb_hid_get_report_descriptor' [-Wmissing-prototypes]
+    Add the wiki and field reference items to the packet detail context
+    menu. Add the "Go To Linked Packet" item in the Go menu and packet
+    detail context menu. Use "Linked Packet" instead of "Packet Reference"
+    and "Corresponding Packet". Remove more pending item comments.
     
-    Change-Id: Icb7fec658f895e91069e51bab50d57a0a93f5cba
-    Reviewed-on: https://code.wireshark.org/review/7031
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I66c40f71738f0996690f4818a546520ea0747088
+    Reviewed-on: https://code.wireshark.org/review/9841
+    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 0310132
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Oct 27 23:00:54 2014 +0100
+commit c8fec28
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jul 31 15:37:49 2015 -0700
 
-    Multicast Stream: Move mcast_stream.[ch] to ui
+    Print times with the resolution from the capture file.
     
-    Preparation to add Multicast Stream Dialog on Qt (Add extern C...)
+    Print the first packet and last packet time stamps with the resolution
+    supplied for them, and print the difference between them with the higher
+    of those two resolutions.
     
-    Change-Id: Ic8bc39a18dba607d6da116df799de7847ce8e4c8
-    Reviewed-on: https://code.wireshark.org/review/6984
-    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>
-    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I111fbbf91b5957e63dca650b85f182c5f103c5fd
+    Reviewed-on: https://code.wireshark.org/review/9840
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit d7ee095
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Feb 8 20:15:42 2015 +0100
+commit 2e3be54
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 31 22:20:34 2015 +0200
 
-    [ZVT] start dissecting the registration apdu
+    RRC: upgrade dissector to v12.6.0
     
-    Change-Id: Ic8f93913396de3d97cdba4473e6837056c8250a6
-    Reviewed-on: https://code.wireshark.org/review/7030
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ied56f90a8689a25d4093795bfd97d57d40e382c6
+    Reviewed-on: https://code.wireshark.org/review/9838
+    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 3b6998d
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Feb 8 12:42:32 2015 -0500
+commit 26c933b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 13:44:42 2015 -0700
 
-    riemann: Minor cleanup
+    Fix binary data copying.
     
-     Mostly: Rename a number of macros to be RIEMANN_...
+    As the QClipboard::setMimeData documentation says, "Ownership of the
+    data is transferred to the clipboard." Allocate the mime data object
+    accordingly.
     
-    Change-Id: I2b8beb5f9241a0a2a380b8a38222ef07beb1703c
-    Reviewed-on: https://code.wireshark.org/review/7028
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 4c1c76a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Feb 8 08:05:49 2015 -0800
-
-    [Automatic manuf, services and enterprise-numbers update for 2015-02-08]
+    Note the results of trying to paste into hex editors on Windows.
+    Frhed works. Hex Editor Neo and HxD do not.
     
-    Change-Id: Ib8a2e297ccf561f782f2bd462269f180e9155b19
-    Reviewed-on: https://code.wireshark.org/review/7025
+    Change-Id: I46691ba95bf1f5c38817cd42ded73e8e67e4ee97
+    Reviewed-on: https://code.wireshark.org/review/9837
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 14c37af
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Feb 7 22:44:10 2015 -0500
+commit 5336c9a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 12:21:28 2015 -0700
 
-    dwarf: fix bug found by MSVC2013 Code Analysis
+    More spacing fixups.
     
-    The following doesn't quite do what it might seem to be doing:
+    Make spacing more consistent.
     
-    *value |= (byte & 0x7F) << shift;  //guint64 *value // guint8 byte
-    
-    The warning from MSVC2013:
-     Arithmetic overflow:  32-bit value is shifted, then cast to 64-bit
-     value. Results might not be an expected value
-    
-    Change-Id: I06e196559ec0e84da77d8866355ae7f86ba43f73
-    Reviewed-on: https://code.wireshark.org/review/7020
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I8980a84ca70660057016985299b0f95761076893
+    Reviewed-on: https://code.wireshark.org/review/9835
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit f494abd
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sat Feb 7 22:03:38 2015 -0500
+commit 787fa27
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 12:08:30 2015 -0700
 
-    qnet6: don't calculate crc if length is negative
+    Remove spaces.
     
-    Bug: 10941
-    Change-Id: I8c844487fa8ed1fb93ad9f69315fe1559238c845
-    Reviewed-on: https://code.wireshark.org/review/7018
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Iabf5f7610ea5205ad4500502e2b531a8ee130484
+    Reviewed-on: https://code.wireshark.org/review/9834
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 3066d6b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Feb 7 14:51:06 2015 -0800
+commit d8d3c52
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 10:34:43 2015 -0700
 
-    Don't call the Bluetooth code's UUID type "uuid_t".
+    Use an ellipsis character instead of three dots.
     
-    uuid_t is a data type provided by a number of environments, thanks to
-    the Open Software Fuundation; calling the Bluetooth code's data type,
-    which includes an actual OSF-style UUID as a member, "uuid_t" can lead
-    to confusion and *does* lead to compile errors on platforms where, for
-    better or worse, system headers such as <unistd.h> define uuid_t (and
-    are included by, for example, Qt headers).
+    The OS X Human Interface Guidelines at
     
-    Just rename it "bluetooth_uuid_t".
+    https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/OSXHIGuidelines/TerminologyWording.html#//apple_ref/doc/uid/20000957-CH15-SW3
     
-    Change-Id: Ic742723913ba4105cd3269dd24fc821147285176
-    Reviewed-on: https://code.wireshark.org/review/7017
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 96527e2
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Feb 7 16:23:12 2015 -0500
-
-    riemann: Fix bug found by MSVC203 Code Analysis
+    says:
     
-    The following doesn't quite do what it might seem to be doing:
-        guint64 num;
-        guint8 b;
-        num |= ((b & 0x7f) << shift);
+    "Be sure to create the ellipsis character using the key combination
+     Option-; (Option-semicolon). This ensures that an assistive app can
+     provide the correct interpretation of the character to a disabled user.
+     If you use three period characters to simulate an ellipsis, many
+     assistive apps will be unable to make sense of them. Also, three period
+     characters and an ellipsis don't look the same because the periods are
+     spaced differently than the points of an ellipsis."
     
-    The warning from MSVC2013:
-     Arithmetic overflow:  32-bit value is shifted, then cast to 64-bit
-      value. Results might not be an expected value
+    The Windows desktop applications guidelines has a section on ellipses:
     
-    Change-Id: Ic8c939355b54317f0b459c60342f3cb5dfa29624
-    Reviewed-on: https://code.wireshark.org/review/7015
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 22b4619
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Feb 7 12:56:03 2015 -0800
-
-    Add the profile name to the Coloring Rules window title.
+    https://msdn.microsoft.com/en-us/library/windows/desktop/dn742478.aspx
     
-    Matches GTK+ behavior.
+    but doesn't specify the a single glyph vs three dots.
     
-    Change-Id: I3dedb1532b5e14cc18a3ff34fd5be89438912834
-    Reviewed-on: https://code.wireshark.org/review/7012
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 6dd1296
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Feb 7 11:21:17 2015 -0800
-
-    WSUG: Update the Packet Colorization section.
+    The GNOME HIG at
+    
+    https://developer.gnome.org/hig/stable/typography.html.en
+    
+    says "Take Advantage of Unicode" then specifically says to use U+2026
+    HORIZONTAL ELLIPSIS.
     
-    Change-Id: I0f880293bd185e202d230f0db1a6bc4cbe6cfbfb
-    Reviewed-on: https://code.wireshark.org/review/7011
+    Remove the ellipsis from "Find Next" and "Find Previous". Neither
+    requires user interaction.
+    
+    Change-Id: I0e6c28bb8b3a84b242731e2ca96f1a6f6f42c303
+    Reviewed-on: https://code.wireshark.org/review/9833
+    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 4282304
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Feb 7 19:58:40 2015 +0100
+commit c768087
+Author: Noel Power <noel.power@suse.com>
+Date:   Thu Jul 30 14:27:01 2015 +0100
 
-    set protocol to USBHID for get descriptor request and response
-    if they're dealing with HID descriptors
+    MSWSP: Fix clang warnings and handle gracefully needed missing messages
     
-    Change-Id: Ia529fe373653ddf18e05e8ad148a2f5b5686fa95
-    Reviewed-on: https://code.wireshark.org/review/7010
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 5457865
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Feb 7 19:47:37 2015 +0100
-
-    use the value string for HID descriptor type
+    In addition to fixing some clang warnings code now handles the scenario
+    where some needed messages may be missing in the capture, instead of
+    silently ignoring now tell how many bytes we can't dissect and why.
     
-    Change-Id: I19544eeccd5206de88fe480f9b02bc57fcc278bd
-    Reviewed-on: https://code.wireshark.org/review/7009
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ia6fd70d204d279799bc02209865c7f1da35d8191
+    Signed-off-by: Noel Power <noel.power@suse.com>
+    Reviewed-on: https://code.wireshark.org/review/9824
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 1a5b5fa
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Feb 7 19:31:33 2015 +0100
+commit c321171
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jul 30 16:15:40 2015 -0700
 
-    remove the offset parameter from dissect_usb_standard_setup_request()
+    Add Colorize to the packet detail menu.
     
-    Change-Id: Iaf339310c3b606885e945d10cffc1956ce24578a
-    Reviewed-on: https://code.wireshark.org/review/7008
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Idaac0b52e6e4534f40e13839e6dbce2408ca6bfa
+    Reviewed-on: https://code.wireshark.org/review/9831
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 8bf6516
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Jan 19 08:02:26 2015 +0100
+commit da07c62
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jul 30 13:55:46 2015 -0700
 
-    dissect a get descriptor request and response for the HID report descriptor
+    More context menu updates.
     
-    treat those two messages as class-specific control messages, handle them
-    inside the USB HID dissector
+    Add "Follow" and "Export Packet Bytes" to the packet detail context
+    menu. Remove duplicate SCTP menu. Remove redunant action text.
     
-    Change-Id: I42d201df4a8fdb94c947b6118c0b50945c306423
-    Reviewed-on: https://code.wireshark.org/review/7006
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: If69815dc774806e267fbd71aa390b0af6f3b0d14
+    Reviewed-on: https://code.wireshark.org/review/9829
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 5403478
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Feb 5 22:37:54 2015 +0100
+commit 9603db4
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jul 30 12:34:53 2015 -0700
 
-    refactor the dissection of USB setup requests
+    Make copy menu item names more consistent.
     
-    pass the data only to one subsequent dissection function
-    either we have a standard request or a non-standard request that can be
-    handled by a class dissector (we used to do both at the same time,
-    this makes the output difficult to read)
-    
-    Change-Id: Ia46239b2b9e121c9ca165cc56d0b271345d7962e
-    Reviewed-on: https://code.wireshark.org/review/7005
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ia7b2a87ba9ad843dfa9200d69eeb94275a3dc0bb
+    Reviewed-on: https://code.wireshark.org/review/9827
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit a097659
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Feb 1 18:08:15 2015 +0100
+commit 549b8f0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jul 30 12:23:03 2015 -0700
 
-    change try_dissect_next_protocol() such that its parameter is the
-    top-most tree on which it operates
+    Add a missing menu item.
     
-    this gives callers more control over where things are displayed
+    Add "Copy as Filter" to the packet list context menu. Remove completed
+    item comments.
     
-    Change-Id: I8cdc07b4f3569bca728781fb709e2a2bb37c433b
-    Reviewed-on: https://code.wireshark.org/review/7004
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I1e2d9ebcff2fb36918d3e7525690cfb105cb1b13
+    Reviewed-on: https://code.wireshark.org/review/9826
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1648d6e
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Feb 1 16:37:47 2015 +0100
+commit 16b048d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 29 16:24:39 2015 -0700
 
-    new function is_usb_standard_setup_request() to check if a request is a
-    standard setup request
+    Packet list and detail context menu updates.
     
-    it's not sufficient to look at the type bits in the request type field
+    Add some missing items to the packet list and detail "Copy" context
+    menus. Don't nest the "Copy" items so deeply. Add YAML to the supported
+    summary formats.
     
-    use the new function where we checked the type bits before
+    Note that "Copy as Binary" copies to the clipboard as
+    application/octet-stream, which is a) arguably correct, and b) not very
+    useful. Fixes welcome.
     
-    Change-Id: I65b901dca91607a4dad4e4296b3f3a877aebf346
-    Reviewed-on: https://code.wireshark.org/review/7003
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 13f6bce
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Jan 6 10:47:33 2015 +0100
-
-    Bluetooth: ATT: Use proto_tree_add_new_bytes for UUID128
+    Enable and disable packet detail context menu items from a set of
+    booleans similar to the packet list.
     
-    Change-Id: I018b3e125bcbb6908276dd2b3b9f66def9aa745b
-    Reviewed-on: https://code.wireshark.org/review/6907
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: Iaa931c766aa476c33f27de089e5c4dbaf9ce74d6
+    Ping-Bug: 9320
+    Bug: 10831
+    Reviewed-on: https://code.wireshark.org/review/9825
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 617c733
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Tue Jan 6 10:46:17 2015 +0100
+commit e482786
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jul 27 23:21:15 2015 +0200
 
-    Add proto_tree_add_new_bytes()
+    conversation: fix indent (use tabs)
     
-    Version to add as generated field, without tvb offset, length.
-    
-    Change-Id: If4c7aebcbf1b47faa483bcbd40995eff3ccb99f0
-    Reviewed-on: https://code.wireshark.org/review/6906
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I256c364954e1b9edd479e5f25a1d742cc216ffff
+    Reviewed-on: https://code.wireshark.org/review/9809
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 722ce56
+commit e4f418c
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Feb 6 15:44:05 2015 -0500
+Date:   Wed Jul 29 18:48:14 2015 -0400
 
-    btatt: fix bug ("Labeled code is unreachable");
+    [ieee80211]  Don't call expert_...() under 'if (tree)'
     
-     Introduced in gca3fe28;
-     Found by MSVC2013 Code Analysis
-    
-    Change-Id: I4c754dfacca492b53debdaf82557e4fe91698460
-    Reviewed-on: https://code.wireshark.org/review/6991
+    Change-Id: Idcda58191ca664412ef874a69f40eb09a5b38234
+    Reviewed-on: https://code.wireshark.org/review/9820
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit fb00452
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Jan 22 12:27:23 2015 +0100
+commit d6f59cd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 29 12:09:28 2015 -0700
 
-    Bluetooth/GUI: ATT: Add Server Attribute Table
+    Main menu and packet list menu updates.
     
-    It is a GUI+QT feature that introduce Bluetooth menu and
-    "ATT Server Attributes" that present all handle+UUID pairs
-    as table. User may copy cell value, row, selected rows or whole
-    table within header. On activate user will go to packet that
-    introduce UUID for specified handle.
+    Enable and disable packet list-relasted menu items in one place. Add
+    "Colorize Conversation" items to the packet list context menu.
     
-    Change-Id: If17e53aff5feb89ededc740a595ba5882b90be5e
-    Reviewed-on: https://code.wireshark.org/review/6911
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 2ff79dd
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Feb 5 09:18:53 2015 +0100
-
-    Bluetooth: ATT: Fix Running Walking Sensor field name
+    In the GTK+ UI we tend to disable entire menus, which makes their items
+    inaccessible. Try not to do that in the Qt UI so that menu items are
+    always visible even if they're disabled.
     
-    Change-Id: I595c169e476cf86aa77ca926f4ce0d5d0e4aecd1
-    Reviewed-on: https://code.wireshark.org/review/7002
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Remove commented items which are now complete.
+    
+    Change-Id: I69b878b45334bf88014694b1bf016278fa55a94b
+    Reviewed-on: https://code.wireshark.org/review/9819
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 7610a69
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sat Feb 7 17:24:48 2015 +0100
+commit a03a43b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 29 10:36:46 2015 -0700
 
-    Bluetooth: ATT: Fix not missing break
+    Capture file retapping fixups.
     
-    "Break" is not missing, "error opcode" is part of opcode "Error Response"
-    that is needed to fetch request data.
+    Add CaptureFile::delayedRetapPackets, which starts retapping after the
+    current batch of UI event are processed. Call it in the constructors of
+    various dialogs so that they are shown before tapping starts.
     
-    Change-Id: I35432b22fae492a93332a8787213dd8fcf796e3b
-    Reviewed-on: https://code.wireshark.org/review/7001
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 1eec034
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Feb 6 17:25:18 2015 +0100
-
-    Bluetooth: ATT: Missing break in switch (CID 1268199)
+    This *might* fix a crash found when following large streams from the
+    Conversations dialog.
     
-    Change-Id: I562f1b8c1d39586c2a3f25363e89e81587176c58
-    Reviewed-on: https://code.wireshark.org/review/6987
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: If1b87491621ab7efcc0519f95891d34dcd9d18c1
+    Reviewed-on: https://code.wireshark.org/review/9818
+    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 1ecd0ad
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Feb 6 17:08:26 2015 +0100
+commit 5b85613
+Author: Luca Melette <luca@srlabs.de>
+Date:   Fri Jul 10 22:55:27 2015 +0200
 
-    Bluetooth: ATT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    GSM_MAP: adding dissector for sendParameters (MAPv1)
+    
+    The current ASN.1 description of MAP (3GPP 29.002) is missing this operation.
+    I recovered the needed code from an old MAP description (ets_300599e01p) and
+    integrated the missing parts into the asn tree and C template file (via asn2wrs).
     
-    Change-Id: Id323b783e2931ad9b4e08727df91c8e0138d35c1
-    Reviewed-on: https://code.wireshark.org/review/6986
+    Change-Id: Ibe05e6a99f3f95ac66740b5d319a7200fdb3e54b
+    Reviewed-on: https://code.wireshark.org/review/9594
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2c65b33
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Feb 7 00:49:31 2015 +0100
+commit b467f1c
+Author: Noel Power <noel.power@suse.com>
+Date:   Mon Jul 27 12:44:56 2015 +0100
 
-    Fix RTP crash on RTP analysis attempt
+    SMB2: only move ssi for request if request is really complete
     
-    The tap listener was handling rtpstream_tapinfo_t* types while other
-    users was expecting a GList* instead. Fix this and avoid future
-    confusion by replacing void* pointers.
+    MS-SMB2 section '3.2.5.1.5 Handling Asynchronous Responses' states
     
-    Ping-Bug: 10714
-    Change-Id: I66f62eaaed4a529714264bbf4e7ad1e72b46ce5a
-    Reviewed-on: https://code.wireshark.org/review/6997
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+      "If SMB2_FLAGS_ASYNC_COMMAND is set in the Flags field of the SMB2
+       header and Status is not STATUS_PENDING, this is a final response
+       to a request which was processed by the server asynchronously"
+    
+    This patch delays moving ssi information for a processed request
+    to the matched hashmap until the request is actually completed.
+    Without this patch the ssi information for the *final* matching
+    message id response will not be available (on first pass) so a
+    subdissector (e.g. MS-WSP) will not have the ssi information available
+    to it. After this patch the ssi infomation will remain in the 'unmatched'
+    hashmap until the 'final' response for the request is seen. While
+    processing the 'final' matching response the ssi will be moved to
+    the matched hashmap.
+    
+    Change-Id: Id501179ecb4f967a34c82b07d34dcdcd92537dc3
+    Bug: 11402
+    Signed-off-by: Noel Power <noel.power@suse.com>
+    Reviewed-on: https://code.wireshark.org/review/9805
+    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 6f22eb6
-Author: Gerald Combs <gerald@zing.org>
-Date:   Fri Feb 6 16:42:16 2015 -0800
+commit 254dd6b
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jul 27 16:06:32 2015 +0200
 
-    Qt: Fix coloring rules reordering.
+    MSWSP: Enhance dissector
     
-    Change-Id: I8bf36fffb3e3fc19c10c5f07db951cc5a4253556
-    Reviewed-on: https://code.wireshark.org/review/6998
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    * Use a value_string for display OS version
+    * Remove unused pref modules
+    * Remove boiteplate comment
+    * Use boolean for TRUE/FALSE
+    * Replace parseBoolean by proto_tree_add_bitmask
+    * Remove unneed #include
+    * Fix indent
+    * ...
+    
+    Change-Id: I007dc2a92e8c8f8a9a921c2c091e6c9276f1873b
+    Reviewed-on: https://code.wireshark.org/review/9806
+    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 c8cad99
+commit 65a1f60
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 4 16:36:19 2015 -0800
+Date:   Mon Jul 27 16:17:44 2015 -0700
 
-    Qt: Add the Coloring Rules dialog.
+    Add "Disable Protocol..." to the ProtoTree context menu.
     
-    Merge in the old ColorDialog which was a placeholder for
-    color_filter_add_cb.
+    Assume that "I don't want to see this" counts as a preference and add it
+    under the "Protocol Preferences" submenu.
     
-    Change-Id: I48d188509f480b8514122b4011ac9d8790fcca10
-    Reviewed-on: https://code.wireshark.org/review/6996
+    Change-Id: I396e2476509db9df895826f8817b191893bcb14a
+    Reviewed-on: https://code.wireshark.org/review/9812
     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 b3f3dd8
+commit 01bc31c
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Feb 6 10:36:27 2015 -0800
+Date:   Mon Jul 27 15:28:50 2015 -0700
 
-    Qt: Fix preference change behavior.
-    
-    Main window:
+    Fixup packet list context menu behavior.
     
-    Keep track of our current layout and only change it if the preferences
-    change. This keeps the panes from resizing.
+    Add logic to setMenusForSelectedPacket for setting the enabled states
+    for the "Apply As" and "Prepare A" actions. Update the PacketList
+    context menu code to fill in the right filter at the right time.
     
-    Re-select the current packet if the layout changes so that the proto
-    tree and byte view aren't left in an invalid state. This fixes a crash
-    similar to bug 10896.
+    Exit out of setMenusForSelectedTreeRow if the packet list has focus so
+    that we don't clobber the enabled states of various actions.
     
-    Search frame:
+    Take the "Apply As" and "Prepare A" context menu titles from their main
+    window counterparts. Remove actionApply_as_Filter and
+    actionPrepare_a_Filter.
     
-    Get rid of an invalid error message. Update coding style.
+    Remove completed to-do items.
     
-    I don't think any of these fix bug 10921 since Xiaochuan seems to get a
-    crash immediately upon opening the dialog.
-    
-    Change-Id: I0e880a50d3c9ac1c6ae6a01034b05fd2249444f4
-    Reviewed-on: https://code.wireshark.org/review/6989
+    Change-Id: I8f6f538bb7786d8df02a999f3b449dfde640e847
+    Reviewed-on: https://code.wireshark.org/review/9810
     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 3b3ce87
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Feb 6 16:46:19 2015 -0500
+commit 2c79830
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Jul 26 22:29:58 2015 -0400
 
-    qnet6: Fix a bug found by MSVC2013 Code Analysis.
+    tcp: only reset dupACK counter when ACk# changes
     
-      wrongo:
-      2 * 2 + 4 * 5 + (khdr.msgtype & QNET_KIF_CRED) ? (4 * 4 + 4 * 7) : 0
+    Otherwise things like window changes will reset the dup-ack counter incorrectly
+    and confusingly.
     
-    Change-Id: I79117a34528642a81d0c80427a8e41d733bef10d
-    Reviewed-on: https://code.wireshark.org/review/6995
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug: 11397
+    Change-Id: I80b63cf989a952547bec48562a92078c8ab29081
+    Reviewed-on: https://code.wireshark.org/review/9802
+    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 ff6d503
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Feb 6 14:04:01 2015 -0500
+commit 1732017
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sun Jul 26 13:21:40 2015 -0700
 
-    qnet6: Cleanup
+    Add an application-wide style sheet.
     
-    - Remove some boilerplate comments;
-    - Use a consistent indent style (gnu);
-    - Use a consistent format for hf[] entries;
-    - Whitespace;
-    - Long lines;
-    - Rename a generic macro;
+    Use it to work around poorly drawn splitters on OS X.
     
-    Change-Id: Ic2edcf8a8c0151d63a0d0ad901ddea9d7443ad19
-    Reviewed-on: https://code.wireshark.org/review/6994
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ic8e7331b1ba37fe783312b4460961f361297c7f0
+    Reviewed-on: https://code.wireshark.org/review/9798
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 49c27d3
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Feb 6 16:18:30 2015 -0500
+commit 000ce64
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Sun Jul 26 21:54:12 2015 +1000
 
-    cfdp: Fix bug ("Labeled code is unreachable")
+    nettrace3gpp324423: fix name consistency
     
-    Found by MSVC2013 Code Analysis
+    Improve consistency when referring to 3GPP TS 32.423:
+    - The standard name is "3GPP TS 32.423" (with "TS", and "." separator).
+    - Fix typo in number series ("32" not "34").
+    - The standard refers to "Trace", not "Nettrace".
     
-    Change-Id: If8138ff3eab7daa1da728781314f8024e36545be
-    Reviewed-on: https://code.wireshark.org/review/6992
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: If9994b9c6de69b6e1bdfc6679fbaabe698971949
+    Reviewed-on: https://code.wireshark.org/review/9795
+    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 501d996
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Feb 4 10:13:50 2015 -0500
+commit 8b316ff
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Jul 26 17:31:26 2015 -0400
 
-    Further simplify the LSA-Update processing: the always-present forwarding block
-    can be considered TOS 0.
+    Tshark doesn't display column text as field in 2-pass mode
     
-    Use similar logic in LSA-Summary processing.
-    
-    Ping-Bug: 6302
-    Change-Id: I0a74b95f6c4413ebce240e6e1b46c7e88311713a
-    Reviewed-on: https://code.wireshark.org/review/6951
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 11401
+    Change-Id: I6aa43d5cdd996aaf0980ab59b690212e41046acc
+    Reviewed-on: https://code.wireshark.org/review/9800
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 8b095bc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Feb 6 17:04:02 2015 +0100
+commit 179da0f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jul 26 08:10:01 2015 -0700
 
-    Multicast Stream (GTK): fix crash when try to select a stream
+    [Automatic update for 2015-07-26]
     
-    Change-Id: Iaaa9445ae99b37cfb1865251d50f38375f3eb272
-    Reviewed-on: https://code.wireshark.org/review/6985
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: I3ddd31b2ebded50dcbe974ce99ef9b417b39aa2f
+    Reviewed-on: https://code.wireshark.org/review/9796
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 55eb35a
-Author: Petr Gotthard <petr.gotthard@centrum.cz>
-Date:   Fri Feb 6 09:50:40 2015 +0100
+commit 29f2f09
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jul 26 10:53:02 2015 +0200
 
-    AMQP: Fix one warning from Clang Code Analysis
+    MSWSP: Remove usage of stdbool.h
     
-    Since 'values' is always 'length/4', we can have it as 'gint' and avoid
-    the Clang warning concerning the while cycle.
-    >> cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]
+    For fix build on Solaris
+    "/usr/include/stdbool.h", line 42: #error: "Use of <stdbool.h> is valid only in a c99 compilation environment."
     
-    Change-Id: I4342f9e3fcd5df7779f41414ab6f789fe402e3af
-    Reviewed-on: https://code.wireshark.org/review/6979
+    Replace bool -> gboolean
+    Replace true -> TRUE, false -> FALSE (for fix Wcompat error..)
+    
+    Change-Id: Ia3f39bfbbaf7cf35a916eb37edfc6745ea50ad36
+    Reviewed-on: https://code.wireshark.org/review/9793
     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: Graham Bloice <graham.bloice@trihedral.com>
 
-commit eb85555
-Author: Petr Gotthard <petr.gotthard@centrum.cz>
-Date:   Thu Feb 5 18:01:54 2015 +0100
+commit cc134b1
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jul 26 11:17:04 2015 +0200
 
-    AMQP: Add more COL_INFO description for some packets/frames.
+    MSWSP: Try to fix Mac OS X Buildbot
     
-    Change-Id: If70dc3972d99d34d8e37dd26045076e515fd4d2c
-    Reviewed-on: https://code.wireshark.org/review/6968
+    Change-Id: I0c7bd3ea3900630ce4516cb00e6400cca353b672
+    Reviewed-on: https://code.wireshark.org/review/9794
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
     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: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 0b0f7fa
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Feb 4 10:32:02 2015 -0500
+commit 0795931
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jul 26 10:32:41 2015 +0200
 
-    More emem removal.
+    VoIP Call: fix Ubuntu Buildbot
     
-    Remove emem's 8-byte-memory-alignment configure check as well as references
-    to all the environment variables emem used.
+    Missing init of new sip_frame_num variable...
     
-    Change-Id: I897aec9e9c68e064454561e7a9f066b18892ec66
-    Reviewed-on: https://code.wireshark.org/review/6950
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    voip_calls_dlg.c: In function ‘voip_calls_get_info’:
+    voip_calls_dlg.c:132:3: error: enum conversion in initialization is invalid in C++ [-Werror=c++-compat]
+    voip_calls_dlg.c:132:3: error: (near initialization for ‘the_tapinfo_struct.fs_option’) [-Werror=c++-compat]
+    voip_calls_dlg.c:132:3: error: missing initializer for field ‘redraw’ of ‘voip_calls_tapinfo_t’ [-Werror=missing-field-initializers]
+                               ^
+    
+    Change-Id: Ib76dec02d03f66d365ef18926bc4507a6f70556d
+    Reviewed-on: https://code.wireshark.org/review/9792
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit c711a63
+Author: Michal Pazdera <michal.pazdera@gmail.com>
+Date:   Fri Jul 3 10:21:04 2015 +0200
+
+    Avoid duplicate SIP and Q.931 calls in VoIP Calls list in case of Q.931
+    transported over SIP as described in RFC 3204, 3.2 QSIG Media Type.
+    
+    Change-Id: Ida30a7b115e60fa64d30cfc1f4b7c11be724f8ee
+    Reviewed-on: https://code.wireshark.org/review/9479
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 881ff5d
+commit 19578ba
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 4 12:18:37 2015 -0800
+Date:   Fri Jul 24 09:53:09 2015 -0700
 
-    Remove gethostbyaddr and gethostbyaddr2.
+    Minor Enabled Protocols tweaks.
     
-    They've been deprecated for a very long time. Replace them with
-    getaddrinfo. Note that we might not want to do synchronous name
-    resolution at all.
+    Try to keep long protocol names from widening the first column too much.
     
-    Add HAVE_GETADDRINFO to the KfW win-mac.h collision list.
+    Expand all tree items.
     
-    Change-Id: If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c
-    Reviewed-on: https://code.wireshark.org/review/6958
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I4f09aa2a895aa0ee5a6faab8242768b62b1208bc
+    Reviewed-on: https://code.wireshark.org/review/9771
+    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 d6ebb82
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Feb 5 21:31:06 2015 -0500
-
-    (Trivial) Reformat some.
-    
-    Change-Id: I1bed28c33d1942b9d8ee8ef341d7017d2df21f37
-    Reviewed-on: https://code.wireshark.org/review/6977
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit 61e3bdc
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 5 16:58:57 2015 -0800
+commit fe7a35a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jul 23 22:38:41 2015 +0200
 
-    WSDG: Wrap a line.
+    ISAKMP: Remove uneeded space before HF name and HF filter
     
-    Change-Id: I21e573c3800a245cbdae4fcb4d4cfaf36f3a0abd
-    Reviewed-on: https://code.wireshark.org/review/6976
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I5669277b9a03cba17067d52e6a9f9df933c3eb5d
+    Reviewed-on: https://code.wireshark.org/review/9767
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3badc30
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Feb 5 23:20:54 2015 +0100
+commit 3ea89e6
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jul 6 09:51:11 2015 +0200
 
-    QNET6: do not use col_set_str with non constant strings
+    lemon (tools): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-    Change-Id: I63e965d819413299bf3e9a400b80ded23225598a
-    Reviewed-on: https://code.wireshark.org/review/6975
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ibfa0bfd589e77a58b7b242c7c2fe25ef052a874e
+    Reviewed-on: https://code.wireshark.org/review/9516
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit b3e8269
-Author: cbontje <cbontje@gmail.com>
-Date:   Thu Feb 5 12:51:51 2015 -0700
+commit 47c1753
+Author: Richard Sharpe <rsharpe@samba.org>
+Date:   Fri Jul 24 20:41:31 2015 -0700
 
-    SEL Protocol Maintenance (2/2)
+    Fix an error where we expect the tagged parameters field to be present even
+    though the spec (802.11ad-2012) says they are optional.
     
-    - Complete internal cleanup of 'fastser' -> 'fastmsg' syntax
-    - Includes all variables, comments and filter values
+    Communicated to me by the WiFi Alliance. I have captures. Not sure if I can
+    share them.
     
-    Change-Id: Ib58e470c9552387cb8c1d8c68fa1574cf7aa1691
-    Reviewed-on: https://code.wireshark.org/review/6974
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Id5998594214ac4b6a1d3baf3cb2f0d4fe6227b40
+    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/9785
+    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 1fdc6f4
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Feb 5 12:45:50 2015 +0100
-
-    QNX6: avoid deferencing a null pointer
-    
-    Bug: 10920
-    Change-Id: Ibf3539c188431d2514c523c094d1e2d86b77f0b5
-    Reviewed-on: https://code.wireshark.org/review/6967
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3f480c6
-Author: cbontje <cbontje@gmail.com>
-Date:   Thu Feb 5 12:49:58 2015 -0700
+commit 92fa272
+Author: Andrei Cipu <acipu@ixiacom.com>
+Date:   Thu Jul 23 17:25:57 2015 +0300
 
-    The 'mbrtu' dissector should be registered with RTAC Serial, not the 'modbus' one.
+    ISAKMP: Add 3GPP IMS Options for IKEv2
     
-    (This error was missed by me when confirming recent changes to the RTAC
-    serial dissector and fixes decoding of RTAC serial Modbus captures.)
+    Bug:11392
     
-    Change-Id: I2df609f88263e90ae4815722ff76b6a0b988a01e
-    Reviewed-on: https://code.wireshark.org/review/6973
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I53045f25cf9f3daf910e9fd5240033ffcd1941a2
+    Reviewed-on: https://code.wireshark.org/review/9757
+    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 99761aa
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 5 11:03:11 2015 -0800
+commit 2874334
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jul 23 22:31:09 2015 +0200
 
-    Remove endif() left over from previous change.
+    ISAKMP: The modecfg attribute type INTERNAL_IP6_ADDRESS is not decoded correctly
     
-    Change-Id: Ia5781bcb55b2cf2e5ab2bc8c6587348ffe62a5c2
-    Reviewed-on: https://code.wireshark.org/review/6972
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 572b30a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Feb 5 10:22:52 2015 -0800
-
-    Get rid of the temporary OS X-specific hack.
+    According to RFC7296, section 3.15.1:
     
-    Hopefully Gerald's change will fix this annoyance once and for all.
+    "The INTERNAL_IP6_ADDRESS is made up of two fields: the first is a 16-octet IPv6 address, and the second is a one-octet prefix-length as defined in [ADDRIPV6]."
     
-    Change-Id: I547b221a670f1435fa86cb96b084cfa5b788c57f
-    Reviewed-on: https://code.wireshark.org/review/6971
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d138011
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 5 09:48:39 2015 -0800
-
-    WSDG: Fixup admonition block formatting.
+    In the code, the type is declared as FT_IPv4 and the field is decoded only if it has 16 bytes. Instead, it should be declared as FT_IPv6 and the first 16 bytes should be added to the tree.
     
-    We tend to clobber the reader with admon blocks. Make the preceding and
-    succeeding ones normal paragraphs.
+    Issue reported by Andrei Cipu
     
-    Change-Id: I0c70af93feb586d2e8f6120e2842fab52379b76f
-    Reviewed-on: https://code.wireshark.org/review/6970
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Bug: 11393
+    Ping-Bug: 11392
+    Change-Id: I8dbc268e71fd6239dffa5469652345a68e0adc86
+    Reviewed-on: https://code.wireshark.org/review/9761
+    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 410a8d1
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Feb 5 09:22:37 2015 -0800
+commit 38a2385
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Jul 25 17:10:31 2015 +0200
 
-    CMake: Make copy_data_files depend on html_docs.
-    
-    Semi-blind attempt to fix what appears to be a race condition on the OS
-    X x86 buildbot.
+    MAC LTE: fix dissection of Long DRX Command Control Element
     
-    Change-Id: I379c7dec26c2bca092d0c9a49465ee56a01d15ec
-    Reviewed-on: https://code.wireshark.org/review/6969
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I2d122a9ad8cd768499bff8e1af8754d2eb504594
+    Reviewed-on: https://code.wireshark.org/review/9788
+    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 dff82e6
-Author: Richard Sharpe <realrichardsharpe@gmail.com>
-Date:   Sun Feb 1 11:50:10 2015 -0800
+commit 8c4b831
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Jul 25 16:30:55 2015 +0200
 
-    Update the Windows build documentation with some common traps that stop people
-    from building as well as a hint about downloading the vcredist_xYY.exe file.
+    MAC LTE: fix dissection of CCCH SDU for Category 0 UE
     
-    Change-Id: I6ae9a045939a77ba2c9584f05124fdc8f355f11c
-    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/6916
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Change-Id: I2d840ad2ba70cdf87b3cd12b9d4a433f05e0b1b2
+    Reviewed-on: https://code.wireshark.org/review/9787
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 48aa669
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Feb 5 10:18:36 2015 +0100
+commit 190e313
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Jul 25 09:24:48 2015 -0400
 
-    CAPWAP: Fix a typo.
+    DNS: move DNS name resolution pref to Name Resolution prefs
     
-    Change-Id: I19031eac4d26a5620dc05f2632c403d82d7a4ab2
-    Reviewed-on: https://code.wireshark.org/review/6966
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Move the boolean flag for using captured DNS packet info for name resolution
+    to the Name Resolution preferences settings, as it was rather surprising to
+    disable Name Resolution preferences and still have names being resolved. Also
+    disble them all if the '-n' command line switch is used, and re-enable it for
+    a 'd' character in the '-N' option.
+    
+    Bug: 10337
+    Change-Id: Ie4d47bab0100db3360cc447cd3e446b2e39aa917
+    Reviewed-on: https://code.wireshark.org/review/9786
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit fb9dc13
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 5 09:33:45 2015 +0100
+commit 3fc4a83
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Fri Jul 24 14:51:37 2015 -0400
 
-    MySQL: fix assert  when the Connect Attrs capability is set, but no attributes
+    Fix ptvcursor_add() so it can dissect the last bytes in a TVB again.
     
-    From
-    <http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse>
-    (emphasis mine):
+    ptvc->offset has already been incremented by the item length so don't use it as
+    the offset to test_length(); we need to use the original offset.
     
-    Starting with MySQL 5.6.6 the client **may** send attributes if CLIENT_CONNECT_ATTRS is set:
+    Problem introduced by Idfd258c734e7a946300b2564bebf6e4cb374c8d1 .
     
-    Does this mean that the capability *may* be set, but the list of attributes can be empty?
-    
-    Issue reported by Peter Wu
-    
-    Ping-Bug:10351
-    Change-Id: Ib83c27f4a15341f791c443471d7a3bdbd942aef4
-    Reviewed-on: https://code.wireshark.org/review/6965
+    Change-Id: I0421539bde6e8eb7b5aa3e22dbb0ca8098e88d6f
+    Reviewed-on: https://code.wireshark.org/review/9779
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2bcd38f
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Feb 4 22:30:20 2015 -0500
-
-    ethercat: add default case in FoeFormatter
-    
-    Should probably fix an unintialized memory access caught by valgrind, although I
-    can't reproduce it because out-of-tree plugins are still broken.
-    
-    Bug: 10919
-    Change-Id: Ib8c46e13922f25260ca0e8886368f5ce24e3d0b0
-    Reviewed-on: https://code.wireshark.org/review/6962
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+commit c425334
+Author: Gregor Beck <gbeck@sernet.de>
+Date:   Mon Sep 17 13:22:32 2012 +0200
+
+    MSWSP: Initial implementation of MS-WSP (windows search protocol) dissector
+    
+    This changeset is a forward port of Gregors ms-wsp branch from his
+    repo http://repo.or.cz/w/wireshark-wip.git. Most of the messages of
+    the MS-WSP protocol are implemented here and as such consists of the
+    majority of the changes for the dissector.
+    
+    In addition to the forward porting Gregors work I added some extra bits
+    1) cater for SMB2 Read Response and Write Request msgs that can also
+       contain MSWSP messages
+    2) update property specifications with info extracted from MS-WSP protocol
+       doc
+    3) store some basic data about previously seen messages that are needed
+       for dissecting CPMGetRows request
+    4) expand/update dissect_CPMSetBindings & parse_CTableColumn routines
+    5) parse and store CTableColumn & CPMSetBindingsIn structures in conversation
+       related data for use later.
+    6) fully dissect/parse SeekDesciption of CPMGetRowsOut
+    7) dissect CPMGetRows out message specifically the Rows & Columns
+    8) flesh out the boolean properties of uBooleanOptions field
+    9) flesh out various other dissectors:
+       CPMRatioFinished
+       CPMRestartPosition
+       CPMCompareBmkIn/CPMCompareBmkOut
+       CPMGetApproximatePosition
+       CPMGetSendNotifyOut
+       FindIndicesIn/Out
+       FetchValue
+    
+    Bug: 11321
+    Change-Id: I68b5c2f3e63874c1dbb271feab89b2b8aa65ac39
+    Signed-off-by: Noel Power <noel.power@suse.com>
+    Reviewed-on: https://code.wireshark.org/review/9440
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8bad9ed
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 5 07:52:48 2015 +0100
+commit 23ca456
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Jul 25 00:08:52 2015 +0200
 
-    CAPWAP : fix warning about wrong type after proto_tree_add_bitmask(_with_flags) change
-    
-    Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 1: proto.c:7802: field capwap.control.message_element.wtp_frame_tunnel_mode is not of an FT_{U}INTn type
-    Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 2: proto.c:7802: field capwap.control.message_element.ac_descriptor.security is not of an FT_{U}INTn type
-    ...
+    MAC LTE: fix dump of last SDU
     
-    Change-Id: I03f70ca664d99771ad27457052e6df11f9d5ad9e
-    Reviewed-on: https://code.wireshark.org/review/6964
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ice39b71fab564cde0688c451bdf46c7e426475ce
+    Reviewed-on: https://code.wireshark.org/review/9782
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 8ffaec9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Feb 5 07:48:28 2015 +0100
+commit 7be155e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 24 10:24:15 2015 -0700
 
-    CAPWAP: Don't try to dissect fragment packet (Only display are "Data")
+    Try deleting WiresharkDialog when we close it.
     
-    Issue reported by Massimo Vellucci
+    QDialog::accept and ::reject hide the dialog but don't delete it. In the
+    case of WiresharkDialog and its subclasses we might leak memory or leave
+    files open. Call deleteLater when we close the dialog.
     
-    Bug:10918
-    Change-Id: I7f3b15536f66496d975696b3ff29fbc5b77ee5a8
-    Reviewed-on: https://code.wireshark.org/review/6963
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ie0b848a7deeeee4667925b0d886e498f13a86bfc
+    Reviewed-on: https://code.wireshark.org/review/9781
+    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 5b62526
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 4 16:46:24 2015 -0800
+commit d24614c
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 24 19:50:29 2015 +0200
 
-    OK, try cmake -E copy.
-    
-    It didn't fail with cp, so maybe that's just random luck, or maybe the
-    built-in copy functions have an issue, or maybe just copy_if_different
-    has an issue (64-bit inode number issues?).  Try just copy, and see what
-    happens.
+    MAC LTE: fix dissection when only header is captured but full PDU length is reported
     
-    Change-Id: I84abf3846af9305c19ad4a78d5c9df31b1e1e61e
-    Reviewed-on: https://code.wireshark.org/review/6961
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I66ccfc26b3a0e948fdcf8dfe4ec8e87e6ed756da
+    Reviewed-on: https://code.wireshark.org/review/9778
+    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 a2e48c6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Feb 4 15:56:15 2015 -0800
+commit bb7e657
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 24 19:13:31 2015 +0200
 
-    On OS X, temporarily use cp to install some files.
+    RLC: fix dissection when only header is captured but full PDU length is reported
     
-    The 32-bit OS X build is failing rather often due to cmake -E
-    copy_if_different failing to copy wireshark.html, and to call cmake's
-    copy functions completely crappy at reporting errors is to insult
-    software that's merely completely crappy at reporting errors.  Try using
-    cp in the hopes that it'll actually tell us *WHY* the copy is failing
-    and see if we can fix it.
+    Change-Id: I06e7bed71a42c6cbe500d7f1994a625b37d6586c
+    Reviewed-on: https://code.wireshark.org/review/9777
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit b962fdd
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 24 19:12:45 2015 +0200
+
+    RLC LTE: fix dissection when only header is captured but full PDU length is reported
     
-    Change-Id: I723150c52c2ec0fe704d54191ef27fb6caf47fba
-    Reviewed-on: https://code.wireshark.org/review/6960
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I67654bb0ca30d9bb56c9a4b3be179161ecd0de3a
+    Reviewed-on: https://code.wireshark.org/review/9776
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 86d24b0
+commit b9a4bab
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Feb 4 22:35:24 2015 +0100
+Date:   Fri Jul 24 19:10:30 2015 +0200
 
-    LPP: upgrade dissector to v12.3.0
+    PDCP LTE: fix dissection when only header is captured but full PDU length is reported
     
-    Change-Id: Ibc2aa3127efcfbae33e6f3729d0e1e427db1c0fe
-    Reviewed-on: https://code.wireshark.org/review/6959
+    Change-Id: I62c89a49f3cf2ed566e16a978b2ed237f09d466e
+    Reviewed-on: https://code.wireshark.org/review/9775
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 40d06bd
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 4 13:07:50 2015 -0800
+commit 1ea2565
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 24 18:32:26 2015 +0200
 
-    Don't clobber PROJECT_VERSION_EXTENSION.
+    SIP: heuristic dissectors should use the captured length, not the reported one
     
-    PROJECT_VERSION_EXTENSION was updated to match g528a857 config.nmake.
-    Try to preserve it if it's set.
+    Otherwise it triggers a "packet size limited during capture" exception
+    preventing following heuristic dissectors to be called
     
-    Change-Id: I48edfcd149ef5adafff7ece68e0d43a9cdec0b59
-    Reviewed-on: https://code.wireshark.org/review/6957
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ifc97e84b4e40a1c7dc0b0c63b7b9e015bd99d178
+    Reviewed-on: https://code.wireshark.org/review/9774
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 52b4059
+commit efefdbb
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Feb 4 13:00:52 2015 -0800
+Date:   Fri Jul 24 12:04:27 2015 -0700
 
-    1.99.2 → 1.99.3.
+    1.99.8 → 1.99.9.
     
-    Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638
-    Reviewed-on: https://code.wireshark.org/review/6956
+    Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552
+    Reviewed-on: https://code.wireshark.org/review/9780
     Reviewed-by: Gerald Combs <gerald@wireshark.org>