Build 1.99.9.

Change-Id: I6892f8ae21e927a6ab9281d952b96a54da94781e Reviewed-on: https://code.wireshark.org/review/10358 Reviewed-by: Gerald Combs <gerald@wireshark.org>
author: Gerald Combs <gerald@wireshark.org> 2015-09-02 09:19:40 -0700
committer: Gerald Combs <gerald@wireshark.org> 2015-09-02 16:26:22 +0000
commit: 52a4a785a867cfe0712f23b2c3bbb0fd33dcb9f2 (patch)
tree: 6812e7c5fe667a69f938766385ea63320ce3353d /ChangeLog
parent: af6365a834830d5d2c8c8de6f456dd79e4f8e98f (diff)
1 files changed, 4888 insertions, 5300 deletions
diff --git a/ChangeLog b/ChangeLog
index 928f397b29..b350578d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7244 +1,6832 @@
-commit e2561da
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Fri Jul 24 16:33:27 2015 +0100
+commit af6365a
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 30 23:18:34 2015 +0100
 
-    Fix CMake 7zip search
+    Allow "Decode As" for IPv6 over UDP
     
-    A further fix for the CMake Windows search for 7-zip.
-    
-    Add the destination\bin path to the search path.
-    
-    When downloading from anonsvn only pass the path within the destination
-    not the whole path.
-    
-    Change-Id: I2beec925730fae21d6a63bee5332e1002f49d6ae
-    Reviewed-on: https://code.wireshark.org/review/9770
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    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 2eabd35
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jul 24 07:41:40 2015 -0400
+commit d512710
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Sep 2 13:40:46 2015 +0200
 
-    Skip large files when fuzzing with valgrind
+    idl2wrs: fix clang analyzer Warning complains.
     
-    They run the buildbot out of memory, so just skip them, we don't want to remove
-    them from the menagerie entirely.
+    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
     
-    ("large" here is > 20000 KB, but that could change)
     
-    Change-Id: I58dd9a981be6e6fc661ea624cc0c5258a5986a9f
-    Ping-Bug: 11395
-    Reviewed-on: https://code.wireshark.org/review/9768
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit db82d0f
-Author: Gerald Combs <gerald@zing.org>
-Date:   Thu Jul 23 18:39:30 2015 -0700
-
-    Fix the Copy menu placement in the ProtoTree context menu.
-    
-    Change-Id: I8e967000b769918af2c0fb3dae22b3d36be07647
-    Reviewed-on: https://code.wireshark.org/review/9765
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: If1a1acfc331e0648f95f6d6defe6533b6927ccaa
+    Reviewed-on: https://code.wireshark.org/review/10357
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 963b0c9
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Thu Jul 23 21:09:12 2015 -0400
+commit 5518ae0
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Sep 2 12:43:23 2015 +0200
 
-    Lua: add the 1.12.x Lua API to the globals verification test suite
+    PER: followup of g59453fb
     
-    Change-Id: I698fc75dc915ea007b2f7762f0041dbb6dd1d8d3
-    Reviewed-on: https://code.wireshark.org/review/9764
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    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 d2828a3
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Thu Jul 23 20:27:26 2015 -0400
+commit e1dee7c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Sep 2 12:27:31 2015 +0200
 
-    Lua: fix "since 1.99.9" to be 1.99.8
+    dcerpc: fixed distcheck.
     
-    Change-Id: I842e4b6a38fc161ba7ab14caa27b3bbf74c989d7
-    Reviewed-on: https://code.wireshark.org/review/9763
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: Ide0b95278786d45d9c41fb0fe3214dce0880b830
+    Reviewed-on: https://code.wireshark.org/review/10355
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 99b5813
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Thu Jul 23 22:36:09 2015 +0100
+commit 5d8363e
+Author: Tom Haynes <loghyr@primarydata.com>
+Date:   Tue Sep 1 14:07:30 2015 -0700
 
-    Fix 7-zip search
+    nfs: Fix order of octets in IPv4 address
     
-    The path for a Chocolatey 7zip.commandline install is
-    $env:ChocolateyInstall\bin
+    Before:
     
-    and the version installed by Chocolatey for its own use is in
-    $env:ChocolateyInstall\tools
+    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]
     
-    Change-Id: I2f1ee78e93f861075f8c06ed74d81d8173911299
-    Reviewed-on: https://code.wireshark.org/review/9762
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit da5eba6
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 23 12:53:45 2015 -0700
-
-    Fix QCocoaMenu errors.
+    After:
     
-    In PacketList and ProtoTree, create our own QMenus instead of stealing
-    actions from the main window. This only fixes the errors listed in bug
-    10890. Add "to do" items for other bugs.
+    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]
     
-    Bug: 10890
-    Change-Id: I1c7ce8e4b863de95b2836e0cdcfb25824fe21edd
-    Reviewed-on: https://code.wireshark.org/review/9760
-    Petri-Dish: 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: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit dc6d376
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 23 11:35:35 2015 -0700
+commit 920e056
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Sep 2 07:48:34 2015 +0200
 
-    Update the release notes.
+    idl2wrs: Make Mac OSX buildbot happy
     
-    Change-Id: Ia34b10e45debd2e18cf87b6c8bac871cad4b4df6
-    Reviewed-on: https://code.wireshark.org/review/9759
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I5f9c860bec0f8d323d9f3cd7cf55e348654c8b8b
+    Reviewed-on: https://code.wireshark.org/review/10354
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit a5f7b84
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 23 11:19:38 2015 -0700
+commit 8b6fe35
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Sep 2 01:33:22 2015 +0100
 
-    Fixup selected packet arithmetic.
-    
-    Or, "I can mathing" if you prefer meme-based commit messages.
+    IPv4: Remove extraneous colon from format string
     
-    Change-Id: I8fd1db0e2a1e99525191ae6b33115ef8e38ab2f4
-    Reviewed-on: https://code.wireshark.org/review/9758
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: If52f8086ec971cc43947ece3d8e062da8378fa95
+    Reviewed-on: https://code.wireshark.org/review/10352
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 9bca127
-Author: Umberto Corponi <umberto.corponi@athonet.com>
-Date:   Thu Jul 16 22:42:30 2015 +0200
+commit 59453fb
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Sep 1 22:14:47 2015 -0400
 
-    Add support for MB2c Diameter interface.
-    
-    Add decoding for MB2c specific AVPs according to 3GPP TS 29.468 Rel 12.1.0.
+    Eliminate proto_tree_add_text from packet-per.c
     
-    Change-Id: I0b50cacb5a3e7cb32de89b31da24e725361edf80
-    Reviewed-on: https://code.wireshark.org/review/9756
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    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 c5bda79
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Tue Jul 21 15:11:38 2015 +0200
+commit c41a833
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Sep 1 20:18:15 2015 -0400
 
-    openSAFETY: Disable heur dissector & scm bugfix
-    
-     - Bugfix for the SCM UDID, where the expert info was generated
-       even if not necessary, and a SCM UDID consisting of zeroes was
-       considered to be valid
+    Eliminate proto_tree_add_text from some dissectors.
     
-     - Using the new method for enabling/disabling heuristic dissectors,
-       this patch reworks the SIII dissection to perform exactly the
-       same as the EPL dissection (which is the expected behavior)
+    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 630f48f
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Sep 1 13:28:56 2015 -0400
+
+    Eliminate proto_tree_add_text from packet-rsvp.c
     
-    Change-Id: Ide559c3e104b77818cef642b34e0076a7c5bd13d
-    Reviewed-on: https://code.wireshark.org/review/9735
-    Reviewed-by: Roland Knall <rknall@gmail.com>
+    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: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit b191f7e
-Author: Christoph Schlosser <christoph.schlosser@br-automation.com>
-Date:   Tue Jul 21 17:05:07 2015 +0200
+commit 87f2bd4
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Fri Aug 14 12:02:38 2015 +0200
 
-    epl: Fix epl write multiple parameter by index
+    idl2wrs: some code cleanups.
     
-     Instead of interpreting the OD Index and OD Subindex as abort code now the
-     correct offset is applied and the abort code is correctly evaluated.
+    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: Ic70e755d835c5f62f6cff8a8848a33ee8758faf4
-    Reviewed-on: https://code.wireshark.org/review/9736
-    Reviewed-by: Christoph Schlosser <christoph.schlosser@yahoo.de>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    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 1ddf1cf
+commit aa1f556
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jun 1 19:48:17 2015 +0200
+Date:   Mon Aug 31 13:59:28 2015 +0200
 
-    CheckAPI: Add a shadow variable check
+    MSDP: fix will never be executed [-Wunreachable-code]
     
-    Check if there is index, time or strlen variable
+    Move tvbuff declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020
     
-    Change-Id: I530a35d6e1cf13f0795b35579ce76ee373ed4b1a
-    Reviewed-on: https://code.wireshark.org/review/8724
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    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 998dcc2
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Sep 1 19:50:52 2015 +0200
+
+    ANSI: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    
+    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>
 
-commit 8575e41
+commit b7764fc
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jul 23 14:53:54 2015 +0200
+Date:   Mon Aug 31 14:01:46 2015 +0200
 
-    NTP: fix DISSECTOR_ASSERT when decoding v6_flags
+    UMTS (mac): fix will never be executed [-Wunreachable-code]
+    
+    
+    Move tvbuff_t declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020
     
-    Issue include in g8d6324f75
     
-    Change-Id: I49267b90a4a196409df76cb369d2dfacf42ba8d3
-    Ping-Bug:11361
-    Reviewed-on: https://code.wireshark.org/review/9754
+    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>
-    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 f6934d2
-Author: Jean Thomas <jeanthomas@sierrawireless.com>
-Date:   Wed Jul 22 17:48:51 2015 +0200
+commit c8f8784
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Sep 1 19:39:44 2015 +0200
 
-    Add decoding of following GSM A RR messages:
+    ANSI A: fix dissection of numerous fields broken in g7298a31
     
-    - Talker indication
-    - Uplink release
-    - VGCS uplink grant
+    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: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit f0e4c49
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Sep 1 08:24:58 2015 -0700
+
+    Update the release notes.
     
-    Change-Id: I969ada857b71fb3d89efc44a18159c8aa39eef54
-    Reviewed-on: https://code.wireshark.org/review/9753
+    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 db2fdfd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Sep 1 07:37:45 2015 -0700
 
-commit 5b53445
+    Fixup the main window tab order.
+    
+    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>
+
+commit a8682af
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Sep 1 09:53:38 2015 +0200
+
+    [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' -
+    
+    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:   Wed Jul 15 23:10:16 2015 -0400
+Date:   Mon Aug 31 00:20:49 2015 -0400
 
-    Add test_length to ptvcursor_add so it can do some bounds checking.
+    Eliminate proto_tree_add_text from ANSI dissectors.
     
-    Ping-Bug: 11358
-    Change-Id: Idfd258c734e7a946300b2564bebf6e4cb374c8d1
-    Reviewed-on: https://code.wireshark.org/review/9655
-    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 2316352
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Fri Jul 10 11:34:04 2015 -0400
+commit 54d2ff1
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 31 16:06:33 2015 -0700
 
-    Lua: add plugin version info
+    Convert the WSP stats to generic stat API.
     
-    Expose a "set_plugin_info" global function to set the Lua plugin's
-    version information. Also, put info about Lua scripts loaded from
-    the command-line into the help output, not just for scripts loaded
-    from plugin direvtories.
+    Add support for multiple tables to SimpleStatisticsDialog.
     
-    Bug: 11315
-    Change-Id: I8bc425ed1ed0dfdc1d05178754f44d44e0b209b5
-    Reviewed-on: https://code.wireshark.org/review/9593
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    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: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 2c534a9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jul 21 13:32:42 2015 -0400
+commit 377d215
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 31 12:24:48 2015 -0700
 
-    Add Enabled Protocols dialog for Qt
+    Convert the MTP3 stats to new "generic stat API".
     
-    This dialog combines the "protocols" and heuristic dissectors (from GTK) into a single tree view where heuristic dissectors are children of their protocol.
+    Convert both the MTP3 statistics and summary. As with the GSM stats this
+    is mostly untested.
     
-    Change-Id: I107656afd079c1d1c8a98161b736e4b4ad84f813
-    Reviewed-on: https://code.wireshark.org/review/9739
+    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 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 bf3e117
+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>
+
+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
+    
+    The close callback was never called because the destructor was never called.
+    
+    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 Jul 15 14:16:00 2015 +0200
+Date:   Wed Aug 12 20:58:52 2015 +0200
 
-    HTTP2: Update to libnghttp2 1.1.2
+    NGHTTP2: Update to 1.3.0
     
-    Update also the documentation after last change
-    Change-Id: Ie93e669b07c7a0c2b8febabe92c8503296b36998
-    Reviewed-on: https://code.wireshark.org/review/9746
+    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: Michael Mann <mmann78@netscape.net>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 4d6ef27
+commit 026812c
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 22 20:20:29 2015 -0700
+Date:   Mon Aug 31 08:37:15 2015 -0700
 
-    Qt < 5.1 doesn't have devicePixelRatio().
+    Redraw timestamps when time display settings change.
     
-    Change-Id: I490617db6b645c0129c565eb4b6efceeece9d535
-    Reviewed-on: https://code.wireshark.org/review/9751
+    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.
+    
+    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 780c300
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jul 10 14:52:34 2015 +0200
+commit 75b8457
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 31 09:24:49 2015 -0700
 
-    qt_ui_utils.h: fix empty paragraph passed to '@return' command [-Wdocumentation]
+    Add a Telephony→SCTP submenu.
     
-    Try 2...
+    Add the current SCTP actions to the telephony menu to match the GTK+ UI.
     
-    Change-Id: I2809a46a60732cdef26da9e847588dcfe39781ee
-    Reviewed-on: https://code.wireshark.org/review/9590
-    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: Ie7471bcbd1a82fe3f203d60f5ea8a72d923f34b9
+    Reviewed-on: https://code.wireshark.org/review/10332
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1514fe0
+commit 3bec655
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 22 10:28:04 2015 -0700
+Date:   Fri Aug 28 16:46:17 2015 -0700
 
-    Show the current selection in the overlay scrollbar.
+    Redraw the packet list when name resolution changes.
+    
+    Call columnsChanged (which invalidates cached column strings) when we
+    change our name resolution preferences from the View menu.
     
-    Change-Id: Ie92b7ae170938eac71ede751d9067e1d47293092
-    Reviewed-on: https://code.wireshark.org/review/9750
+    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: Gerald Combs <gerald@wireshark.org>
 
-commit 093aef0
+commit a060183
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Aug 28 22:41:07 2015 -0400
+
+    Eliminate proto_tree_add_text from packet-rtps.c
+    
+    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 053f53c
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Mon Aug 31 06:00:28 2015 +0400
+
+    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: I0a72a9a3e40cf8269856fbbcd97b270af422afa2
+    Reviewed-on: https://code.wireshark.org/review/10322
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+
+commit f0b4e8e
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 30 20:31:35 2015 +0200
+
+    dlsw: don't THROW() an exception from a dissector
+    
+    Change-Id: I897202e7fb2987f608ca4f98aa1a1dc4b7dbd995
+    Reviewed-on: https://code.wireshark.org/review/10320
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit 81c6ecd
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 30 20:08:53 2015 +0200
+
+    dlsw: remove unnecessary if (tree) checks
+    
+    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 78007fa
 Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Wed Jul 22 17:51:34 2015 -0400
+Date:   Sun Aug 30 10:16:16 2015 -0400
 
-    RTSP: allow RTP heuristic dissection of RTSP interleaved channel data
+    Add debug printing to tshark
     
-    Allow the RTP dissector to register a heuristic to dissect RTSP interleaved
-    data content, in case RTSP didn't know what the data is - for example
-    it missed the RTSP message indicating the Transport info was RTP.
+    Add g_warning functions for tshark debug printing, disabled by default.
     
-    Change-Id: I7a6ea886e6744d51533aa916974572fff41eb144
-    Reviewed-on: https://code.wireshark.org/review/9749
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: If1720b790b75bd1228afa62efac49dc04bc8addb
+    Reviewed-on: https://code.wireshark.org/review/10314
     Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 2c80810
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jul 22 22:53:59 2015 +0200
+commit 00087b4
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 29 22:28:01 2015 +0200
 
-    WCCP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
-    
-    Dead Store include on g38c05061b
+    Add Lua 5.2.3 built with MSVC2015
     
-    Change-Id: Ib29edea664ac6563c0eb9dc21dae168a8cfe6cd6
-    Reviewed-on: https://code.wireshark.org/review/9748
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I9b173f5136f858e4f95fb5b0688ef02c08a8d9e4
+    Reviewed-on: https://code.wireshark.org/review/10313
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1701b99
+commit 99e16ce
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 22 10:28:20 2015 -0700
+Date:   Sun Aug 30 08:10:04 2015 -0700
 
-    Update the AUTHORS entry for David Eisner.
+    [Automatic update for 2015-08-30]
     
-    Update David Eisner's email address at his request.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I7886c68bd54790176b39613d876465e04d767059
-    Reviewed-on: https://code.wireshark.org/review/9747
+    Change-Id: I37400bf1fac15fcd5f2946913b96184b1828f091
+    Reviewed-on: https://code.wireshark.org/review/10317
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 3f0f49d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 21 23:59:18 2015 +0200
+commit faaa6f2
+Author: Pyeole <pyeole@ncsu.edu>
+Date:   Sat Aug 29 15:36:41 2015 -0400
 
-    Use pinfo pool and not packet pool for AT_STRINGZ addresses
+    BGP: fixed incorrect NLRI decoding
     
-    Change-Id: I474e6554b352147702eac32d5574f8ab4a1ab84d
-    Reviewed-on: https://code.wireshark.org/review/9745
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Bug: 11308
+    Change-Id: I967b9596edad1e3656e139d0ca3a0e3c389d80ea
+    Reviewed-on: https://code.wireshark.org/review/10308
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 120ed14
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jul 17 10:53:48 2015 -0400
+commit e0a87d8
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 27 18:01:27 2015 +0200
 
-    Add documentation for new enable/disable protocol and heuristic dissector options.
+    stanag4607: add check for wtap max size.
     
-    Change-Id: Ia31326105cf559c2196d45369270552fb78da6c7
-    Reviewed-on: https://code.wireshark.org/review/9692
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    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 6452caa
+commit 6c06578
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jul 17 17:01:27 2015 +0200
+Date:   Sat Aug 29 22:54:54 2015 +0200
 
-    Fix retrieval of data link type supported by remote interfaces with authentication
-    
-    Make use of -A parameter when querying data link types supported by a given interface with dumpcap.
-    Ensure to pass the authentication parameters configured for a remote interface when calling capture_get_if_capabilities()
+    CBOR: fix definition of cbor.type.tag64 field
     
-    Bug: 11366
-    Change-Id: I4efea615084a82108e4a12a64e8c46817f30a5c6
-    Reviewed-on: https://code.wireshark.org/review/9690
+    Bug: 11486
+    Change-Id: I070c8c397a41c0c8231720c611938d7282c03d19
+    Reviewed-on: https://code.wireshark.org/review/10310
     Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 32d9a1d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 21 23:46:03 2015 +0200
+commit 7791c6f
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 19:14:13 2015 -0400
 
-    Ensure to copy the (un)resolved (source|destination) address columns before freeing epan memory
+    pcapng: drop count is unknown for ISB without isb_if_drop option
     
-    Otherwise addresses like AT_STRINGZ using pinfo->pool are using an already freed memory block
-    
-    Bug: 11387
-    Change-Id: I615d6bf202d57a949e75ba06a39f8d3e464def2f
-    Reviewed-on: https://code.wireshark.org/review/9744
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@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: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 83dc308
-Author: Luke Mewburn <luke@mewburn.net>
-Date:   Sun Jul 19 17:31:46 2015 +1000
+commit 605f33c
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 14:16:52 2015 -0400
 
-    PCLI: Expand protocol support
-    
-    1. Implement "Decode As" for PCLI payload instead of assuming IP.
-       Currently supported subdissectors are Ethernet and IP.
-    
-    2. Implement multiple "flavors" of PCLI with different header formats:
-            pcli: 4 byte CCCID
-            pcli8: 8 byte header (including CCCID)
-            pcli12: 4 byte CCCID, 8 byte NTP timestamp
-            pcli20: 4 byte CCCID, 8 byte NTP timestamp, 8 byte case ID
-       All flavors currently using "Decode As" for payload.
-    
-    3. Optionally append CCCID to protocol item in tree
-       using preference "pcli.summary_in_tree".
-    
-    4. Obsolete preference "pcli.udp_port".
+    pcapng: handle NRB with options
     
-    Bug: 9266
-    Bug: 11220
+    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.
     
-    Change-Id: Ie4bca06665985ef1eb77db767771a5a82357e242
-    Reviewed-on: https://code.wireshark.org/review/8608
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 6e7f302
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jul 21 21:49:58 2015 +0200
+commit eacaa1a
+Author: Kevin Bracey <kevin.bracey@arm.com>
+Date:   Wed Jul 22 15:36:07 2015 +0300
 
-    Translation (Qt): fix typo
+    6LoWPAN: IPv6 Fragment Headers don't have a Length field
     
-    Duplicate names and also typo about service (=> Services)
+    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.
     
-    Found by yfdyh000 via Transifex
-    
-    Change-Id: I011b98a25828b8fc55b395d7ed5677da51a30f43
-    Reviewed-on: https://code.wireshark.org/review/9741
+    Bug: 11368
+    Change-Id: I28fcd66d96f58a5959bb669caf4244afaca9e67e
+    Reviewed-on: https://code.wireshark.org/review/10231
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit e30a0ff
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jul 21 09:51:12 2015 -0700
+commit 8ddd480
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 10:30:15 2015 -0400
 
-    Add manual name address resolution.
+    pcapng: do not byte-swap NRB IPv4 address
     
-    Make it an editor frame instead of a dialog similar to the column editor
-    and prototocol preference editor.
+    Per the spec, it's always encoded in network order (4 separate bytes), and
+    thus should not be swapped on read.
     
-    Change-Id: If1a0cdf02dcab0eca98e8d39c94a3c2fe236df5a
-    Reviewed-on: https://code.wireshark.org/review/9743
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    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: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit e8f24f3
-Author: Hauke Mehrtens <hauke@hauke-m.de>
-Date:   Tue Jul 14 23:43:06 2015 +0200
+commit 9158176
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 10:00:02 2015 -0400
 
-    coap: fix decoding of observe extension
+    pcapng: make SPB cap_len the same as packet_len if IDB snaplen is 0
     
-    The observe draft changed and now the option value does not contain the
-    lifetime anymore, but the value encodes if a user wants to register or
-    deregister.
+    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: I3719101c2bed87c956eb24056be40c9a79dafac8
-    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-    Reviewed-on: https://code.wireshark.org/review/9638
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit bd62adb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 21 13:42:43 2015 -0700
+commit 0badc8c
+Author: Jim Young <jyoung@gsu.edu>
+Date:   Fri Jul 10 01:50:19 2015 -0400
 
-    Update symbols.
+    Insure Qt Capture preferences dialog displays default capture device (if any)
     
-    Change-Id: I92fc9ff73278656c717434c23560127c9c59eb06
-    Reviewed-on: https://code.wireshark.org/review/9742
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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.
+    
+    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 868cd67
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 21 12:37:11 2015 -0700
+commit 51e77b6
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Aug 28 15:53:42 2015 +0200
 
-    Do all the work of registering an ONC RPC-based protocol in rpc_init_prog().
+    CBOR: fix no previous prototype for proto_reg*_cbor [-Wmissing-prototypes]
     
-    Hand it a table of version/procedure table/hf-for-program-number
-    triplets.
-    
-    Change-Id: I2acc03c2da83353165bd422d8537362201c814e2
-    Reviewed-on: https://code.wireshark.org/review/9740
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 f38d976
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jul 21 08:49:39 2015 -0700
+commit 4ebf5b8
+Author: Jeffrey Smith <whydoubt@gmail.com>
+Date:   Fri Aug 28 17:28:31 2015 -0500
 
-    Be more careful about variable scope and quoting.
+    bootp/dhcp: fix Alcatel suboption detection bug
     
-    Change-Id: Ica226178cb43b82a87441fe11e8c2093e01db8a5
-    Reviewed-on: https://code.wireshark.org/review/9738
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I4a4222f3f30bf8e996770295756dd206b5ce101b
+    Reviewed-on: https://code.wireshark.org/review/10297
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 573b33a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 21 17:05:53 2015 +0200
+commit e80bd2e
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 28 19:45:28 2015 +0200
 
-    LTE RRC: fix a typo
-    
-    Let's have consistent naming for dissectors
+    Added Reload Lua plugins to the release notes.
     
-    Change-Id: I03d14e208692f39a7ae5017bd539f38f14abaa1f
-    Reviewed-on: https://code.wireshark.org/review/9737
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I2ea50b331322e0bc66bf5f3b48d9c2e78bbdd1e5
+    Reviewed-on: https://code.wireshark.org/review/10285
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 3e29fc5
-Author: Robert Beardsworth <rob_beardsworth@hotmail.com>
-Date:   Mon Jul 20 23:16:38 2015 +0200
+commit e18e400
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 15:49:22 2015 -0700
 
-    MQ: fix dissection of Work Information Header Reserved field
+    Fix a GHashTable assertion in DecodeAsDialog.
     
-    Bug: 11384
-    Change-Id: If8c2010b38f65b8ee8569e2d2eee1554d6fdee9c
-    Reviewed-on: https://code.wireshark.org/review/9724
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Make sure we don't call g_hash_table_removed from g_hash_table_foreach,
+    which generates an assertion error.
+    
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 70d1c72
+commit 1663224
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 20 22:05:09 2015 -0700
+Date:   Fri Aug 28 16:31:33 2015 -0700
 
-    Don't make dummy RPC program entries.
+    Block sizes are unsigned 32-bit quantities; don't stuff them into an int.
     
-    Just hand the payload off to the data dissector.
+    *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: I59a61ec6352ef0b0c51382d68ca23b00010eb723
-    Reviewed-on: https://code.wireshark.org/review/9733
+    Change-Id: I4d0a6b36fe50df84925690ad688a3ab0433ceb17
+    Reviewed-on: https://code.wireshark.org/review/10299
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 8e4ae94
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 20 15:40:35 2015 -0700
+commit 15c9923
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 28 23:30:30 2015 +0200
 
-    show_timer_ isn't used on OS X with Qt < 5.0.0.
+    Qt: Fix use-after-free pattern
     
-    Change-Id: I5b7a73dcc3bb0f11d24b6d1e9e9d2bcd1f333278
-    Reviewed-on: https://code.wireshark.org/review/9728
+    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 127a9bd
+commit 579365e
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jul 20 14:31:11 2015 -0700
+Date:   Fri Aug 28 14:03:34 2015 -0700
 
-    Add a ProgressFrame to the RTP analysis dialog.
+    Disable most of the main window while we're tapping.
+    
+    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.
     
-    Use it to show save file progress.
+    Note that we will probably want to disable more of the main window and
+    do so in other parts of the code.
     
-    Change-Id: Iff95b122825006352dc13cf4b7787e29b0d2c5f0
-    Reviewed-on: https://code.wireshark.org/review/9725
+    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 e48ab48
+commit 4d71ae7
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 20 15:19:50 2015 -0700
+Date:   Fri Aug 28 15:54:53 2015 -0700
 
-    Allow EUI-64s to be specified as numbers or byte strings.
+    Have separate variables for read and write errors.
     
-    They are, after all, really byte strings, just as MAC-48s/EUI-48s are.
+    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.
     
-    Clean up some of the integer <-> byte-string trickery a bit, using
-    unions rather than pointer punning.
-    
-    Bug: 11380
-    Change-Id: I0d9aa3ca7bb6b7e4c75e49a11b13d3d0e5a04473
-    Reviewed-on: https://code.wireshark.org/review/9727
+    Change-Id: Idb79822d30989b2529433878798c577a76eacca7
+    Reviewed-on: https://code.wireshark.org/review/10295
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1e48766
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Feb 18 13:30:06 2015 +0100
-
-    Qt: Add option to back white line separator for packet list items
-    
-    This uses one line (on bottom) of items and makes it white.
-    Seen in Wireshark on some configurations of GTK 2 on Linux,
-    so backports it to Qt for people who like it.
-    
-    In my opinion it helps if you use packet list background colors
-    for frames and you have a lot of following frames with
-    the same background color.
-    
-    Bug: 10954
-    Change-Id: Id8f58520d7224db4eb8181bcc04febd7416a8578
-    Reviewed-on: https://code.wireshark.org/review/7293
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-
-commit 7e13cac
+commit aa100e0
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jul 20 13:07:26 2015 -0700
+Date:   Fri Aug 28 12:57:57 2015 -0700
 
-    Try to minimize sorting overhead.
+    Don't show a progress frame if our file was closed.
     
-    Process application events as little as possible while sorting.
-    
-    Change-Id: I9d779aebf6edaafc1e6af3a99b4a0dac682ea6b6
-    Reviewed-on: https://code.wireshark.org/review/9722
+    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 63edb99
+commit c1c6132
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jul 17 15:06:55 2015 -0700
+Date:   Fri Aug 28 12:28:24 2015 -0700
 
-    Add general a busy progress indicator.
-    
-    Rename CaptureFileProgressFrame to ProgressFrame. It's not limited to
-    capture files. Add "busy" routines there and in MainStatusBar. Show a
-    busy indicator while sorting columns.
+    Don't dissect twice from TapParameterDialog.
     
-    Use toByteArray().constData instead of .data. I'm not sure if it matters
-    in our case but it's more correct.
+    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: Ibe35fee9b9dd3fabb5ff8ddcc21f6bf59dec4af6
-    Reviewed-on: https://code.wireshark.org/review/9720
+    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 eb1ccbd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 20 19:03:59 2015 +0200
+commit d767186
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 28 12:49:18 2015 -0700
 
-    Protect dissector_get_(default_)string_handle() against NULL input string
+    Get rid of trailing blanks.
     
-    Bug: 11381
-    Change-Id: Ib102a23b3d840144757ce692312ff13009c5c95e
-    Reviewed-on: https://code.wireshark.org/review/9717
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I0b705c924464dcc4987ed0e7c67b106b2b648dce
+    Reviewed-on: https://code.wireshark.org/review/10289
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 54812f2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 20 20:03:30 2015 +0200
+commit da266af
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 28 12:46:11 2015 -0700
 
-    MAC LTE: indicate explicitly that UL LCID 11 is used for Category 0 devices
+    Don't check the radio information when testing for an HT Control header.
     
-    Change-Id: Ia9a046c8aebdefad0303bed995c19f5408e4460b
-    Reviewed-on: https://code.wireshark.org/review/9719
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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.
+    
+    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 170def9
+commit 42570f9
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 20 10:02:08 2015 -0700
+Date:   Fri Aug 28 12:05:20 2015 -0700
 
-    Fix escaping of strings in UATs.
+    Clean up scanning to guess the bitrate of an MPEG-2 Transport Stream file.
     
-    Not only must characters that aren't printable ASCII characters be
-    escaped, backslashes must be escaped (as backslash is an escape
-    introducer) and double-quotes must be escaped (as double-quotes
-    encapsulate strings).
+    Don't treat an EOF at the beginning of a frame as an error.
     
-    When constructing a string to hand to uat_load_str(), escape pathnames,
-    as they are likely to contain backslashes on Windows, could contain
-    backslashes on UN*X, and could contain quotes on UN*X and possibly
-    Windows.  (Arguably, we should escape all the string arguments
+    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: 11372
-    Change-Id: I594840327fa41895130903c3c612ba97d6c29df3
-    Reviewed-on: https://code.wireshark.org/review/9716
+    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 09ae055
+commit c04d54f
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 20 13:24:58 2015 +0200
+Date:   Thu Aug 27 23:35:58 2015 +0200
 
-    GTPv2: always set direction before dissecting PCO IE
+    Preparation Host Flows: make ICMP(v6) code and type retrieval more robust
     
-    Otherwise some protocol/container ID payload are skipped as their decoding depends on the direction that is unknown
-    Bug: 11378
+    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: Ic14aa67fe4f262a9f3056e8f70f58afd78c59043
-    Reviewed-on: https://code.wireshark.org/review/9710
+    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 030da2a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Jul 17 19:24:04 2015 +0200
+commit 5179406
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 09:50:26 2015 -0700
 
-    coverity 1250812: fix a (very unlikely) integer overflow
+    Update the release notes.
     
-    Change-Id: I151cb2186c7dabbab1bef5cd35dabe19a3600dfd
-    Reviewed-on: https://code.wireshark.org/review/9703
-    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>
+    Change-Id: I7fb0d307355320a77f011b59c71d1d54066b7d08
+    Reviewed-on: https://code.wireshark.org/review/10284
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 21b99e3
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jul 19 19:50:39 2015 +0200
+commit a7f22aa
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jul 27 17:00:18 2015 +0200
 
-    Remove functions that got reintroduced by error in g21e5a95
+    ISAKMP: Add new CHACHA20/POLY1305 Transform Types Values (RFC7634)
     
-    Change-Id: I5e5956727641be3e377109dd032da76f6b21c481
-    Reviewed-on: https://code.wireshark.org/review/9707
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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 19b2848
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Jul 19 13:06:37 2015 -0700
+commit f19a173
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 17:14:39 2015 -0700
 
-    Fixup make-usb.py
+    Speed up column sorting.
     
-    SourceForge (which is where the Linux USB project is hosted) is
-    currently under maintenance. As a result this morning's update-numbers
-    run clobbered usb.c. Add a minimum vendor and product count check to
-    make-usb.py.
+    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.
     
-    Change-Id: Ia18bcd9c0eb365bd97b735795e9ad39cd85093a8
-    Reviewed-on: https://code.wireshark.org/review/9706
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 0809a4e
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Jul 19 21:57:20 2015 +0200
-
-    Looks like automatic update 0907a6ebb824c1d9d0eaf34940627e0d4d940e7b
-    didn't work as expected for epan/dissectors/usb.c
-    Revert that file for now.
+    Don't colorize packets when sorting in the Qt UI unless it's necessary.
     
-    Change-Id: I7ebbc860e2e4a93f086fc3e53138f3272814d5f0
-    Reviewed-on: https://code.wireshark.org/review/9705
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 0907a6e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jul 19 08:09:55 2015 -0700
-
-    [Automatic update for 2015-07-19]
+    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.
     
-    Update manuf, services enterprise-numbers, translations, and other items.
+    Use a pre-allocated and pre-compiled GRexex when we prime columns. Note
+    that we probably shouldn't parse a regular expression there.
     
-    Change-Id: I43c44e68e802ed2ab595714ecaf072d941c852ad
-    Reviewed-on: https://code.wireshark.org/review/9701
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 26c95e8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 18 23:24:53 2015 -0700
-
-    Get rid of trailing whitespace.
+    Cache the last result of proto_registrar_get_byname.
     
-    Change-Id: Ifd39e84284be5701c67173da09be12266ef93e25
-    Reviewed-on: https://code.wireshark.org/review/9700
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 7e817ae
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 18 23:23:32 2015 -0700
+commit 01fb470
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 12:48:56 2015 -0700
 
-    Require dissectors for all ONC RPC calls and replies.
+    More retapping fixups.
     
-    Either there's a known body for the call or reply, in which case we
-    already have a dissector for it, or the body is empty, in which case we
-    now have dissect_rpc_void() to dissect it, or the body is unknown or
-    nobody's bothered writing it, in which case we use dissect_rpc_unknown()
-    for now.
+    Disable the main file close and reload actions while we're retapping,
+    otherwise many of our dialogs will crash.
     
-    This means that an attempt to look up the dissector for a known
-    procedure will always succeed, so we can label it with the name rather
-    than with "proc-N".
+    Disable the TapParameterDialog filter entry while we're retapping. This
+    keeps us from enabling the "Apply" button when we shouldn't.
     
-    It also means that we distinguish between "it's void" and "it's
-    unknown", so that unknown values will get flagged as such.
+    Don't prematurely disconnect our signals in WiresharkDialog.
     
-    Change-Id: I748580c1dca61d1f0972396db1a3b0885fc0a541
-    Reviewed-on: https://code.wireshark.org/review/9699
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 75d4fa2
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sat Jul 18 14:45:50 2015 -0400
+commit 30c2f23
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Aug 25 20:58:09 2015 -0400
 
-    Cleanup pcapng.c file
-    
-    Cleanup some pcapng.c comments, defines, etc.
+    Eliminate proto_tree_add_text from some dissectors.
     
-    Change-Id: Id854c6ef033eb8cb99175ba62aa8733e21433463
-    Reviewed-on: https://code.wireshark.org/review/9698
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit eea54a0
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sat Jul 18 07:54:16 2015 +0200
+commit 2ed634d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 15:00:39 2015 +0200
 
-    Enable decryption by default
+    Support BER files bigger than 256kB
     
-    Change-Id: Ife299ec6b56e6a158ed76413d7f2a8e760824a01
-    Reviewed-on: https://code.wireshark.org/review/9696
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Also support APPLICATION as starting tag.
+    
+    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: 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 5b9d61f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 14:38:32 2015 -0700
+commit 6151946
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 14:51:50 2015 +0200
 
-    Remove the debugging output; it's now attached to the bug.
+    Qt: Fixed some memory leakages
     
-    Change-Id: I6a9252d2841fc44c6fdb6bd27517d60570afbae0
-    Reviewed-on: https://code.wireshark.org/review/9695
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit ecd3017
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 13:16:29 2015 -0700
+commit efba977
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 15:18:51 2015 +0200
 
-    In the p < q test, first run tshark -V, to see the full dissection.
+    Qt: Fixed some memory leakages
     
-    Change-Id: I7d82d34369d192e7da7d554f44f448e1613f850f
-    Reviewed-on: https://code.wireshark.org/review/9694
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 354f8e3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 11:40:42 2015 -0700
+commit 8384a5b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 20:18:46 2015 +0200
 
-    Dump the output of tshark in the p < q decryption test.
+    Qt: Fixed some memory leakages
     
-    See what it prints on Windows.
+    And changed strdup -> g_strdup
     
-    Change-Id: Id35d87595543eca3e5b5d80dbe9a7639e0a85994
-    Reviewed-on: https://code.wireshark.org/review/9693
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I62de106462259194738d633f16297eb1210f8ccf
+    Reviewed-on: https://code.wireshark.org/review/10259
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 5038efd
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Jul 17 15:06:18 2015 +0200
+commit 2e1fa63
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 26 10:32:52 2015 +0200
 
-    ssl-utils: do not check for empty keylog filenames
+    Lemon grammar: fix indent (use tabs)
     
-    If ssl.keylog_file is not configured, an empty string is set. In that
-    case, do not attempt to open the keylog file.
-    
-    Change-Id: I2ba4b9dbc7cfb5009d2623c49a129e98734df80f
-    Reviewed-on: https://code.wireshark.org/review/9688
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 38c0506
+commit 0af048b
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 15 16:02:51 2015 -0400
+Date:   Tue Aug 25 19:14:59 2015 -0400
 
-    WCCP - remove global variable used to store address information for computation later.
+    Remove calls of tvb_ensure_length_remaining.
+    
+    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
     
-    Change-Id: I06841ec77cf9f34914b9dfe10b8cd35824b32b71
-    Reviewed-on: https://code.wireshark.org/review/9647
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 21e5a95
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 12 20:40:31 2015 -0400
+commit 374439d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 11:24:29 2015 -0700
 
-    Remove all preferences related to enabling/disabling heuristic dissectors.
+    Don't emit app signals from dialogs.
     
-    The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector.
+    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.
     
-    Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled.
+    Fix the "Enabled Protocols" action name while we're here.
     
-    Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22
-    Reviewed-on: https://code.wireshark.org/review/9610
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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 5bd6c4a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jul 15 14:33:56 2015 +0200
+commit 8ad5611
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Aug 26 22:52:06 2015 +0200
 
-    STUN: Add missing error codes
+    sv: remove some unnecessary checks
     
-    Bug:11350
-    Change-Id: I8876f7b088229b7b60b2e5d81b70e2e762cad044
-    Reviewed-on: https://code.wireshark.org/review/9644
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    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
+    
+    correct a typo while at it
+    
+    Change-Id: I09a315fc2c70161af527dca5661f877e09b63ff6
+    Reviewed-on: https://code.wireshark.org/review/10273
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit cbdd102
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jul 17 18:01:27 2015 +0200
+commit 7b35992
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 22:12:17 2015 +0200
 
-    Pacify Windows buildbots
+    Reload IO Graph Y fields when reload Lua plugins
     
-    Change-Id: I6e1db78ca42d7995e0309dd5d43e2abaf1e3b55e
-    Reviewed-on: https://code.wireshark.org/review/9691
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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 3faec79
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jun 8 19:38:48 2015 +0200
+commit bc4487a
+Author: Jeffrey Smith <whydoubt@gmail.com>
+Date:   Tue Aug 25 18:40:45 2015 -0500
 
-    Qt/Bluetooth: Add HCI Summary dialogue
+    bootp/dhcp: tighten check for Alcatel extensions
+    
+    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.
     
-    HCI Summary dialogue collect HCI Opcodes, HCI Events, Hardware Errors,
-    Statuses and Reasons. Also show occurrence of them. The top level item
-    is group of items (by OGF or types), the second level item is in real
-    command, event, hardware error, status or reason. The third level items
-    are direct link to packet that contains second level item type.
+    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: I6b6bd02533c4605a2dd2c1f5dfee46f72a0f3fdc
-    Reviewed-on: https://code.wireshark.org/review/9676
+    Change-Id: Ie4188ff900426c2d80a5694fbba5c88385625a61
+    Reviewed-on: https://code.wireshark.org/review/10267
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 6514dec
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 16 21:54:38 2015 -0400
+commit e1c807c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 08:41:50 2015 -0700
 
-    Add preference for disabling 'packet size limited during capture' message in Info column.
+    Add missing callback support.
     
-    Bug: 9827
-    Change-Id: I8fdba4827b164bd231981bfdd2e1bd0499f4f87c
-    Reviewed-on: https://code.wireshark.org/review/9669
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    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>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b1eaf29
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 15 17:11:36 2015 -0400
+commit e234ce8
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 24 12:30:56 2015 -0700
 
-    WCCP - Only populate address table once and presume first address table type is the one that should populate it.
+    Rework tapping in Qt dialogs.
     
-    Ping-Bug: 11358
-    Change-Id: Ieed093b4aa263026772450f95dd5fa18280f9b76
-    Reviewed-on: https://code.wireshark.org/review/9648
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ad82dfd
-Author: Jim Young <jyoung@gsu.edu>
-Date:   Tue Jul 14 00:28:49 2015 -0400
-
-    Add new long options to GUIs to allow arbitrary protocols and heuristics to be disabled via command-line
+    Add cf_cb_file_retap_started and cf_cb_file_retap_finished to file.[ch].
+    Add their associated signals to CaptureFile.
     
-    Future: Allow multiple protocols to be disabled in one option statement
-    (perhaps using a comma or colon delmited set of names in <proto_name>)
-    instead of having to specify --disable-protocol <proto_name> multiple times.
+    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: I9b8f960acf75298ebb098d9b667fca49dca52306
-    Reviewed-on: https://code.wireshark.org/review/9631
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 9d24a26
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 04:16:47 2015 -0700
+commit f7e9a79
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 24 12:33:49 2015 -0700
 
-    Don't register in a non-existent dissector table.
+    Add per-dialog progress frames.
     
-    There's no "btrfcomm.channel" dissector table any more; there's a
-    "btrfcomm.dlci" table.
+    Add ProgressFame::addToButtonBox, which violates the UX guidelines on
+    every platform we support by inserting a ProgressFrame into a
+    QDialogButtonBox.
     
-    Change-Id: Ia7cdf45c04b6b116a67ef4b7dfdce509cdb15327
-    Reviewed-on: https://code.wireshark.org/review/9684
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 477b49e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 16 22:18:01 2015 -0400
-
-    The pflog spec appears to have some host-endian field values.  Since we don't know the platform the host could be, setup preference to decode fields as big or little endian.
+    Call addToButtonBox in the constructors of a bunch of dialogs.
     
-    Bug: 10202
-    Change-Id: Ic550d75a853eca7abd162241b8426ab196ba0d12
-    Reviewed-on: https://code.wireshark.org/review/9671
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit d1fcb7d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 02:01:22 2015 -0700
+commit 8b4ff24
+Author: tkc <chaitanya.mgit@gmail.com>
+Date:   Tue Aug 25 16:58:43 2015 +0530
 
-    Report an error if we fail to open the keylog file.
+    ieee80211: Qos Control bit4 handling: Make the default case as EOSP, to handle TDLS Packets.
     
-    That way, we don't just silently fail.
+    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.
     
-    Change-Id: I924f4387f6efdc342f6b02ed29796802567c1884
-    Reviewed-on: https://code.wireshark.org/review/9683
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 5a9e438
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Jul 15 17:15:54 2015 +0200
+commit 57b2b77
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Wed Aug 26 08:50:09 2015 +0400
 
-    Bluetooth: RFCOMM: Replace Decode by Channel by DLCI
+    cmake: rework version.h handling to treat it like config.h
     
-    Channel is not enough to decode streams over RFCOMM. DLCI is.
-    DLCI is Channel and Direction bit that can be used to recognize
-    which side RFCOMM service (channel) is - remote or local side.
-    Direction bit is first bit in DLCI so: DLCI = Channel < 1 | Direction.
+    It wasn't working on my system: I kept seeing the old git revision
+    in '...shark -v' even after deleting version.h
     
-    Change-Id: I56a641cfd2d4495d119f08ded1aab5cead458e17
-    Reviewed-on: https://code.wireshark.org/review/9679
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    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: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit dac7cf9
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jul 13 19:01:48 2015 +0200
+commit c18d2f8
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 15:16:29 2015 +0200
 
-    Bluetooth: Add generic UUID table for DecodeBy
+    Qt SCTP: Changed prohibited APIs
     
-    Replace L2CAP Service, RFCOMM Service and AVCTP PID dissector table
-    by shared Bluetooth Service UUID table. It also supports UUID16,
-    UUID32 and UUID128 by hex-string, like for AVRCP: "110e".
+    strcpy -> g_strlcpy
+    sprintf ->g_snprintf
     
-    Change-Id: I473bc73d10939e8ed6dd55a6a92387c7a1ec125a
-    Reviewed-on: https://code.wireshark.org/review/9678
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Also initialize some temp variables.
+    
+    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 5491fea
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Jul 15 15:24:50 2015 +0200
+commit bd21889
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 25 19:36:28 2015 +0200
 
-    Qt: Fix DecodeAs for String tables
-    
-    It seems that string object die to early. Add space when it can live.
+    Camel: fix indent (use 2 spaces)
     
-    Change-Id: I4e776134ce6782bd6e854ab2bc3c188e80530839
-    Reviewed-on: https://code.wireshark.org/review/9677
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I0e8047fca7f24e60e4db8ad77254bcff5f8d6651
+    Reviewed-on: https://code.wireshark.org/review/10257
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5a51b8b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 00:57:09 2015 -0700
+commit 6b41d2c
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 22 18:31:41 2015 +0100
 
-    Don't discard the echo command's output.
+    Do not treat all unknown IP protocols as unknown IPv6 extension headers
     
-    Change-Id: I957a0c1beeae4bbd8c32ed05f30525becaf37e95
-    Reviewed-on: https://code.wireshark.org/review/9682
-    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 520315f
+commit 5e45269
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 00:12:25 2015 -0700
+Date:   Tue Aug 25 16:56:37 2015 -0700
 
-    OK, that didn't do it - print the command again.
-    
-    Too bad DEC used / as an option character and Bell Labs chose it as a
-    pathname separator.
+    Explain why the MSDU length field in an A-MSDU is big-endian.
     
-    Change-Id: Ie58ba79476e0f24e408fae55f6c5eaff3ffb11fa
-    Reviewed-on: https://code.wireshark.org/review/9680
+    Change-Id: I4a1cfd09395860348d71e9f4c86b6343cfdcd02a
+    Reviewed-on: https://code.wireshark.org/review/10262
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 57520af
+commit 4fe661d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 16 21:41:50 2015 -0700
+Date:   Tue Aug 25 15:40:00 2015 -0700
 
-    Generate key paths as UN*X paths and then run them through cygpath.
+    Get subset TVBs correctly.
     
-    In the decryption_step_ssl_rsa_pq - and the
-    decryption_step_ssl_master_secret test - duplicate the code used to
-    generate TEST_KEYS_DIR, so that we construct a UN*X-style path and then,
-    if we're running on Windows, map the UN*X-style path, which is a Cygwin
-    path, to the equivalent Windows-style path, and pass that to TShark on
-    the command line.
+    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.
     
-    Bug: 11372
-    Change-Id: I442a30c4c954540a05942ed70ec3687941428a96
-    Reviewed-on: https://code.wireshark.org/review/9675
+    Change-Id: I86dde999f59fdfec58b118729b7b881737983033
+    Reviewed-on: https://code.wireshark.org/review/10260
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit f82df51
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 16 19:39:23 2015 -0700
+commit 0e952e6
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Aug 25 19:55:56 2015 +0200
 
-    Temporarily log the command that's failing.
+    SIGCOMP: fix sigcomp.copying_bytes_literally field
     
-    Trying to debug the problem.
-    
-    Change-Id: I26f78e49556cb1d40f0c8ddbfd58f058dceb0e77
-    Reviewed-on: https://code.wireshark.org/review/9674
-    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 eaf1aad
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jul 16 22:34:14 2015 -0400
+commit 8e55f68
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Mon Aug 24 04:34:06 2015 +0400
 
-    wmem: don't remove tiny blocks from the recycler
+    Remove gitversion.h
     
-    They were never put in it in the first place because they can't hold the
-    necessary pointers.
-    
-    Bug: 11373
-    Change-Id: I9e2ec76850929b5ac86e6f7a344d70f56ad3911c
-    Reviewed-on: https://code.wireshark.org/review/9672
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Id3144ecaf9289dbe53cd2f5d3e3de57e8de955f6
+    Reviewed-on: https://code.wireshark.org/review/10256
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 45812a5
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jul 16 23:16:19 2015 +0200
+commit 0c291f9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 24 22:30:46 2015 -0400
 
-    test: fix RSA decryption test under Windows
+    Eliminate proto_tree_add_text from packet-sigcomp.c
     
-    TEST_KEYS_DIR already contains a trailing slash. Windows does not like
-    forward slashes, so drop the additional slash to fix tests under
-    Windows.
+    Some other cleanup noted by the check* scripts.
     
-    Fixes: v1.99.8rc0-417-g85f8a99
-    Bug: 11372
-    Change-Id: Ief794977281b70549369c344a193f4d48bcc1776
-    Reviewed-on: https://code.wireshark.org/review/9668
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    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: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b99f10b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jul 16 23:06:36 2015 +0200
+commit 571f254
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 23 03:46:36 2015 +0100
 
-    ssl-utils: fix RSA keys with GnuTLS 2.12.23
+    Replace "IPv6 header length" with the more correct "payload length"
     
-    Apparently GnuTLS 2.12.23 as used on Ubuntu 14.04 produces different
-    outputs for the u parameter as observed in gdb. GnuTLS 3.4.2 on Arch
-    Linux works fine. Workaround this issue by unconditionally calculating
-    the inverse.
-    
-    Change-Id: I8406352f8c570b355ea774cafc903662d06888ac
-    Fixes: v1.99.8rc0-417-g85f8a99
-    Bug: 11371
-    Reviewed-on: https://code.wireshark.org/review/9666
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    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: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 255d53d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jun 11 15:53:51 2015 -0700
+commit cc15b11
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 24 10:29:18 2015 +0200
 
-    Draw packet colors in the packet list scrollbar.
-    
-    Inspired by (but not as fancy as) Packet Fence, an enhancement written
-    for Ethereal a loooong time ago by Martin Visser:
-    
-    https://www.wireshark.org/lists/ethereal-dev/200011/msg00122.html
+    Multicast Stream: Fix Dereference of null pointer found by Clang analyzer
     
-    Several text editors call this a "minimap".
-    
-    Color each scrollbar raster line to match the color of up to 7 packets.
-    Note in the comments why this number was chosen.
-    
-    If we have any flagged frames (marked, ignored, time ref) indicate them
-    on either side of the scrolbar.
-    
-    Handle HiDPI (retina) displays. This means that your window size depends
-    on the height of your scrollbar *and* your monitor resolution.
-    
-    Qt's idea of the slider rect doesn't match up with the slider on OS X.
-    This might be local to my build -- I can replicate it Qt Creator.
-    
-    Change-Id: Ia089d2d766ce37bab11e22d1a5721b4908935304
-    Reviewed-on: https://code.wireshark.org/review/8982
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I419f49132f8b0853c17b2fd1b4e9869ef3fafd13
+    Reviewed-on: https://code.wireshark.org/review/10224
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3e059c9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jul 16 23:16:00 2015 +0200
+commit 31bf40e
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 25 12:45:01 2015 +0200
 
-    SMB2: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    [Camel] The tags used in EstablishTemporaryConnectionArg differs in V2 and
+    V3 versions of Camel.
+    Add ASN1 code for EstablishTemporaryConnectionArgV2
     
-    Change-Id: Ic7d713e8593cd0841089f2c26d2c24f2f008cb31
-    Reviewed-on: https://code.wireshark.org/review/9667
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Bug: 11466
+    
+    Change-Id: I0dbb9c83e520c269dd567f3c3bc34c99c9aa5e15
+    Reviewed-on: https://code.wireshark.org/review/10249
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0d4f412
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Jul 16 22:58:32 2015 +0200
+commit 2af5783
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 23 21:34:21 2015 +0100
 
-    Get rid of _U_, which was (mis)used in some places:
-    - It was used even though the variable actually *was* in use for
-      some compile settings.
-    - It's not the c++ way.
+    Add more validity checks to the IPv6 dissector
     
-    2do: In case the definition of _U_ in Wireshark.pro is only used for
-      the ui/qt directory, it should be removed to avoid further (ab)use.
+    Check for IP version and header size
     
-    Change-Id: I22d6269a66d6ed558035aad3e6702c4a9c8af1fa
-    Reviewed-on: https://code.wireshark.org/review/9665
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    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 d23ff4f
+commit d5049ea
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 16 22:03:29 2015 +0200
+Date:   Sat Aug 22 20:08:31 2015 +0200
 
-    Qt: remove unused parameters
+    win32: add detection of Npcap to Windows installer
     
-    Change-Id: I45fcf87f99dc15eb49343119fa134fb5698b15cf
-    Reviewed-on: https://code.wireshark.org/review/9664
+    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: 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 0b11d5d
+commit e710f24
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 15 21:32:44 2015 +0200
+Date:   Mon Aug 24 11:21:29 2015 +0200
 
-    Win32: fix generation of NSIS installer when compiling with Qt 5.5
+    win32: update the list of NdisMedium and NdisPhysicalMedium defines used by GTK UI
     
-    *.qm files are now in a translations subfolder
+    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: I233152cd2662aec7072769e27f7a278c6890d8ec
-    Reviewed-on: https://code.wireshark.org/review/9646
+    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: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 41ed712
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 16 12:07:49 2015 -0700
+commit edeaae0
+Author: Richard Sharpe <rsharpe@samba.org>
+Date:   Mon Aug 24 07:39:44 2015 -0700
 
-    Qt: Frame flag updates.
-    
-    Move frame flag (mark, ignore, ref_time) member functions from
-    PacketList to PacketListModel. They arguably belong there and we can
-    emit dataChanged to signal updates.
+    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.
     
-    Rename some variables named "index" since they shadow a function name.
+    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: I9a731a76e4e63e562b561c29d13915278d5a7dbb
-    Reviewed-on: https://code.wireshark.org/review/9663
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    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 b1e0f43
+commit 4ba5225
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 16 11:48:06 2015 -0700
+Date:   Mon Aug 24 18:46:56 2015 -0700
 
-    One definition of the same typedef suffices.
+    Point to GitHub for the pcapng specification.
     
-    Change-Id: Ic221bf911f6de9bc94278350e0642143d14f6e82
-    Reviewed-on: https://code.wireshark.org/review/9662
+    Change-Id: I33faa41e8b0f36ee49d29fe391feafd94d0a7e80
+    Reviewed-on: https://code.wireshark.org/review/10245
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0801cd3
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 16 19:27:49 2015 +0200
+commit 662f4b2
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Aug 24 20:26:30 2015 -0400
 
-    DTLS: fix compilation without libgcrypt or libgnutls
+    Use one variable that was set but not previously used and delete another.
     
-    Change-Id: I571f1ddaaa9579af65d558afc7162493a7393703
-    Reviewed-on: https://code.wireshark.org/review/9661
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I6bd7a16e3ea97659a0007edfd9f90dbd2060e443
+    Reviewed-on: https://code.wireshark.org/review/10244
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 6fcfb5e
-Author: Richard Sharpe <rsharpe@samba.org>
-Date:   Sat Jul 4 10:09:58 2015 -0700
+commit b16cca4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Aug 24 15:13:59 2015 -0700
 
-    Add support to the SMB2 protocol for one of the proposals for POSIX Extensions
-    to the SMB2 protocol.
+    Some beamforming stuff from 802.11ac.
     
-    I am submitting this purely so that it is available for others to play with.
+    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: I379b9da90731cc61ce38a1fdf21dc7c09d0d114e
-    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/9496
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit da91443
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 16 17:08:31 2015 +0200
-
-    LTE RRC: fix dissection of ETWS/CMAS warning messages
-    
-    Change-Id: I20bb219a32b6c7e39ac415c5c13ad5379f78cba2
-    Reviewed-on: https://code.wireshark.org/review/9658
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@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 6d33c12
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 16 09:14:07 2015 -0700
+commit 1874793
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 22:59:21 2015 +0200
 
-    Add display_is_remote.
+    Remove unused signal
     
-    Add a display_is_remote function and use it instead of get_conn_cfilter
-    to check for remoteness.
-    
-    Change-Id: Ia93d113afec36ede55daf7dc8394b2dc0d8c9abf
-    Reviewed-on: https://code.wireshark.org/review/9659
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ic2d4057ee95849bc1b026663dae1430432ad9707
+    Reviewed-on: https://code.wireshark.org/review/10241
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 78bc3dd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 15 23:13:57 2015 +0200
+commit 99dab82
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 22:19:01 2015 +0200
 
-    GSM RLC/MAC: fix an infinite loop when analyzing (E)GPRS header
+    Use signal to close packet dialogs
     
-    Change-Id: Ibba32a2860f80979ee9df3caeeaeda14fde7e7d0
-    Ping-Bug: 11358
-    Reviewed-on: https://code.wireshark.org/review/9649
-    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: I312f8de8de933e576b60d2b158e4c4f2d1147ef1
+    Reviewed-on: https://code.wireshark.org/review/10238
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit d2acb04
+commit fbadcdd
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Feb 2 09:01:29 2015 -0800
+Date:   Mon Aug 24 10:56:04 2015 -0700
 
-    Add the RTP Stream Analysis dialog.
-    
-    Combine the GTK+ RTP Stream Analysis and RTP Graph Analysis dialogs into
-    one. Yell at the user less. Disable the Analyze RTP Stream menu item if
-    we don't have an RTP stream selected.
-    
-    There are a *lot* of moving parts in this dialog. I've tested with the
-    few RTP captures I have but it's by no means complete.
+    Add notes about using CMake + Qt Creator.
     
-    "To do" items are listed at the top of rtp_analysis.cpp.
-    
-    Change-Id: Id503977f069bebc46cc68bc749f0c9cbf4d37bf6
-    Reviewed-on: https://code.wireshark.org/review/9650
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: Ib10cc0a407721d62b39628af858f14e749c94d22
+    Reviewed-on: https://code.wireshark.org/review/10237
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 2e215db
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 15 23:46:51 2015 +0000
-
-    Revert "On OS X, add the Qt -Wl,-rpath hack in CMake, as we do with autotools."
-    
-    This reverts commit 4a39706272a59d43530e038f8b20436e2c3052ce.
-    
-    At least in one quick check, CMake 2.8.12.2 added that already with Qt 5.5.0.
-    
-    Change-Id: Iabf0e4aa0aa34b380f981f7d039fb3d95847041e
-    Reviewed-on: https://code.wireshark.org/review/9654
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5523726
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 15 18:04:02 2015 -0400
+commit 75d9167
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 24 10:21:55 2015 +0200
 
-    WaveAgent - Use tvb_get_guint8 instead of tvb_get_ptr to walk a packet and protect against a really big tag value
+    Multicast Statistics (Qt Dialog): Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Ping-Bug: 11358
-    Change-Id: I9ecb5fe6bcd7f25c763d968bf56fb2d9bce2180c
-    Reviewed-on: https://code.wireshark.org/review/9639
-    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: Ie2802293576bf9edb28bccf7d464b5e687185096
+    Reviewed-on: https://code.wireshark.org/review/10223
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 0744e67
+commit 7f60878
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 15 16:04:21 2015 -0700
+Date:   Mon Aug 24 09:01:09 2015 -0700
 
-    Check for a valid pointer when ignoring a frame.
+    Add FOP 2.0 to the search list.
     
-    Change-Id: I1a4a6b3f729c818a68bee1b6b8de3778130252a4
-    Reviewed-on: https://code.wireshark.org/review/9652
+    Change-Id: Ifc462a69e28b875f05770c453b06689c69008c52
+    Reviewed-on: https://code.wireshark.org/review/10235
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 4a39706
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 15 16:04:57 2015 -0700
+commit d7e3076
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 24 12:16:06 2015 +0100
 
-    On OS X, add the Qt -Wl,-rpath hack in CMake, as we do with autotools.
+    IPv6 RPL: "cmprI" should be "cumprE"
     
-    Change-Id: I281e1bf790b7eefbbd43a3406622262cfe8b36df
-    Reviewed-on: https://code.wireshark.org/review/9651
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 10560
+    Change-Id: I7cf9fb8ad39d128ed375abb8703937be8e3795b3
+    Reviewed-on: https://code.wireshark.org/review/10228
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 85f8a99
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jul 9 16:36:49 2015 +0200
+commit bc0d8d1
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 22 19:20:25 2015 +0100
 
-    ssl-utils: fix failing decryption for some RSA keys
-    
-    Reported at
-    https://ask.wireshark.org/questions/43788/struggling-to-decrypt-ssl
-    
-    "u" requirement is documented at
-    https://www.gnupg.org/documentation/manuals/gcrypt/RSA-key-parameters.html#RSA-key-parameters
+    Remove space from field description for consistency
     
-    Add regression test (key is generated manually with p and q swapped and
-    qInv recalculated).
-    
-    Change-Id: I5505ddcdb54bb47d7a58867b8c3e53fcc0f66dde
-    Reviewed-on: https://code.wireshark.org/review/9573
-    Tested-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: I74b0be1724d0754b7d1b724e177d44c4894d0e6b
+    Reviewed-on: https://code.wireshark.org/review/10198
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 79be831
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jul 9 15:48:09 2015 +0200
+commit a5b5c5a
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 23 18:44:31 2015 +0200
 
-    ssl-utils: remove unused, broken libgcrypt code
+    fc: don't THROW() an exception from a dissector
     
-    Remove unused SSL_FAST code. That approach cannot work in modern
-    libgcrypt anyway since the symbols were renamed and private to
-    libgcrypt. The RSA decryption routine is not even a hot path, it is only
-    called for decrypting the encrypted pre-master secret.
+    bring up an expert info and exit
     
-    While at it, expand the SSL_PRIVATE_KEY macro and remove its definition.
-    
-    Change-Id: Ied556d18501ea6cbac5fb27218364b3479ad62ce
-    Reviewed-on: https://code.wireshark.org/review/9572
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    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 c8c8eef
+commit 517f4d4
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Jul 13 09:47:21 2015 +0200
+Date:   Thu Aug 20 23:06:44 2015 +0200
 
-    zvt: handle multi-byte tags
+    cigi: don't THROW() an exception from a dissector
     
-    and dissect the components of a tag
-    add a global true-false string for constructed vs. primitive
+    stop the dissection instead and bring up an expert info in the main function
     
-    Change-Id: If10ecf97cde59e2be9ff5e3163073f6d14e6c61e
-    Reviewed-on: https://code.wireshark.org/review/9636
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    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 a41e8e6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 14 23:23:15 2015 +0200
+commit 7c0b8bd
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Aug 24 12:41:04 2015 +0200
 
-    Qt: fix detection of WinPcap / AirPcap
+    [Q.2931] Don't use BASE_EXT_STRING for a value_string, fixes the test
+    suite
     
-    Libraries must be loaded before calling get_runtime_version_info()
+    ** (process:10080): WARNING **: Invalid value_string_ext ptr for: q2931.atm_identifier
     
-    Change-Id: Ic95ccde4ce80338b058a22a653736b663c517b38
-    Reviewed-on: https://code.wireshark.org/review/9637
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Id4ec745629af7774e480e91fba01ed8da5aac1bd
+    Reviewed-on: https://code.wireshark.org/review/10227
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7977432
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 15 14:47:39 2015 +0200
+commit 079dd03
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 11:52:29 2015 +0200
 
-    Simply code for export of PDUs coming from heuristic dissectors
-    
-    Let's use the newly introduced find_heur_dissector_by_unique_short_name() function
+    Fixed typo in hfinfo_remove_from_gpa_name_map
     
-    Change-Id: I5781b9b2f1ab679da07e97755b71840b4b3a9361
-    Reviewed-on: https://code.wireshark.org/review/9645
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ic80fbe9397e50c41fa01ef9147319dd2ac0c0b91
+    Reviewed-on: https://code.wireshark.org/review/10226
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 52e2908
+commit a2d8514
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 15 12:17:00 2015 +0200
+Date:   Sun Aug 23 19:02:23 2015 +0200
 
-    Filter UDP packets on port 3389 when capturing from a Remote Desktop session
+    ip: fix ip.hdr_len filter value when the header length is too small
     
-    As reported in https://www.wireshark.org/lists/wireshark-dev/201507/msg00069.html
-    
-    Change-Id: I171b934fd97748f17586ffcee8012fd4c0d156b1
-    Reviewed-on: https://code.wireshark.org/review/9642
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 828358d
+commit bd553f6
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jul 14 21:34:29 2015 -0400
+Date:   Sat Aug 22 22:14:30 2015 -0400
 
-    Openflow - prevent infinite loop
+    Eliminate proto_tree_add_text from packet-q931.c and packet-q2931.c
     
-    Change-Id: I93ce7151467c890c12f7d612b5a7eecf5f91c189
-    Ping-Bug: 11358
-    Reviewed-on: https://code.wireshark.org/review/9640
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: 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 1ac7de5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 14 20:53:53 2015 -0700
+commit 7176958
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 22 22:59:42 2015 +0200
 
-    Resize the name column every time we re-display the interface tree.
+    Close packet dialogs when reload Lua plugins.
     
-    Interfaces can appear and disappear, changing the maximum length of the
-    interface name column; resize it each time we reconstruct the tree.
+    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.
     
-    Change-Id: I38b40f6c3ce51272e8bbb0c7f7fbaa7255886e0e
-    Reviewed-on: https://code.wireshark.org/review/9641
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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: 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 4f1b8d7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 14 11:50:08 2015 -0700
+commit 25ec198
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 21:39:12 2015 +0200
 
-    Add a bounds check.
+    Disable streamNumberSpinBox while reloading capture
     
-    AirPDcapStoreSa() was assuming that ctx->first_free_index would always
-    be within the ctx->sa array; nothing guarantees that.  Fail if it's past
-    the end of the array; that means there *are* no free indices.
+    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.
     
-    Change-Id: I73145ea3f3dda1b3800a41fa3a2b01ac344dcbfc
-    Reviewed-on: https://code.wireshark.org/review/9634
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 9230834
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 14 11:36:10 2015 -0700
+commit 47c9aa4
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 09:33:17 2015 +0100
 
-    Don't copy zero bytes of data.
+    Check if IPv6 payload length exceeds framing byte length
     
-    memcpy(NULL, NULL, 0) isn't guaranteed by ISO C90 to work, so don't do
-    it.  Check whether the length is zero, and don't copy if it is.  (If the
-    count is non-zero and the pointer is null, that's an error, and we
-    should fail there, so base the test on the length, not the pointer.)
-    
-    Change-Id: I0b3dc1541b52670d8fef459754c9494cfcc59e5d
-    Reviewed-on: https://code.wireshark.org/review/9633
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 11418
+    Change-Id: Icbb980fda4f7addf52db59bc4f2aa27fc8f85837
+    Reviewed-on: https://code.wireshark.org/review/10176
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit cdeae7e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 5 17:31:14 2015 -0400
+commit c6aeaad
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 22:50:58 2015 +0200
 
-    Add a "heuristic dissectors" tab to the Enable Protocols dialog.
+    Disable apply button while adding the filter
     
-    This allows for a global place to enable/disable all heuristic dissectors.  This removes the need for individual dissector preferences, but those will be removed at a later date.  The more important part is the epan code to save/restore the enabled state of the heuristic dissector.  The GTK dialog was more for quickly testing the feature (there was already some GTK code in place that started the heuristic dialog tab)
+    Pressing multiple apply while reloading the capture file will
+    give a crash.
     
-    Change-Id: Ie10687505c27a4456c49d5c4c69a5fc5f6394275
-    Ping-Bug:11152
-    Reviewed-on: https://code.wireshark.org/review/9508
-    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: I3587b9ab6b6b7f1437f3a7becb8c35277bb5c62c
+    Reviewed-on: https://code.wireshark.org/review/10161
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 1d708ce
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jul 13 00:32:57 2015 -0400
+commit 216f06b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sun Aug 23 20:11:06 2015 +0200
 
-    If the IP length says there no data following the IP layer, don't try to dissect the next layer.
+    Lua: Support deregister ProtoField with existing abbrev
     
-    Bug: 11354
-    Change-Id: I24a6f2b04e138902fb548ca500af35b18f08acdc
-    Reviewed-on: https://code.wireshark.org/review/9619
-    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: Icb06792bb2662dcee6e5495359ceef420a5b4498
+    Reviewed-on: https://code.wireshark.org/review/10212
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 2ebe879
+commit 984f87a
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 11 08:20:22 2015 -0400
+Date:   Thu Aug 20 06:16:22 2015 -0400
 
-    Correct eventlog.eventlog_OpenEventLogW.Module dissection by providing lsa_String type in .cnf
-    
-    There seem to be multiple definitions of an "lsa_String" depending on the DCE/RPC dissector, so change was made just in EventLog.
+    Eliminate proto_tree_add_text from some dissectors
     
-    Bug: 10264
-    Change-Id: I32e97c2a537b01d3bfe9dd03452b8ee1af4d1c2e
-    Reviewed-on: https://code.wireshark.org/review/9598
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b19846d
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Mon Jul 13 13:14:42 2015 -0400
+commit 296b9cf
+Author: Richard Sharpe <rsharpe@samba.org>
+Date:   Sat Aug 22 09:51:25 2015 -0700
 
-    RTCP heuristic only matches odd port-number TURN ChannelData packets
+    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.
     
-    RTCP can be carried within TURN CannelData messages, or STUN/TURN Send
-    messages. The TURN message can be in UDP or TCP, of any port number (by
-    default the even port 3478). So the RTCP heuristic dissector used inside the
-    TURN ChannelData/Send payload needs to match regardless of the port number of
-    the packet.
+    Also add a structure to track 802.11ad (DMG) specific features in the phdr
+    structure as suggested by Guy Harris.
     
-    Bug: 11336
-    Change-Id: I155b87c3e666478d3245366784d7d4e49c8e42c8
-    Reviewed-on: https://code.wireshark.org/review/9624
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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 873d598
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Fri Jul 3 22:16:42 2015 -0400
+commit 5ed7a40
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Aug 23 16:13:20 2015 -0700
 
-    stun/turn: stop STUN heuristic incorrectly matching TURN ChannelData messages
-    
-    The STUN heuristic dissector decoded a packet as a TURN ChannelData message
-    with a relatively weak heuristic. In order to avoid incorrect matches, it
-    checked for an existing conversation first, but the UDP layer dissector will
-    create a conversation so this check was basically useless.
+    Don't assume we have interface information.
     
-    Therefore, the STUN heuristic dissector no longer matches TURN ChannelData
-    messages at all. If it matches another TURN message type, then it sets the
-    dissector for the conversation to be the non-heuristic dissector, and then
-    ChannelData messages will be decoded by that.
+    Not all capture file formats provide interface information.  Check
+    whether we have it, and don't fail if we don't have any.
     
-    Based on the new heuristic dissector enable/disable model, in the near future
-    I might add another heuristic for a weaker check, to include TURN ChannelData.
+    (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.)
     
-    Bug: 11152
-    Change-Id: I3f3763ce5f7be71e1402e620424df45e7ea99ee5
-    Reviewed-on: https://code.wireshark.org/review/9486
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: Ia796f639ed3a8cb21e1dbe9b2bc6b4b66c7be479
+    Reviewed-on: https://code.wireshark.org/review/10220
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5cd7601
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Fri Jul 3 23:25:24 2015 -0400
+commit ce38df5
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Aug 23 21:02:24 2015 +0200
 
-    tftp: stop TFTP heuristic incorrectly matching TURN ChannelData messages
+    CBOR: get rid of INFINITY and NAN defines
     
-    Make TURN-based TFTP heuristic dissector check for valid opcode and error code
-    before matching TURN payload content.
+    This triggers an "overflow in constant arithmetic" warning with MSVC2013
     
-    The TFTP heuristic dissector incorrectly matched TURN ChannelData message data
-    content when it shouldn't. Unfortunately, the TFTP protocol has very little
-    constrained structure to perform heuristic detection with. It basically
-    always matched/succeeded.
-    
-    Bug: 11335
-    Change-Id: I950fd5a273fef63d7b069c87d1146cbd752c3bd9
-    Reviewed-on: https://code.wireshark.org/review/9489
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit cab4450
+commit 4f68c52
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 13 16:20:59 2015 -0700
+Date:   Sun Aug 23 11:38:13 2015 -0700
 
-    The toolkit is called "Qt", not "QT".
+    See if this makes MSVC happy.
+    
+    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.
     
-    Change-Id: If6c0c66bc429a041b3454f1f2355d4659cb17bbf
-    Reviewed-on: https://code.wireshark.org/review/9630
+    Change-Id: I532b9b5943be32e0897e4f03ac4e625ac41ee63b
+    Reviewed-on: https://code.wireshark.org/review/10215
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ef3cc4a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jul 13 11:56:20 2015 -0700
+commit 6b9a628
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sun Aug 23 20:36:33 2015 +0200
 
-    RTP updates.
-    
-    Merge rtp_sample_header_t into rtp_sample_t. That's the only place it
-    was used. Note that rtp_sample_t is used for writing rtpdump files.
-    
-    Move the rtp_sample_t definition to tap-rtp-common.c. Rename it to
-    rtpdump_info_t. Make rtp_write_sample static.
+    Lua: remove unneeded todo comments
     
-    Change-Id: I04e7428f634efa87a98e5d6c82a354f94ab1765d
-    Reviewed-on: https://code.wireshark.org/review/9629
-    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: I2591a0f21092a251e6fc4393e97ae0594318dfdf
+    Reviewed-on: https://code.wireshark.org/review/10214
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit bed3163
+commit fd68385
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 13 11:53:42 2015 -0700
+Date:   Sun Aug 23 11:20:39 2015 -0700
 
-    Crank down the log level for macdeployqt.
+    Use G_GINT64_MODIFIER, not l, in format strings for 64-bit integers.
     
-    Adding the additional rpath in the build process appears to have fixed
-    the problem I was trying to debug.
+    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: I518deea67837f7e084e503b8e5ae7c3f188df3c8
-    Reviewed-on: https://code.wireshark.org/review/9628
+    Change-Id: I6408778f638bb6cea52ffb64be39ea26c9b2ee64
+    Reviewed-on: https://code.wireshark.org/review/10213
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5c2a98b
+commit a451c60
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 13 11:52:41 2015 -0700
+Date:   Sun Aug 23 11:12:43 2015 -0700
 
-    Don't treat Qt frameworks as dependencies.
+    Rename variable to avoid collisions with math.h's exp().
     
-    macdeployqt will stuff them into the bundle for us; exclude anything in
-    the Qt frameworks directory from the lists of dependencies for us to
-    copy or munge.  (We don't copy them correctly - that results in the
-    underlying binary being copied to the Frameworks directory - and we
-    leave it up to macdeployqt to do the munging.)
+    Spell out "mantissa" while we're at it.
     
-    Change-Id: I10cfb8dcb2abadde9d5c52252979267912710f80
-    Reviewed-on: https://code.wireshark.org/review/9627
+    Change-Id: I47ddb9882f45ef58a6f7101818683e68bc54983b
+    Reviewed-on: https://code.wireshark.org/review/10211
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 8ba9479
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jul 13 11:46:46 2015 -0700
+commit 0b03543
+Author: Hauke Mehrtens <hauke@hauke-m.de>
+Date:   Mon Jul 20 23:36:03 2015 +0200
 
-    GTK: Don't crash when we click on an RTP sample.
+    CBOR: add Concise Binary Object Representation (RFC 7049) dissector
     
-    This doesn't fix any of the underlying problems discussed in bug 10613
-    but it does keep us from dereferencing a NULL pointer.
+    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.
     
-    Change-Id: I9317366a6ae6e563dcadb32bccee87e8803c37e3
-    Ping-Bug: 10613.
-    Reviewed-on: https://code.wireshark.org/review/9626
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    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 9f03aa1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 13 10:34:50 2015 -0700
+commit 3ce60ed
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Fri Jul 17 16:31:32 2015 +0200
 
-    On OS X, add an rpath for the Qt frameworks, and remove it in the app bundle.
+    dtls: do not try to add a zero-length fragment
     
-    Qt 5.5 and later have @rpath-based install names for the frameworks,
-    which means that, if they're not installed in some frameworks directory
-    searched by default (such as /Library/Frameworks) - which is the default
-    case with the Qt installer - they won't be found by default.
+    fragment_add does not like adding zero-length fragments, it causes a
+    zero-length memcpy to NULL.
     
-    Add the directory in which the frameworks exist as an rpath in the
-    Wireshark binary, so that they'll be found, and then remove it from the
-    Wireshark binary in the app bundle, as the directory in which the
-    frameworks exist on the machine on which Wireshark was built is
-    irrelevant to the machines on which it's being deployed - the frameworks
-    are included in the bundle, and we already add an rpath to find them
-    there.
+    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.
     
-    Change-Id: I54e033743e7b17eab26976064dcd7cd000f97c78
-    Reviewed-on: https://code.wireshark.org/review/9625
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7b9b3d4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 13 08:57:56 2015 -0700
-
-    Go back to using macdeployqt for now.
+    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.
     
-    I have some other hammers to try it hit it with to get it to actually
-    work with Qt 5.5.
+    Caught by ubsan:
     
-    Change-Id: Ie20ccbcee62fa48f768ba22478d07b9dc18d0139
-    Reviewed-on: https://code.wireshark.org/review/9623
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit af12e33
-Author: Cédric Delmas <cedricde@outlook.fr>
-Date:   Mon Jul 13 10:45:37 2015 +0200
-
-    Change Lua's tvbrange:*int64() to read only the number of bytes specified in
-    the range.
+        epan/tvbuff.c:783:10: runtime error: null pointer passed as argument 1, which is declared to never be null
     
-    Previously the length was ignored and 8 bytes were always read.
+        #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
     
-    The constraint on int64() and le_int64() becomes stricter to match int()'s ones:
-    the range must be 1, 2, 4 or 8 octets long.
+     [1]: http://comments.gmane.org/gmane.network.gnutls.general/3582
     
-    Change-Id: Ic66798757564ac840c332b978effb418726a654c
-    Reviewed-on: https://code.wireshark.org/review/9622
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 3a78901
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 13 00:54:17 2015 -0700
+commit 3703b4e
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 22 19:56:34 2015 +0100
 
-    Rpathify references to Qt frameworks separately from references to libraries.
+    Fix ip_try_dissect() boolean return
     
-    We need to preserve the full path of the framework binary.
-    
-    Change-Id: I3a13eaffc07028a26fbd970db02cc1cce3fdcd5d
-    Reviewed-on: https://code.wireshark.org/review/9621
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit eeccdf3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 21:35:26 2015 -0700
-
-    Copy over the entire framework and then clean it up.
+    If dissector_try_heuristic() succeeds return TRUE and vice-versa.
     
-    That's easier than trying to carefully copy the relevant bits.
-    
-    Change-Id: I2f174a735bf91f6434929c25ca33aced03e19597
-    Reviewed-on: https://code.wireshark.org/review/9620
-    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 00b34f4
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sun Jul 12 22:02:17 2015 -0400
+commit cc7afd2
+Author: Robert Grange <robionekenobi@bluewin.ch>
+Date:   Thu Aug 13 15:35:01 2015 +0200
 
-    Lua: all protocol tree entries expand/contract together
+    packet-mq: Add new Const/Def for WMQ800 FP3
     
-    Make each Lua Proto object have an alloacted ett value, so
-    that they expand/contract only for the same protocol.
+    Add new Const/Def for WMQ800 FP3
+    Improve Detection of EBCDIC String in MQCONN_REPLY
+    Add Value in comments
     
-    Bug: 11356
-    Change-Id: I68fb3ff00e080b47d540344aba2554e392b7f1c4
-    Reviewed-on: https://code.wireshark.org/review/9611
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit a8f3b3d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 21:22:05 2015 -0700
+commit 89ff46e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 23 08:06:46 2015 -0700
 
-    Don't copy the entire framework.
+    [Automatic update for 2015-08-23]
     
-    Copy only the stuff needed at run time; don't bother with all the
-    headers, etc..
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: Id9d2ec916b6742a6cb6e2ec3c0f7ed1a65a8a93c
-    Reviewed-on: https://code.wireshark.org/review/9617
-    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 a9d4f20
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 20:57:49 2015 -0700
+commit f95d459
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 22 11:27:00 2015 +0200
 
-    Remove unintended removal of a / in a pathname.
+    OSPF: Fix indent (use 4 spaces)
     
-    Change-Id: Ibc951e418c497e915e4391258677366a077e5531
-    Reviewed-on: https://code.wireshark.org/review/9616
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I4bd3c4a983b12e8fa053c2362f80dd723b9de572
+    Reviewed-on: https://code.wireshark.org/review/10191
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7cf25a5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 20:25:31 2015 -0700
+commit 2336743
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sun Aug 23 17:02:47 2015 +0400
 
-    Handle Qt 4 when looking for the Qt frameworks directory.
+    Remove some svn $Author$ lines that escaped previous cleanups.
+    git does keep of this in a much better way anyway.
     
-    Do it in a loop, so we can change it to handle Qt 6 if, as, and when it
-    comes out (assuming they label its packages as Qt6Package).
-    
-    Change-Id: I1d33d3e9726981b1940fb4409184c486628cb31b
-    Reviewed-on: https://code.wireshark.org/review/9615
-    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 0571d84
+commit ebca184
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 20:21:32 2015 -0700
+Date:   Sat Aug 22 15:33:15 2015 -0700
 
-    Handle both @rpath/ and absolute paths in Qt framework install names.
+    Call the MCS field by its correct name.
     
-    When looking for Qt framework dependencies, look for dependencies that
-    begin either with @rpath or with the Qt framework directory.
+    Yes, it *should* have been called "HT", but hindsight is always 20-20.
     
-    Then, first transform @rpath/ to a path relative to the Qt framework
-    directory, and then strip off everything past the framework directory,
-    to get the absolute path of the framework directory (not of the
-    framework binary - we want to copy the whole framework).
+    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.
     
-    In the loop looking for dependencies on things *other* than Qt
-    frameworks, exclude Qt framework references with absolute paths from the
-    dependencies we find; they get processed later.  (We already excluded
-    those with @rpath paths.)
-    
-    Change-Id: I1e345a5fb82c758d5c1541693b46cb36d2677fab
-    Reviewed-on: https://code.wireshark.org/review/9614
+    Change-Id: If6e97f82595a6f11a45e34d5a52e70e9ca686d7c
+    Reviewed-on: https://code.wireshark.org/review/10202
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c6aa2b5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 19:54:15 2015 -0700
+commit 15ed335
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Aug 18 07:01:35 2015 +0100
 
-    Don't add rpaths with CMake, either; osx-app.sh will do so.
+    [CLI, GTK] comparestat: Fix typos, output format, argument parsing
     
-    Change-Id: Ie8f39e5e89ed8dc21c66ee7f1235c406c3028304
-    Reviewed-on: https://code.wireshark.org/review/9613
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Optional filter argument wasn't correctly parsed.
+    
+    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 c305f08
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 9 16:47:11 2015 -0700
+commit 9c331f7
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Aug 18 08:11:34 2015 +0100
 
-    PacketList column fixes.
+    [GTK] Fix crash in comparestat.c
     
-    Add a columnsChanged slot to PacketList and move the column update code
-    from redrawVisiblePackets there. Make sure we call
-    packet_list_model_->recreateVisibleRows, which should fix the behavior
-    described in bug 11324. Call columnsChanged when we, uh, change columns.
+    Selecting a row in the statistics table causes a Glib assertion failure.
     
-    Add a sectionMoved slot to handle column reordering.
+    GLib:ERROR:ghash.c:373:g_hash_table_lookup_node: assertion failed: (hash_table->ref_count > 0)
     
-    Don't rebuild the column list when we update the widgets in the column
-    preferences frame.  Do enable and disable the "remove" button as needed.
+    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.
     
-    Try to keep the user from removing all of the columns in both the packet
-    list and column preferences.
-    
-    Left as an exercise for the reader: The GTK+ UI also fails when you
-    remove all of the columns via the preferences:
+    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 0d61321
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Aug 14 21:13:51 2015 -0400
+
+    Correct logic for finding shadow variables.
     
-      packet_list.c:377:packet_list_sort_column: assertion failed: (col)
+    Change-Id: Ide03c3b92f70d5dad8d0dceca179ea6f3b9e1fd6
+    Reviewed-on: https://code.wireshark.org/review/10037
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+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>
+
+commit b0a8fa5
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 21 12:43:55 2015 +0200
+
+    Initialize extcap for pipes
     
-    Bug: 11324
-    Change-Id: Id58cf98e42cbda9aa2fc370ea06b8bcc6098c8ca
-    Reviewed-on: https://code.wireshark.org/review/9591
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    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: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 494457d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 19:12:05 2015 -0700
+commit 532070b
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 16 18:41:53 2015 +0100
 
-    Make OS X .app bundling work with Qt 5.5.
-    
-    macdeployqt doesn't actually seem to deploy any of Qt into the app
-    bundle, probably because we're using it in a fashion they didn't intend
-    (i.e., not doing everything with *their* build tools), so we just extend
-    our dependency-binding stuff to handle the Qt libraries, and copy over
-    the Qt plugins ourselves.
+    Add support for IPv6 stats tree statistics
     
-    We also add the rpaths to the executables and libraries as part of the
-    app bundle building process; I thought it'd fix macdeployqt's problem,
-    but it didn't, however, it's probably cleaner to do it there anyway.
+    Also add support for alphabetizing stat tree items as the addition of IPv6 stats tree makes it more obvious its needed.
     
-    Change-Id: I134c2b1a32e168e82de67f0b674d17167481d69a
-    Reviewed-on: https://code.wireshark.org/review/9612
-    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 e920868
-Author: Anders Broman <a.broman58@gmail.com>
-Date:   Sun Jul 12 20:04:14 2015 +0000
+commit 953cdd4
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sat Aug 22 08:33:27 2015 +0400
 
-    Revert "[MSVC2015] TRy to fix Warnings turned errors."
+    Print two reserved elements as reserved instead of skipping them
     
-    This reverts commit 8d78077d0d931c6afee6d0e27b5df7c5477e21e5.
-    
-    Reverted as requested.
+    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: I99461820d28215a52cc6bae6792f2892018d28b8
-    Reviewed-on: https://code.wireshark.org/review/9609
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I516c2a2f0c27fcf101671527d4e4f018e17d3025
+    Reviewed-on: https://code.wireshark.org/review/10189
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 39a2d94
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Jul 12 12:56:05 2015 -0700
+commit ee80be6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 21 17:12:39 2015 -0700
 
-    Fixup packet list selection.
+    Add the display filter macros dialog.
     
-    Be less aggressive about resetting the packet list model so that we
-    retain our selection when (un)coloring packets or rebuilding columns.
+    Add some missing functionality to UatDialog.
     
-    Correctly enable a colorization menu item while we're here.
+    Remove what appears to be unused dfilter macro code.
     
-    Change-Id: I8d1c8f26dbb8a814b8344b609695b77632006e4b
-    Reviewed-on: https://code.wireshark.org/review/9608
+    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 a17bb6c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 12:11:34 2015 -0700
+commit 97014f6
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sat Aug 22 05:43:46 2015 +0400
 
-    Update a comment.
+    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: I38e42ec1ea86a0678333093795be707d6e68ab62
-    Reviewed-on: https://code.wireshark.org/review/9607
-    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 0f45a13
+commit 74177d9
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jul 12 08:11:22 2015 -0700
+Date:   Fri Aug 21 15:02:20 2015 -0700
 
-    [Automatic update for 2015-07-12]
+    Statistics dialog fixups.
     
-    Update manuf, services enterprise-numbers, translations, and other items.
+    Fix the "retap on show" behavior in TapParameterDialog. It was filling
+    in the tree when it shouldn't have.
     
-    Change-Id: Icf621f6bcde5736653771c3789772b692d5cdd43
-    Reviewed-on: https://code.wireshark.org/review/9605
+    Set the capture stop flag when WiresharkDialog closes.
+    
+    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 71190bc
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jul 12 12:27:08 2015 +0200
+commit a66a95c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 21 08:46:43 2015 -0700
 
-    megaco: replace THROW() with an expert info + return
+    Add packet comments to the properties dialog.
     
-    Change-Id: Ib876ad4b0c6d700da1eec8c8512225c123ad14da
-    Reviewed-on: https://code.wireshark.org/review/9604
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    This pulls in missing functionality from the comment summary dialog.
+    
+    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 8c2fc91
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jul 10 14:26:10 2015 +0200
+commit 95c8b01
+Author: Bill Parker <wp02855@gmail.com>
+Date:   Fri Aug 21 15:24:41 2015 +0200
 
-    VXLAN: Remove a (flag) subtree level
+    [echld common] Call to fcntl() missing a test for a return value < 0,
+    indicating failure.
     
-    Change-Id: Ic7cdb78d6a162351900e9e1ea8f4ad74ded167d3
-    Reviewed-on: https://code.wireshark.org/review/9587
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Bug: 11056
+    
+    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 be7d295
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 11 17:33:26 2015 -0400
+commit d32c3da
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Fri Aug 21 11:59:34 2015 -0400
 
-    Add "user presentable" and "unique string ids" to heuristic table entries.
+    Lua: check sscanf return value
     
-    This allows better presentation of heuristic dissectors to the end user.
+    Wslua's Int64.fromhex() and UInt64.fromhex() need to check the sscanf return
+    value. Found by coverity (CID 1191368 &1191369).
     
-    Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6
-    Reviewed-on: https://code.wireshark.org/review/9602
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I67fba027e18341d429787515f94c794573dc41c2
+    Reviewed-on: https://code.wireshark.org/review/10183
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 0caf061
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Tue Jul 7 11:30:44 2015 -0400
+commit dd2a2d4
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 21 09:45:48 2015 -0700
 
-    Lua: split up wslua files into class-based files
+    Multicast and wireless lan statistics fixups.
     
-    The size of some of the wslua source files has grown large, and it's hard
-    to quickly find things. So split them up based on class name, as much as
-    seems reasonable. Also have the make-wsluarm.pl Perl script handle this.
+    Make sure "-z multicast,stat[,filter]" and "-z wlan,stat[,filter]" work.
     
-    Change-Id: Ib495ec5c2a4df90495c0a05504856288a0b09213
-    Reviewed-on: https://code.wireshark.org/review/9579
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Add some missing "-z" items to the man page.
+    
+    Try to fix some MSVC++ warnings.
+    
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit ec1e099
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 11 14:33:31 2015 -0700
+commit 69ec4a5
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 08:45:49 2015 +0100
 
-    Note the Qt bugs about the broken .pc files.
+    Add "ip.version" field to bogus IP for filter matching
     
-    Change-Id: I050caef2a20b0c6c567f810465a3bcfe40b04a11
-    Reviewed-on: https://code.wireshark.org/review/9603
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 0bcbb2c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 11 14:12:28 2015 -0700
+commit f8712ae
+Author: Bill Parker <wp02855@gmail.com>
+Date:   Fri Aug 21 15:13:16 2015 +0200
 
-    Update to Qt 5.5.0, to fix context menu issues.
+    [Kerberos] Call to 'fseek()' without a check for a return value < 0,
+    indicating failure.
     
-    This requires still *more* .pc file fixes.
+    Bug: 11056
     
-    Change-Id: I74a385e272063b3342a29122c87331bc8191f7f5
-    Ping-Bug: 11355
-    Reviewed-on: https://code.wireshark.org/review/9601
-    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 a68518f
-Author: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date:   Sat Jul 11 18:06:22 2015 +0200
+commit 856bab6
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Wed Aug 19 10:42:59 2015 +1000
 
-    terminate readlink result
+    LWM: fix compilation without libgcrypt
     
-    The readlink function does not guarantee to nul-terminate its result string.
-    Therefore, it should be done in wsutil/filesystem.c.
+    Add HAVE_LIBGCRYPT compilation guards.
+    Move gcrypt-related variables into the scope they're used.
     
-    Change-Id: Id96533e825a302a1922ce9ac7ee47d5525ac9c39
-    Reviewed-on: https://code.wireshark.org/review/9597
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 e478267
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sat Jul 11 13:13:27 2015 -0400
+commit b5ca69b
+Author: Dave Rigby <daver@couchbase.com>
+Date:   Thu Aug 20 16:05:57 2015 +0100
 
-    Lua: fix docs and default base for ProtoField.framenum()
+    Couchbase: dissect sub-document commands
     
-    The ProtoField.framenum() Lua function says to use base.DEC, HEX, etc.
-    But it really can only allow base.NONE. Also, the code defaults
-    to base.DEC if none was given, and then errors if it's a FT_FRAMENUM;
-    instead the default base for FT_FRAMENUM should be base.NONE.
+    Add support for dissecting Couchbase sub-document commands (those
+    which operate on a subset of a whole document).
     
-    Change-Id: I0ec867069c66dbb58399ac2db4652469bfb39152
-    Reviewed-on: https://code.wireshark.org/review/9599
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 080c27f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jul 9 09:27:37 2015 +0200
+commit d097968
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 03:10:10 2015 +0100
 
-    simple_statistics_dialog(.h): fix parameter 'rtd_table/user_table' not found in the function declaration [-Wdocumentation]
+    Make IPv6 extension header protocol names uniform and consistent with RFC 2460
     
-    Change-Id: Ie82d8528953169f1a95f985b36848176a45f8187
-    Reviewed-on: https://code.wireshark.org/review/9571
+    Example from RFC 2460 (page 7):
+    
+      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)
+    
+    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: Michael Mann <mmann78@netscape.net>
 
-commit c7dbc5a
-Author: Gerald Combs <gerald@zing.org>
-Date:   Fri Jul 10 18:42:21 2015 -0700
+commit 30ce20d
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 21 13:54:53 2015 +0200
 
-    Set the font.
+    [Expert] Enhance error output to identify the duplicated field.
     
-    Change-Id: I97abd504727ef71bb29969f0a7555e17eaa70561
-    Reviewed-on: https://code.wireshark.org/review/9596
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ie38f51e2fa0f846dbcfd7a19f29eac1bd07cffbc
+    Reviewed-on: https://code.wireshark.org/review/10179
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d564ea9
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jul 10 16:15:55 2015 -0700
+commit f73e1c2
+Author: Peter Lemenkov <lemenkov@gmail.com>
+Date:   Thu Aug 13 18:13:45 2015 +0300
 
-    Qt: Add Colorize Conversation menu items.
+    Allow redefining all ports for RADIUS
     
-    Add the "View→Colorize Conversation" menu similar to the GTK+ UI. Add
-    the "Reset" item under the "Colorize Conversation" menu instead of the
-    top-level "View" menu. Make sure the "Reset" shortcut is Ctrl+Space even
-    on OS X. Normally Qt would convert it to Cmd+Space, but that's used by
-    Spotlight.
+    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:
     
-    Add StockIcon::colorIcon and use it to create filled square icons.
+    ...
+    listen {
+            type = auth
+            ipaddr = *
+            port = 13812
+    }
+    listen {
+            type = acct
+            ipaddr = *
+            port = 13813
+    }
+    ...
     
-    Change-Id: I2af9e26d025cdaf97482422bbb9440e28e18d1ac
-    Reviewed-on: https://code.wireshark.org/review/9595
-    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 44408ed
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jul 10 10:59:16 2015 -0700
-
-    Update library release dates.
+    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.
     
-    Change-Id: I053096551a18242062766d966a2f28da047d5761
-    Reviewed-on: https://code.wireshark.org/review/9592
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a1a2d50
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 9 21:09:48 2015 -0700
-
-    Make .o files, not .cpp and .h files, depend on the ui_*.h files.
+    It was requested at least once to lift this limitation:
     
-    That's one of the mechanisms the autotools documentation suggests using
-    to handle generated header files.
+    * https://ask.wireshark.org/questions/2189/decode-multiple-ports-as-radius
     
-    Using it means that "make dist" will no longer try to build those files
-    (they're not part of the distribution - and they can't be, as the files
-    would be different for Qt 4 and Qt 5, and need to be generated by the
-    uic from the same version of Qt as the one against which Wireshark is
-    being built).
+    So let's fix it!
     
-    This means we don't need to try to find uic, moc, or rcc if we're not
-    building with Qt, so don't do so.
+    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):
     
-    Change-Id: Id2aadb8289598b82e14e4ed402ff8cdc15fdef74
-    Reviewed-on: https://code.wireshark.org/review/9583
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a63f841
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jul 10 20:52:17 2015 +0100
-
-    Netflow: Fix sequence analysis to work for different protocol versions
+    radius.ports: 1645,1646,1700,1812,1813,3799
     
-    Change-Id: Iaf7cb50e88e81578f79f92a2387c29c71e0e1d9d
-    Reviewed-on: https://code.wireshark.org/review/9574
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit aa839b3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jul 10 14:38:50 2015 +0200
-
-    wslua_tree: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    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).
     
-    Change-Id: I2bbc4c0a76935367692a5fd382013cbd074754e0
-    Reviewed-on: https://code.wireshark.org/review/9588
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    *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 76a450f
-Author: Benjamin Hesmans <benjamin.hesmans@uclouvain.be>
-Date:   Thu Jul 9 15:18:02 2015 +0200
+commit 7d59925
+Author: Timo Warns <timow+github@DiningPhilosopher.DE>
+Date:   Fri Jul 31 22:30:16 2015 +0200
 
-    MPTCP small options
+    SSL: refine KEX handling and fix _anon KEX dissecting
     
-    The minimum length of MPTCP option is 3 (MP_PRIO)
+    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.
     
-    Signed-off-by: Benjamin Hesmans <benjamin.hesmans@uclouvain.be>
-    
-    Change-Id: I9742a7923497b07b9a7c761b02d52ac541e28cc7
-    Reviewed-on: https://code.wireshark.org/review/9585
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    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 52d04fd
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Jul 10 09:45:09 2015 +0200
+commit 8d5ac86
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 21 10:43:27 2015 +0200
 
-    Fix a typo
+    Try to fix: wlan_statistics_dialog.cpp:466:1: error: unused parameter filter [-Werror=unused-parameter]
     
-    Change-Id: If608ef78526c1876cba7650b42eca1d9c9b4e817
-    Reviewed-on: https://code.wireshark.org/review/9586
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Change-Id: Ib9b2fe245b126f9413dbdcced94c61eacf4d1c5d
+    Reviewed-on: https://code.wireshark.org/review/10177
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4da081b
+commit eeafab5
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 8 22:59:03 2015 +0200
+Date:   Thu Aug 20 15:06:41 2015 +0200
 
-    IEEE 802.11: tap all packets
+    file-pcapng: always set pinfo->fd->num before calling next layer dissectors/file-pcapng
     
-    And only take into account management, non null data and or extension frames
-    in WLAN traffic statistics, as previously
+    Also fix an off by 1 error for EPB case
     
-    Bug: 11318
-    Change-Id: I32c059a2594331c4e317380b9de43fb582f7f8cb
-    Reviewed-on: https://code.wireshark.org/review/9566
-    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>
+    Change-Id: I895d82a58ec02c577dcaa67a97d456b42460b947
+    Reviewed-on: https://code.wireshark.org/review/10149
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit f6a4826
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 9 23:12:55 2015 +0200
+commit 5e3388f
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 19:39:26 2015 +0200
 
-    LTE RRC: upgrade dissector to v12.6.0
+    GSM_map: Fix indent (use 2 spaces) and add modelines
     
-    Change-Id: I6e8271f98cba0074b27df73a21337d388efcdc7a
-    Reviewed-on: https://code.wireshark.org/review/9578
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I1549eb55e1fa87c46e2493c37f3ed352970b794b
+    Reviewed-on: https://code.wireshark.org/review/10168
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d6631c6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 9 21:44:27 2015 -0400
+commit 8055786
+Author: Paul Emge <paul.emge@digidescorp.com>
+Date:   Thu Aug 6 11:00:22 2015 -0500
 
-    Bugfix GTK RPC SRT dialog use of direct hashing.
+    Fix bug with MVRP dissection where only one message was dissected.
     
-    Change-Id: I3db6ee3e6c5cb79b9cc31068930c9fe9c9d8aa7a
-    Reviewed-on: https://code.wireshark.org/review/9581
+    Fix whitespace and replace tvb_captured_length with tvb_reported_length
+    
+    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: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0aaf0f0
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 9 16:00:14 2015 -0700
+commit a5fe54d
+Author: Pascal Artho <pascalartho@gmail.com>
+Date:   Tue Aug 18 08:44:37 2015 +0200
 
-    Add the "Resolved Addresses" dialog.
+    Preparation Host Flows: Syntax Line Edit (allow longer filter text)
     
-    The GTK+ equivalent is named "Address Resolution" but "Resolved
-    Addresses" seemed (to me at least) to be more clear.
+    The "Syntax Line Edit" is based on "QLineEdit". By default, the maximum
+    permitted length of a QLineEdit text is 32767 (16 bits).
     
-    Change-Id: I1806354d91bb5ce8af11d20568b92a04c78d4d73
-    Reviewed-on: https://code.wireshark.org/review/9580
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    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: 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: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b820d74
-Author: Cody Doucette <doucette@bu.edu>
-Date:   Fri Jun 19 16:20:51 2015 -0400
+commit 0310e5a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 23:03:01 2015 +0200
 
-    xip: add support for XIP packets
-    
-    The eXpressive Internet Protocol (XIP) is the network layer
-    protocol for the eXpressive Internet Architecture (XIA), a
-    future Internet architecture project. The addresses in XIP are
-    directed acyclic graphs, so much of the code included in this
-    addition verifies the correctness of the DAGs and displays them
-    in human-readable form.
+    gsm map summary (GTK): fix no previous prototype for ‘gsm_map_stat_gtk_sum_cb’ [-Wmissing-prototypes]
     
-    Bug: 11265
-    Change-Id: I948aaa73b927f8afc162d89689d184c5657f60b1
-    Reviewed-on: https://code.wireshark.org/review/8881
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    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 38e0477
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 9 22:44:23 2015 -0400
+commit aec8e93
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 22:08:18 2015 +0200
 
-    Use tfs_defined_not_defined
+    SPDY: fix no previous prototype for 'dissect_spdy_heur' [-Wmissing-prototypes]
     
-    Change-Id: Id9409109ffe667d1f8b3201792f7b4146b1f73f5
-    Reviewed-on: https://code.wireshark.org/review/9582
+    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 2a5a560
-Author: Amine Kherbouche <amine.kherbouche@6wind.com>
-Date:   Tue Jul 7 10:46:34 2015 +0200
+commit 8f0fc4b
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 19:34:47 2015 +0200
 
-    VXLAN: Add Group Based Policy dissector
+    GSM/ANSI/CAMEL...: fix no previous prototype for '*_stat_init' [-Wmissing-prototypes]
     
-    According to some advices from my last commit,i made some changes, and i
-    use proto_tree_add_bitmask for bits field.
-    
-    Editing VXLAN dissector for supporting GBP extension described in the
-    following draft link :
-    https://tools.ietf.org/html/draft-smith-vxlan-group-policy-00
+    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 fab0e59
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Thu Aug 20 14:38:35 2015 -0400
+
+    Fix memory leaks of dumper SHB and IDB infos
     
-    This pach works fine with "old" version of VXLAN (no GBP support)
+    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.
     
-    The flags are now extended to 16 bits to support GBP extension, Group
-    Policy Id is on 16 bits, VNI always on 24 bits and remaining bits are reserved.
-    The following bits are defined in addition to the existing VXLAN fields:
-    	bit 0 : "G" Group Based Policy Extension bit
-    	bit 9 : "D" Don't Learn bit
-    	bit 12 : "A" Policy Applied bit
-    	the remaining bits are reserved
+    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).
     
-    Bug: 11348
-    Change-Id: I425ed63cf76f134eb3d1680a1753ed31f252dfa8
-    Signed-off-by: Amine Kherbouche <amine.kherbouche@6wind.com>
-    Reviewed-on: https://code.wireshark.org/review/9537
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit fdd07c4
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 9 10:29:21 2015 -0700
+commit dc4e960
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Aug 20 11:00:17 2015 -0400
+
+    Add some Gx AVPs from 3GPP 29.212.
+    
+    Change-Id: Iaf2cc67d4d235193b25045895441742bc6531370
+    Reviewed-on: https://code.wireshark.org/review/10150
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 71e08dd
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 18 13:34:30 2015 +0200
 
-    Make sure we uncheck the "Find Packet" action.
+    lemonflex: fix warning: no previous prototype for 'df_scanner_*' [-Wmissing-prototypes]
     
-    Make sure we uncheck the "Find Packet" action when we're done finding
-    packets. Make the "Go To Packet" action checkable and ensure that it's
-    properly checked an unchecked as well.
+    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]
     
-    Change-Id: I979cabfd950ec4807ebcd40664b44b600557cf48
-    Reviewed-on: https://code.wireshark.org/review/9577
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: If0476b430592df225234c5c685c8009ab08b5ab6
+    Reviewed-on: https://code.wireshark.org/review/10162
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d36930e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 6 23:16:33 2015 +0200
+commit a70f591
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Aug 20 23:16:04 2015 +0200
 
-    HTTP2: fix dissection of traffic over HTTP port
+    proto_dlg: fix no previous prototype for ‘heur_*_all_cb’ [-Wmissing-prototypes]
     
-    Bug: 11331
-    Change-Id: Ib85e18ebb3c958d68ee3a4295d35982ffcd375ee
-    Reviewed-on: https://code.wireshark.org/review/9525
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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 949ff7a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 9 09:46:06 2015 -0700
+commit d9395b7
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 03:54:36 2015 +0100
 
-    Update the release notes.
+    Rename 'ip_next_header_dissector_table' to 'ipv6_next_header_dissector_table' in IPv6 dissector
     
-    Change-Id: I290cd22e46ac88401524781ea027bbc8200452a6
-    Reviewed-on: https://code.wireshark.org/review/9576
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Provides better readability, the dissector table is only used for IPv6
+    extension headers.
+    
+    Change-Id: I87d877a89c6465d4475f2f0a40636ccd1b6cdd92
+    Reviewed-on: https://code.wireshark.org/review/10174
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 7082b86
+commit 56d131c
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 8 23:37:00 2015 -0700
+Date:   Thu Aug 20 17:06:04 2015 -0700
 
-    Clean up the "Build wireshark" message.
+    There is no wlan_statistics_dialog.ui.
     
-    Change-Id: I40883aee5207dd8a437fcde827386bd370fbe96c
-    Reviewed-on: https://code.wireshark.org/review/9570
+    Change-Id: Ibedb3904cbab88ebae3bc9ec1588263af933dfc1
+    Reviewed-on: https://code.wireshark.org/review/10172
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 281055a
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Wed Jul 8 15:20:50 2015 -0400
+commit 2ed3d91
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 18 11:46:12 2015 -0700
 
-    Lua: add functions for more field information
+    Add the WLAN statistics dialog.
     
-    Add Lua functions so a plugin can introspect field information, such
-    as the type of field, flags, tvb, etc. Also add a couple of Tvb and
-    ByteArray methods. And cleanup the TreeItem code a little.
+    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.
     
-    Change-Id: I7b58ce589ace91cce14b8abccd01ceabb63e2653
-    Reviewed-on: https://code.wireshark.org/review/6500
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Rename the top-level Bluetooth menu item to Wireless and put the WLAN
+    stats dialog there.
+    
+    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.
+    
+    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.
+    
+    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 7b85f62
+commit 0f9bbbc
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jul 8 14:09:09 2015 +0200
+Date:   Thu Aug 20 22:56:56 2015 +0200
 
-    service_response_time_dialog/response_time_delay_dialog(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]
+    BOOTP: fix indent (use tab)
     
-    Change-Id: I84682651f40ab9e8f54a6ae656d0670096b5a3bc
-    Reviewed-on: https://code.wireshark.org/review/9559
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I32ea4d1b9cd8aa351cbdb2bab0642e4ed0c191fb
+    Reviewed-on: https://code.wireshark.org/review/10169
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit ac7a465
+commit b07ae6c
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jul 7 15:43:03 2015 +0200
+Date:   Thu Aug 20 22:02:50 2015 +0200
 
-    main_window(.h): fix parameter 'menu_path' not found in the function declaration [-Wdocumentation]
+    ANSI: Add modelines
     
-    Change-Id: I98a9388f44fe38261fde5422ac821fbb6c1d993c
-    Reviewed-on: https://code.wireshark.org/review/9553
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I641a9525ec5a6315cc4a2d97506a885605b3504b
+    Reviewed-on: https://code.wireshark.org/review/10170
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit d88639c
+commit 4dd49c5
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jul 8 12:04:42 2015 +0200
+Date:   Thu Aug 20 21:38:19 2015 +0200
 
-    qt_ui_utils.h: fix empty paragraph passed to '@return' command [-Wdocumentation]
+    Camel: Fix indent (use 2 spaces) and add modelines
     
-    Change-Id: I120ed85ee88253084646db4817ae77a8c90492f2
-    Reviewed-on: https://code.wireshark.org/review/9557
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I6fe835e78e58faabd5cfeeb84e39793b48d3df25
+    Reviewed-on: https://code.wireshark.org/review/10167
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 9cb2f76
+commit 648fe94
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jul 8 10:09:31 2015 +0200
+Date:   Thu Aug 20 07:48:58 2015 +0200
 
-    ARP: Remove double space before Tell
+    Translations: fix typo
     
-    Change-Id: I5d8f79e01912c010ca74a0134a0f397c62f1e106
-    Reviewed-on: https://code.wireshark.org/review/9556
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    coversation => conversation
+    
+    Found by s3erios (Ukrainian translator)
+    
+    Change-Id: Iaecb4e139d049c212956fa8567ee480d2f2aa0d2
+    Reviewed-on: https://code.wireshark.org/review/10152
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit a8faa04
+commit c4b93e9
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 8 15:44:04 2015 -0700
+Date:   Thu Aug 20 11:54:04 2015 -0700
 
-    Qt: Add dynamic menu support.
+    CMake: Fixup appending to WS_WIN_LIBS
     
-    Generalize the dynamic menu code and make it possible to connect
-    multiple types of actions to their corresponding slots.
+    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: Ib915ad5a666310e2a6e366fada006336820d1653
-    Reviewed-on: https://code.wireshark.org/review/9568
+    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 131e0ab
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 8 16:19:19 2015 -0700
+commit e67098c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 20 11:39:02 2015 -0700
 
-    Handle setModule(NULL) more safely.
+    Squelch recent display filter warnings.
     
-    If module_name is null, we can't do much of anything - we don't have a
-    protocol ID, so we don't have a protocol.
+    Try to keep the main display filter editor from emitting warnings when
+    we populate the recent item list.
     
-    Change-Id: I42c2fa4b47e39d7ac122c60be91b5d408bf30a1d
-    Reviewed-on: https://code.wireshark.org/review/9569
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 e312d41
+commit 36a74cb
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 8 13:54:24 2015 -0700
+Date:   Thu Aug 20 08:56:04 2015 -0700
 
-    GTK+: Add a Telephony/ANSI menu placeholder.
+    Tap parameter and stats dialog fixups.
     
-    Add REGISTER_STAT_GROUP_TELEPHONY_ANSI as well, and use it to add
-    recently updated stats.
+    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.
     
-    Make sure we properly escape our path separators.
+    Add checks and cleanups to some of the stats table free routines.
     
-    Change-Id: I979d5c29a82acddec1a9bcae7e3cb9c5ea3f9d33
-    Reviewed-on: https://code.wireshark.org/review/9564
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    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 5c8b92c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 8 14:21:49 2015 -0700
+commit 37a737f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 20 10:05:39 2015 -0700
 
-    Make sure we get the Qt tools for the Qt version with which we're building.
+    Make sure we can apply deprecated display filters.
     
-    For example, Qt 4's uic produces .h files that don't compile with Qt 5,
-    as they use header #include paths that work with Qt 4's headers but not
-    Qt 5's headers.
+    Deprecated filters are still valid. Update display filter checks to make
+    sure we can apply them.
     
-    Change-Id: I50c7bd15fca05475180a933a6c77955dc686c0c5
-    Reviewed-on: https://code.wireshark.org/review/9567
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 6a35ee3
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Jun 27 10:13:00 2015 -0700
+commit 829c648
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 17 01:38:00 2015 +0100
 
-    dapp: cleanup, make elements filterable
+    Check for IP version errors in dissect_ip()
     
-    don't squeeze all info into the subtree title
-    remove an unnecessary THROW()
-    
-    Change-Id: I542f220d9d786d0fa879a0b2fe4549ffa1ca87af
-    Reviewed-on: https://code.wireshark.org/review/9544
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I7db4ed54be820e5667e1e93880013cc7abf95256
+    Reviewed-on: https://code.wireshark.org/review/10064
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit f96a592
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jul 8 20:59:58 2015 +0000
+commit ba69473
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Thu Aug 20 08:48:46 2015 -0400
 
-    Revert "[ieee80211] Cleanup"
+    Link setargv.obj for Windows in CMake so mergecap works
     
-    This reverts commit 89c24ee8e8086dc88042d9f048479487b342702e.
+    Try it again.
     
-    Further investigation of unused functions required ....
-    
-    Change-Id: I0c015cf067eaa0ce5bdafa0bce29bed373e9a82f
-    Reviewed-on: https://code.wireshark.org/review/9565
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I511dd3d7d70fa33e246085c8cb79925e92945ebc
+    Reviewed-on: https://code.wireshark.org/review/10148
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 89c24ee
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jul 8 15:32:59 2015 -0400
+commit 7249791
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 13:00:24 2015 +0200
 
-    [ieee80211] Cleanup
-    
-    Primarily:
-       Call fixed_field functions directly instead of doing a
-       linear search by "function number" in a large table
-       of dissector addresses to determine the function address
-       for each function call.
-    
-       As part of this change,  the order of certain fixed_field
-       functions was changed to fix any forward references.
-    
-    Also:
-       Spelling
-       Whitespace
+    pcapng: Fixed copying if_filter_bpf_bytes
     
-    Change-Id: I9bb7e239086f9b65044929f2cb7e7f9d9b9adaee
-    Reviewed-on: https://code.wireshark.org/review/9563
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    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 ccdd4be
-Author: Jean Thomas <jeanthomas@sierrawireless.com>
-Date:   Wed Jul 8 18:31:00 2015 +0200
+commit 8a71867
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Aug 19 21:47:50 2015 +0100
 
-    GSM A RR: fix GSM H/L bits management
+    UDP jumbogram expert info fix
     
-    Bug: 11347
-    Change-Id: Iec48d52fd1f9c0669a7ef0cd95bf403025d477ae
-    Reviewed-on: https://code.wireshark.org/review/9562
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    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: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e0deadc
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Thu Jul 2 11:48:12 2015 +0200
+commit bc8b94d
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:57:25 2015 +0200
 
-    opcua dissector: fix display of service type in packet column
+    file-pcapng: differentiate captured length and reported length when calling next dissector and catch bound errors
     
-    The loop was iterating using g_NumServices, which is the number of entries in g_arParserTable and not the number of entries in g_requesttypes. Instead now we use val_to_str which can in addition display the ServiceId instead if not found in the table.
+    Otherwise dissection will fail when analyzing a capture with a snap length set
     
-    Change-Id: If15ee5c460e07c4687464805935b92c913392011
-    Reviewed-on: https://code.wireshark.org/review/9459
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    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 4eca268
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jul 7 16:18:00 2015 -0700
+commit ff78d0a
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:54:47 2015 +0200
 
-    Add SimpleStatisticsDialog.
+    file-pcap: differentiate captured length and reported length when calling next dissector and catch bound errors
     
-    To do:
-    - Refactor dynamic menu item placement.
+    Otherwise dissection will fail when analyzing a capture with a snap length set
     
-    Change-Id: I087de9f2fa3c2ff7dc08e5d54bc9c1b984fdd7b1
-    Reviewed-on: https://code.wireshark.org/review/9561
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    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 d3f71f9
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Jul 8 12:57:12 2015 +0100
+commit 2046368
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:48:46 2015 +0200
 
-    nb_rtpmux: Add a port preference
+    file-pcapng: fix dissection of options in blocks
     
-    Add as a preference a UDP port range to register the dissector on. Also:
-    - show multiple frames in the Info column
-    - show summary (ports, length) in protocol root
+    - fix the loop logic
+    - flags in EPB include link-layer-dependent errors
     
-    Change-Id: I91d0a006cd8d0b97d2c6d65ae432fca3dff94733
-    Reviewed-on: https://code.wireshark.org/review/9558
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Iae0b4869b556abbf3c14f3b865d0f23cee182c84
+    Reviewed-on: https://code.wireshark.org/review/10132
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit bd64be6
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Jul 8 14:47:45 2015 +0100
+commit bc777f9
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 10:29:03 2015 +0200
 
-    RANAP: if bindingid looks like port number, extract and show
+    Added a missing break
     
-    Change-Id: Ibfb98bf72ebbd620f21a13e5a4435144a8ef9f6a
-    Reviewed-on: https://code.wireshark.org/review/9560
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Ia04a112d8df195e271dc11565750a6e28bd7f0c9
+    Reviewed-on: https://code.wireshark.org/review/10146
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 0997129
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Wed Jul 8 08:07:24 2015 +0100
+commit 950f1dd
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 19 15:38:10 2015 +0200
 
-    Fix CMake install of lua scripts
+    IO Graphs: Don't show unchecked graphs in legend
     
-    The CMake generation of all-manifest.nsh is missing the 3
-    lua scripts, init.lua, console.lua and dtd_gen.lua.
+    Change-Id: I0a9c4d967ee03a0a8dfc93f87dbe38e4e3a0404c
+    Reviewed-on: https://code.wireshark.org/review/10128
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 75f4ff7
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 10:09:13 2015 +0200
+
+    Make empty filter valid in checkFilter
     
-    Change-Id: I2d34cfe075c5195d1d8816c0d816015195756fa2
-    Reviewed-on: https://code.wireshark.org/review/9551
-    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: Ia5293a228a7044a4cd01b3b2f62f1d7a8f7747e2
+    Reviewed-on: https://code.wireshark.org/review/10145
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 8fdd49a
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Jul 8 09:09:48 2015 +0200
+commit 29cd036
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 10:06:48 2015 +0200
 
-    Duplicate CheckCCompilerFlag for CXX.
-    Correctly detect that XCode7Beta1 does not support -fno-delete-null-pointer-checks
-      by adding a new regex.
+    Clear display filter when filterPackets with empty filter
     
-    Change-Id: I76e0b6bb72094e6e75dae9be97bc7ee8e7051792
-    Reviewed-on: https://code.wireshark.org/review/9552
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Change-Id: Ie3f763d53f5c250bbc58e32490eb83bb2e076a62
+    Reviewed-on: https://code.wireshark.org/review/10144
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit d7f0118
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 7 22:17:11 2015 -0700
+commit 3b5a1f2
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 23:29:13 2015 -0400
 
-    Put back closing } accidentally removed in previous commit.
+    Link setargv.obj for Windows in CMake so mergecap works
     
-    Change-Id: Ic02b0c86e55751a27d5d0417f4f5314def69e794
-    Reviewed-on: https://code.wireshark.org/review/9550
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Mergecap needs setargv.obj in order to get wildcard support. This is linked
+    in nmake but not cmake.
+    
+    Bug: 10354
+    Change-Id: Icccf6b36495ac4b376f651d689b4a1f9e2c6042d
+    Reviewed-on: https://code.wireshark.org/review/10143
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit e93fa8a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jul 7 12:04:48 2015 -0700
+commit 6fb6ede
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 21:38:13 2015 -0400
 
-    Add ResponseTimeDelayDialog.
+    Get the windows buildbot working for mergecap test suite
     
-    Change-Id: Ie1ea316643a3465763aec71f4a3ef4bf1a5ae639
-    Reviewed-on: https://code.wireshark.org/review/9548
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ic9351b9bb8df85086eee3ab21908a2f9a04db767
+    Reviewed-on: https://code.wireshark.org/review/10141
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 5ccd8af
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jul 6 14:41:56 2015 +0200
+commit ddaa311
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 18:30:29 2015 -0400
 
-    qt_ui_utils.h: fix @param command used in a comment that is not attached to a function declaration [-Wdocumentation]
+    Remove unused struct member from wtap
     
-    Move class declaration on the top
+    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: I4ced45f2c677a41cc8f5180d2eb5d211f4c6e6c1
-    Reviewed-on: https://code.wireshark.org/review/9518
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    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: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0619ed2
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Jul 8 00:13:24 2015 +0200
+commit b3daf70
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 18:42:59 2015 -0400
 
-    Finish removal of Q_UNUSED.
-    Todo: qcustomplot via upstream
+    Pcap: wtap does not set interface timestamp precision when reading pcap
     
-    Change-Id: I19cf98f1281ecb1f6efbb7d36c997d5aa43f5baf
-    Reviewed-on: https://code.wireshark.org/review/9547
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 51a37b6
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Tue Jul 7 23:47:20 2015 +0200
-
-    Continuing to remove Q_UNUSED
+    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.
     
-    Change-Id: I54bc4a1b7d39abd1bb88ee361b0de5fcbca1efe8
-    Reviewed-on: https://code.wireshark.org/review/9546
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Change-Id: I71d0fe2e999ee7d11f1f5cc424681a99e17b1b1b
+    Reviewed-on: https://code.wireshark.org/review/10139
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit e91ca72
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jul 3 15:52:49 2015 -0500
+commit fc0a2f5
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 17:59:27 2015 -0400
 
-    Qt: Add initial Lua support.
-    
-    Add a FunnelStatistics class, which is the main interface between the Qt
-    UI and the Funnel API.
+    Add more debug infor for windows buildbot test suite failure
     
-    Add FunnelTextDialog, which implements the text_window, ProgDlg, menu,
-    and other routines. Add FunnelStringDialog, which implements dlg_new.
+    Down the rabbit hole we go...
     
-    We currently only support "Tools" menu items (MENU_TOOLS_UNSORTED, aka
-    REGISTER_TOOLS_GROUP_UNSORTED). Add a disabled placeholder to the
-    "Tools" menu in case we don't load any scripts.
-    
-    Use "struct progdlg" instead of needlessly casting to
-    funnel_progress_window_t.
-    
-    To do:
-    - Add support for MENU_STAT_UNSORTED, MENU_STAT_GENERIC, etc.
-    - Make the firewall config generator a Lua script?
-    - Add FunnelGraphDialog? It seems like it would be useful to
-      make QCustomPlot accessible to Lua scripts.
-    
-    Ping-Bug: 9845
-    Change-Id: Iefff02e9032ed1853666f7902509ed08b431e7a7
-    Reviewed-on: https://code.wireshark.org/review/9523
-    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 e962217
-Author: cbontje <cbontje@gmail.com>
-Date:   Mon Jul 6 15:28:28 2015 -0600
+commit 8a86222
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 18:34:20 2015 +0200
 
-    Added support for optional display of signed 16/32-bit integer Modbus register data
+    PNRP: capitalize protocol name
     
-    Change-Id: I2a81fdf426fdc20db200596ccd2eae26936fc81a
-    Reviewed-on: https://code.wireshark.org/review/9526
-    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>
+    Change-Id: I1cf5d22e12241ef330319ef8fdf176becdefe300
+    Reviewed-on: https://code.wireshark.org/review/10131
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit b8f3888
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 7 10:43:25 2015 -0700
+commit d9dd323
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:52:30 2015 +0200
 
-    Add #defines for various aggregation flags, and use them.
-    
-    Fewer magic hex numbers, more readability.
+    file-pcapng: remove useless hf_pcapng_timestamp_data entry
     
-    Change-Id: I698e0e9b28b75249c7dff5f1e1c7fbe0b4a93be2
-    Reviewed-on: https://code.wireshark.org/review/9543
+    Change-Id: I82b2d4e4b0be8179103b827e0d11a0d8b10e1374
+    Reviewed-on: https://code.wireshark.org/review/10133
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 4f1a818
+commit 0bdf518
 Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Tue Jul 7 12:07:18 2015 -0400
+Date:   Wed Aug 19 16:25:54 2015 -0400
 
-    MySQL: use tvb_format_text instead of format_text/tvb_get_ptr
+    Try to debug merge test suite failure on windows buildbot
     
-    Bug: 11344
-    Change-Id: Ibddbcce3e6e98bc3866cab9eb76e9762e4d19138
-    Reviewed-on: https://code.wireshark.org/review/9538
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    This change will be undone once the problem is found.
+    
+    Change-Id: Ica9cfe31b4e30fad2bb9de508af61baa1c455cc1
+    Reviewed-on: https://code.wireshark.org/review/10136
     Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 813a1fb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 7 09:44:28 2015 -0700
+commit 2c260fa
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Sat Aug 15 21:12:17 2015 +0200
 
-    Initialize the 11b presence flag to 0.
-    
-    There were some cases where it wasn't getting initialized when we set
-    the PHY to 11b, in addition to the one Pascal found.
+    Use system's GeoIP database by default on Debian
     
-    Change-Id: I127737cd29dc53c96342364de5cb722b135f23f3
-    Reviewed-on: https://code.wireshark.org/review/9540
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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>
 
-commit 5b76ef3
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 7 18:28:37 2015 +0200
+commit bb96725
+Author: Balint Reczey <balint@balintreczey.hu>
+Date:   Sat Aug 15 21:10:20 2015 +0200
 
-    Next Windows Server version seems to be named Windows Server 2016 now
+    Use system's OpenLayers.js on Debian
     
-    Change-Id: I31fb5495f5e17ccba1578a069ca33448a291923f
-    Reviewed-on: https://code.wireshark.org/review/9539
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Id790ee61d3443e2f96a83260514fa3a6d31d09da
+    Reviewed-on: https://code.wireshark.org/review/10050
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
 
-commit f4ce6cb
+commit 9380d06
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 7 17:13:17 2015 +0200
+Date:   Wed Aug 19 18:13:36 2015 +0200
 
-    PPI: initialize optional presence flags bitmap when using 802.11B
+    ixiatrailer: remove execute bit
     
-    Bug: 11346
-    Change-Id: I3c80bda24af0c981c75e6d815dd2a1d328e9eb41
-    Reviewed-on: https://code.wireshark.org/review/9536
+    Change-Id: I6cd8f98518b21e935b329f5470b706ec059c91eb
+    Reviewed-on: https://code.wireshark.org/review/10129
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a908cf0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 7 13:45:51 2015 +0200
+commit 89a8ad6
+Author: Pascal Artho <pascalartho@gmail.com>
+Date:   Tue Aug 18 08:44:04 2015 +0200
 
-    ixveriwave: comment pcp_type variable as it is not used yet
+    Preparation Host Flows: Tap Sequence Analysis
     
-    Change-Id: If4751f1044282579c8741b57579a5f2e8f9f393c
-    Reviewed-on: https://code.wireshark.org/review/9535
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 30d82a4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 7 00:46:40 2015 -0700
-
-    Actually, user_data *is* used there.
+    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]).
     
-    Change-Id: Ic22741e6551b5ec2eb76408ff8521067d9d40a88
-    Reviewed-on: https://code.wireshark.org/review/9534
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 53fcaab
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 7 00:39:50 2015 -0700
+commit d05b6f9
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 19 11:52:51 2015 +0200
 
-    Use the NSS provided by the Ixia Veriwave hardware.
+    Bluetooth: ATT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-    It doesn't appear to provide the FEC type, although radiotap does, so
-    add a flag to indicate whether we have that.
+    Found also by Coverity (CID 1316607)
     
-    Change-Id: I298d79bc6b640ee2408c3d70075c32bf331a210c
-    Reviewed-on: https://code.wireshark.org/review/9533
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib6a4437fd24b51a8aa87d4bcdb5ee2a1dc43dae3
+    Reviewed-on: https://code.wireshark.org/review/10124
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 21754f4
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Tue Jul 7 08:24:50 2015 +0200
+commit 03b78a0
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 19 11:58:44 2015 +0200
 
-    Starting to get rid of Q_UNUSED declarations for unused function parameters.
-    The official C++ way is to leave out the variable name instead. This has the
-    advantage to be reliable: In one case a variable declared unused was later
-    used.
+    Bluetooth: ATT: Fix  code will never be executed [-Wunreachable-code]
     
-    Change-Id: I1c96636f7fa7a621d1594d1e9cacaec75c561faa
-    Reviewed-on: https://code.wireshark.org/review/9532
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    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 aca5f4e
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Jul 7 02:06:34 2015 +0000
+commit d470ff1
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 19 12:33:06 2015 +0200
 
-    Revert "diameter: convert some GArrays to epan wmem_arrays"
-    
-    This reverts commit 59017a22be9a5a86f5c365cc22a2f1e23205597b.
+    btsnoop: Missing break in switch (CID 1316606)
     
-    As indicated by Michael on the original change, this breaks
-    diameter rather badly for some reason I haven't been able to
-    determine. Reverting until I can track down the root cause.
-    
-    Change-Id: Iedfab546a726395c546a88138cd45b6667913a11
-    Reviewed-on: https://code.wireshark.org/review/9531
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I105da06b7161a5b5f0cc2b4ce5303c4d5c989280
+    Reviewed-on: https://code.wireshark.org/review/10126
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 5999b97
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Mon Jul 6 19:56:15 2015 -0400
+commit fa40025
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 19 09:00:54 2015 +0200
 
-    MySQL: dissector adds packet content to INFO column without scrubbing it
+    Recompile dfilter for all tap listeners when fields changed
     
-    Make the MYSQL protocol dissector scrub the strings from the packet content by
-    putting it through format_text() to remove/replace CR, LF, TAB, etc. The
-    fields affected are: query string, greeting version string, login username,
-    and login schema.
+    When fields have changed the compiled display filter may be invalid
+    or need a recompile to be valid.
     
-    Bug: 11344
+    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-Id: Ie1a593026c21720eecc77e7b3a7e63db11adf2a1
-    Reviewed-on: https://code.wireshark.org/review/9530
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 8ebf735
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 6 16:46:10 2015 -0700
+commit b755a66
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Aug 19 05:28:17 2015 +0100
 
-    Clean up a bunch of stuff.
-    
-    The command byte values aren't FPGA-specific - if they were, the code
-    wouldn't have worked.  Provide #defines for the main ones and check for
-    them, and use that to determine whether the packet is transmitted or
-    received.
+    Use MAC address documentation range in filter examples
     
-    Add a bunch of #defines, shuffle some defines to cluster related ones
-    together and separate unrelated ones, get rid of duplicate #defines
-    (where different FPGAs use the same value).
+    https://www.iana.org/assignments/ethernet-numbers/ethernet-numbers.xhtml
     
-    Fix some typoes.
-    
-    Change-Id: Ic8adc589d7c36a4a91a81858de40c904743dd067
-    Reviewed-on: https://code.wireshark.org/review/9529
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 886c2d0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 6 14:54:03 2015 -0700
-
-    Update a comment.
-    
-    Change-Id: I71e66a8f6faf3b213ab6db2856a36c1d31897166
-    Reviewed-on: https://code.wireshark.org/review/9527
-    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 e7dfcba
-Author: Luca Melette <luca@srlabs.de>
-Date:   Mon Jul 6 17:41:55 2015 +0200
+commit e328fa5
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Aug 19 07:11:23 2015 +0100
 
-    GTP fixes: RAB setup and PDP context prio
+    IPv6: Minor variable name fix
     
-    Change-Id: Ie250eaf17136076dbb3e44ac15b222a8b2e367ac
-    Reviewed-on: https://code.wireshark.org/review/9520
+    Change-Id: Iaef41fa2a212577f1fbdf7705eca65a928faa8c3
+    Reviewed-on: https://code.wireshark.org/review/10122
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit e55e785
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Jul 6 11:52:18 2015 -0400
+commit 9976f52
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 17 13:30:01 2015 +0200
 
-    [ieee80211] Fix proto_tree_add_item() reversed offset,length args
+    .mailmap: sort using sort -u
     
-    Change-Id: I2bb087138de662fd41301b93ef9804345c0875b8
-    Reviewed-on: https://code.wireshark.org/review/9521
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I276331070c654e6c57bccb2c26cd0430ac656b26
+    Reviewed-on: https://code.wireshark.org/review/10069
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d29c5eb
+commit dcaa64a
 Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sun Jul 5 23:58:19 2015 -0400
+Date:   Mon Aug 17 19:22:42 2015 -0400
 
-    Rawshark calls init_process_policies() twice
+    Mergecap: add test suite for various merging scenarios
     
-    Calling it twice won't make it work any better.
+    Add a test suite for mergecap (and indirectly capinfos I guess).
+    This is not exhaustive, but it's a start.
     
-    Change-Id: I30fea0ba2ccf6ebfb6caf6a58333cee9b192e4cb
-    Reviewed-on: https://code.wireshark.org/review/9513
+    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 0b4cd71
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 5 19:11:24 2015 -0700
+commit d64ad1d
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Aug 16 12:37:11 2015 -0400
 
-    Add some comments.
+    capinfos: add more info about file and interfaces
     
-    OK, where's NSS for the presumably-one-and-only user hiding for 11ac?
+    Add more information about the capture file, and about the interface
+    descriptions in it. Also remove long-unused g_options code.
     
-    Change-Id: I53eb216c5d209dc5bb46c1d0aca7f8a200161e3e
-    Reviewed-on: https://code.wireshark.org/review/9512
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 a7ac6cf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 5 19:05:52 2015 -0700
+commit 3268023
+Author: Andrew Chernyh <andrew.chernyh@gmail.com>
+Date:   Mon Jul 6 10:29:48 2015 +0600
 
-    Stub out the US public safety band.
+    Added TDMoP protocol dissector
     
-    OK, anybody know how to convert a frequency between 4.9 GHz and 5.0 GHz
-    into a channel number, in a fashion that handles what's actually used in
-    both the US and Japan?
-    
-    Change-Id: I95f4f9649e379b3d6651aadf8f62d8406b81b3b3
-    Reviewed-on: https://code.wireshark.org/review/9511
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 11340
+    Change-Id: I04408db376718c7a5392f9521d7d75d0481ec30e
+    Reviewed-on: https://code.wireshark.org/review/9514
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 94eb30a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 5 19:02:51 2015 -0700
+commit d5caba6
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 17 20:07:58 2015 +0100
 
-    Add a comment.
-    
-    Why, oh why, are channel numbers used for 802.11?
+    [IPv6] Make "ip.version" field pretty(er)
     
-    Change-Id: Ie26987dfeaad2ce0ead0eef72339f966aadeeecd
-    Reviewed-on: https://code.wireshark.org/review/9510
-    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 3539988
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Jul 5 14:56:45 2015 -0400
+commit a22bb87
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 17 13:27:53 2015 +0200
 
-    prefs: fix memory leak reading capture columns
+    Update .mailmap
     
-    Change-Id: I925ec3329cc099a5f3d2ae66e43b06fc52309dc8
-    Reviewed-on: https://code.wireshark.org/review/9504
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ib61ed614c3cfb6885d81a61d82b0974beba786f5
+    Reviewed-on: https://code.wireshark.org/review/10068
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit ef1f0c1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 5 16:31:40 2015 -0700
+commit c32c1f0
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Aug 18 18:51:32 2015 +0100
 
-    Use space indentation consistently.
+    IPv6 Jumbogram expert info cleanup
     
-    Change-Id: I1af52157a8c7383981c514d9dddea3b7186dbe6d
-    Reviewed-on: https://code.wireshark.org/review/9509
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic06e50a30330758d6ed0b1b1d9ba0d7f74929a9a
+    Reviewed-on: https://code.wireshark.org/review/10111
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit fbd81bf
-Author: Tyson Key <tyson.key@gmail.com>
-Date:   Sun Jul 5 18:53:23 2015 +0000
+commit 8352ff1
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 16 21:02:35 2015 +0100
 
-    Associate the file-mp4 dissector with the audio/mp4 MIME type
+    Add IPv6 examples to capture/display filters
     
-    Bug:11338
-    Change-Id: Ied463ea5ef65bcc657e09c0d5f7983cb4dcd581a
-    Reviewed-on: https://code.wireshark.org/review/9503
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 1aecd88
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jul 5 22:39:01 2015 +0200
-
-    rtd_table.h: fix parameter 'rtd_stat_table' not found in the function declaration [-Wdocumentation]
+    Also use TEST-NET-1 for IPv4 examples.
     
-    Change-Id: Ie31efc352b5f51808aa9f3d1e6b00734ccc38bfe
-    Reviewed-on: https://code.wireshark.org/review/9507
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Replaced note using comma with parentheses
+    
+    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 3658a04
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jul 5 22:37:26 2015 +0200
+commit fc1b48f
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Wed Aug 19 10:47:57 2015 +1000
 
-    RPC: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    DVBCI: fix typo in comment
     
-    Change-Id: Iea6529d8fb43d1cea723c92b3b348029c39c0c8d
-    Reviewed-on: https://code.wireshark.org/review/9506
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I0f6e57b7f16526e7c1b96fb8bd69c003c89b7f42
+    Reviewed-on: https://code.wireshark.org/review/10119
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit cfe7dc8
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Jul 5 11:32:44 2015 -0400
+commit 0e8cc9a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 12 14:09:35 2015 -0700
 
-    80211 utils: free nl messages after use
+    UDP multicast stream dialog.
     
-    Valgrind picked this up as a very large memory leak on systems with libnl,
-    since the GUI polls this code regularly and was leaking several nl messages
-    each time.
+    Add the UDP multicast stream dialog. Abuse TapParameterDialog a bit more
+    so that we can edit parameters.
     
-    Change-Id: Ie6b32e094d90183a16fb187adea430c4b43c208c
-    Reviewed-on: https://code.wireshark.org/review/9502
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    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 c00e469
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sun Jul 5 12:47:15 2015 +0100
+commit 9a3d4e6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 18 10:36:04 2015 -0700
 
-    Fix Windows CMake generated installer to include snmp mibs
+    Move an include guard.
     
-    Wireshark.nsi requires SMI_DIR to point to the base of the SMI directory
-    but FindSMI.cmake doesn't set it.  Set it in the main CMakeLists.txt
+    Move an include guard to match our conventions (and make it easier
+    to spot).
     
-    Change-Id: Id667341273d6abb0d2d64ef91cc62d1ce3f42a83
-    Reviewed-on: https://code.wireshark.org/review/9499
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Change-Id: I4bad61a0194219f69217713d051e0ff53ff5a76a
+    Reviewed-on: https://code.wireshark.org/review/10110
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9b180e5
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jul 5 08:09:54 2015 -0700
+commit 2eaaffe
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 18 21:56:52 2015 +0200
 
-    [Automatic update for 2015-07-05]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
+    simple_statistics_dialog(.h): fix parameter 'st_table' not found in the function declaration [-Wdocumentation]
     
-    Change-Id: I7c644cb36af2a5c81efc4c22f1355b1a5e599b49
-    Reviewed-on: https://code.wireshark.org/review/9500
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I69814a05fa6ad65315e36fa75ae60634e934be5c
+    Reviewed-on: https://code.wireshark.org/review/10117
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 845998d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 4 13:14:56 2015 -0700
+commit 6ed3e08
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 18 21:10:13 2015 +0200
 
-    Mark another function as printf-like.
+    pcapng(file): fix duplicate break
     
-    Change-Id: I2aa13265da1efbf7edfe693c9b434940462ca237
-    Reviewed-on: https://code.wireshark.org/review/9497
+    Change-Id: Ife7170c050402ab94d368acc6c233714be764824
+    Reviewed-on: https://code.wireshark.org/review/10114
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 59017a2
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sat Jul 4 12:28:53 2015 -0400
+commit 857b144
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 18 21:15:27 2015 +0200
 
-    diameter: convert some GArrays to epan wmem_arrays
+    Qt: Syntax check display filter when fields changed
     
-    Fixes ~30KB of memory leak on startup and a handful of "reachable" memory as
-    well.
+    Change-Id: I7179d7918e7958373806fb9627a36554ab4b9ddc
+    Reviewed-on: https://code.wireshark.org/review/10115
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 4abec47
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 18 12:14:07 2015 -0700
+
+    Clean up handling of time stamps.
     
-    Change-Id: Ia1c633b65fa282c7bbe9d3772dae58643ef15c0e
-    Reviewed-on: https://code.wireshark.org/review/9495
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Use common code for all time stamps, so it's handled the same for the
+    Packet Block, Enhanced Packet Block, and Interface Statistics Block.
+    
+    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.
+    
+    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: I19b2c3227a3ca1e93ec653f279136aa18687581f
+    Reviewed-on: https://code.wireshark.org/review/10116
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 6e62ad5
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sat Jul 4 12:08:08 2015 -0400
+commit ea7cf08
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 18 11:51:36 2015 -0700
 
-    scsi-osd: initialize the entire extra_data struct
+    Cast away 64 -> 32 narrowing complaints.
     
-    Bug: 11337
-    Change-Id: If240b581c73e1cfb2aae1e85855170387677eb32
-    Reviewed-on: https://code.wireshark.org/review/9494
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    "secs" in an nstime_t is a time_t; cast the calculated seconds portion
+    to time_t.
+    
+    Change-Id: Ieaad4c18bb21384a5781f50eadd3a537b414a369
+    Reviewed-on: https://code.wireshark.org/review/10113
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 4e0002e
-Author: Richard Sharpe <rsharpe@samba.org>
-Date:   Thu Jul 2 21:23:10 2015 -0700
+commit 7a096c3
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Aug 18 15:58:34 2015 +0200
 
-    Add support for dissecting Notify Responses based on the SMB2 spec. Tested with
-    a capture I have. Also add to small suggested changes.
+    Init values set (found by American Fuzzy Lop).
     
-    Change-Id: Iaa031f5e97e94778ea7fa00fab24b7c0dfadd4de
-    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/9477
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 4a2fe58
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 4 11:02:51 2015 -0400
+commit f49eb37
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 18 10:32:16 2015 -0700
 
-    Add "custom" dissector table tab to Internals->Dissector Tables dialog
+    Update comment.
     
-    Bug: 11334
-    Change-Id: I2af3e41643e4e92593ed0cfe070c4f7bcb450a06
-    Reviewed-on: https://code.wireshark.org/review/9493
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I51e14a280ba898a321455168ac8ded1853f55e64
+    Reviewed-on: https://code.wireshark.org/review/10109
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c5ec50e
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Jul 5 10:55:49 2015 +0200
+commit 97f3c1b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 18 19:18:07 2015 +0200
 
-    Add missing C++ header
+    Qt: Reload widgets using prefs when reloading Lua plugins
     
-    This fixes:
-    ui/qt/wireshark_application.cpp:588:5: error: 'sort' is not a member of 'std'
-         std::sort(sgi_list.begin(), sgi_list.end(), qActionLessThan);
+    Widgets using prefs must be closed because the prefs may have
+    been free'd when reloading Lua plugins.
     
-    Change-Id: I70058f0fcbabb0279bed5c62d09d55d88bda0fd4
-    Reviewed-on: https://code.wireshark.org/review/9492
-    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: I4b79b7aff18d7923c77a9eb05acadc29b156edbf
+    Reviewed-on: https://code.wireshark.org/review/10108
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit ebae0c9
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jul 3 21:14:53 2015 -0400
+commit 8fcdcb9
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Aug 16 12:37:11 2015 -0400
 
-    store tcp/udp port names in epan scope
+    Improve file merging for mergecap and wireshark
     
-    This causes them to be freed on shutdown, cleaning up ~800KB of "reachable"
-    memory according to valgrind. The fact that we even need to construct these as
-    value_strings is questionable IMHO, but that's a problem for a later date.
+    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:
     
-    Switch epan_scope to the BLOCK allocator now that we're using it for so much
-    more, this gives a small but measurable increase in startup time.
+     * Removed the '-T' encap type option from mergecap, as it's illogical for
+       mergecap and would complicate common merge code.
     
-    Change-Id: I187460b769e28da3c6629abac1d9196727ae7dde
-    Reviewed-on: https://code.wireshark.org/review/9483
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@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 dd8311d
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sat Jul 4 01:12:56 2015 -0400
+commit a3c175a
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 18 16:47:08 2015 +0200
 
-    Lua: split init/cleanup routines
+    Add casts to passify buildboot.
     
-    The epan init routines have been split up into init vs. cleanup, where the
-    init routines are only invoked when a file is opened, and the cleanup ones are
-    invoked multiple times, such as on a re-scan of packets.
+    Change-Id: I8aa4695f1f8dfdfc5bfcd4fb4f36e1b332581d5a
+    Reviewed-on: https://code.wireshark.org/review/10106
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit db87e62
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Aug 18 16:29:19 2015 +0200
+
+    pcap: add init value.
     
-    Since the Lua API's Proto.init() callback is supposed to be invoked at both
-    init and cleanup times, the wslua code now invokes it in both of epan's init
-    and cleanup routines.
+    Found compiling with gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04).
     
-    Change-Id: I51a4d8bc02630a4d2db5408c37f7eb8f6e0ce88c
-    Reviewed-on: https://code.wireshark.org/review/9491
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: I21bd3a5ab3365f0065c919aba7d6bd00b878d041
+    Reviewed-on: https://code.wireshark.org/review/10105
     Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit c6f4112
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 3 19:38:54 2015 -0700
+commit da6f48d
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Tue Aug 18 15:34:53 2015 +0200
 
-    Do error checking on simple_error_message_box() calls and fix errors.
+    Fix typo in makefile
     
-    It's a printf-like routine, so give it the right declaration.  Fix
-    errors that this finds.
+    Typo:
+    file.pcapng.c -> file-pcapng.c
     
-    Change-Id: I7e8c100ff9e16ba89743ce744cbf548aae705b77
-    Reviewed-on: https://code.wireshark.org/review/9487
-    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 b8d96a4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 3 19:31:28 2015 -0700
+commit 22364bd
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Feb 15 19:05:44 2014 +0100
 
-    Squelch a compiler warning.
+    File-format: BTSNOOP: Add option to dissect next layers
     
-    Some systems still offer the old V7 index()/rindex() routines, in
-    addition to the standard strchr()/strrchr() routines, so don't use
-    "index" as a variable.  (Maybe the folks at Center 127 were thinking of
-    the PL/I index() function, but that's more like strstr(), so it wasn't a
-    good choice of name.)
+    Show next layers of each packet.
     
-    Change-Id: I6193a93684c0684c83357def3d76e0dbd808e29b
-    Reviewed-on: https://code.wireshark.org/review/9485
-    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 c60b8ea
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jul 3 21:49:14 2015 -0400
+commit dd57c6b
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Fri Jun 26 15:40:22 2015 +0200
 
-    ansi_map: fix float literals missing f suffix
+    File-format: Add PCAP and PCAPNG dissectors
     
-    Should fix OSX buildbots
+    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.
     
-    Change-Id: I466d4cdc0c4b52a15cadb9b5d429561ca68cc913
-    Reviewed-on: https://code.wireshark.org/review/9484
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I833b2464d11864f170923dc989a1925d3d217943
+    Reviewed-on: https://code.wireshark.org/review/10089
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3243b6f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Jun 27 15:33:42 2015 -0700
+commit c05df99
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 17 20:34:47 2015 -0400
 
-    asn1: split off cleanup routines
+    Add udp_dissect_pdus.
     
-    General approach:
+    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.
     
-     1. Split allocation (e.g. g_hash_table_new) from deallocation
-        (g_hash_table_destroy) into functions named "init" and "cleanup".
-     2. Remove guards that test whether the hash tables are set as
-        init is always called before cleanup.
-     3. Remove setting hash tables to NULL after destruction.
-     4. Copy register_init_routine function call and change init to cleanup.
-     5. Add cleanup function that calls reassembly_table_destroy if there
-        is a reassembly_table_init function.
+    Used DNP3 as a guinea pig since "multiple PDU support" over UDP was just added.
     
-    Some templates were modified as follows:
-    
-     - snmp: split renew into init+cleanup, but keep renew for the uat_new
-       callback.
-     - ldap,ros: Rename init to cleanup as there was no initialization.
-     - camel: remove init function from header, make it static. Remove debug
-       print.
-     - tcap: remove unused ssn_range assignment.
+    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 db5b786
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Jun 6 19:37:20 2015 +0200
+
+    Bluetooth: Update Assign Numbers
     
-    Files in epan/ were regenerated using cmake && make asn1
+    +18 ATT attributes to be implemented (IPS 1.0 - 19 May 2015, etc.)
     
-    Change-Id: Idac16ebf0ec304e0c8becaab5d32904e56eb69b9
-    Reviewed-on: https://code.wireshark.org/review/9136
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ib30ea20fe9b32a4be842f01ad5b8e8ee081a14ff
+    Reviewed-on: https://code.wireshark.org/review/10095
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7b33634
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jun 30 01:11:10 2015 +0200
+commit a50a49e
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Thu Jan 22 08:27:40 2015 +0100
 
-    plugins: add cleanup routines
+    Bluetooth: ATT: Add some remaining attributes
     
-    Destroy the reassembly tables on exit, fix memleak in profinet
-    dissector.
+    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).
     
-    Change-Id: Id34dbfde42fe715513997452f87cd4fdc328e294
-    Reviewed-on: https://code.wireshark.org/review/9229
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3ad9768
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 07:31:18 2015 -0700
+commit df17ff3
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 17 13:18:30 2015 +0200
 
-    ssl,dtls: split init/cleanup routines
+    Qt: Fix use-after-free pattern
     
-    Minor functional change: instead of an empty hash table, now the
-    ssl_session_hash and ssl_crandom_hash structures point will be set to
-    NULL when files are closed.
+    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.
     
-    API change: drop the ssl_keylog_file parameter from ssl_common_init,
-    add a new ssl_common_cleanup parameter instead.
-    
-    Change-Id: I65efe71f8347fe9685359f8ed70cfb9673712421
-    Reviewed-on: https://code.wireshark.org/review/9226
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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 ba9aa30
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 15:15:07 2015 +0200
+commit 9e72779
+Author: Pascal Artho <pascalartho@gmail.com>
+Date:   Tue Aug 18 08:43:06 2015 +0200
 
-    Split more init routines into init/cleanup functions
+    Preparation Host Flows: Dissector Packet ICMP and ICMPv6
     
-    This patch is partially automatically generated, but are modified
-    manually. In particular, assignments and function calls have been
-    audited.
+    see https://code.wireshark.org/review/#/c/9976/
     
-    Some debugging comments and ifdef'd prints have been removed. The
-    lookup tables of the dcm and sip dissectors are now cleared. It is only
-    called on reopening files anyway.
+    Change-Id: Ic301db4deea1a02b9e08c123b3e21e70817a2c85
+    Reviewed-on: https://code.wireshark.org/review/10097
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 318c3a5
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Jul 22 17:38:51 2015 +0200
+
+    Qt: Add another C++ missing header: <algorithm> for std::sort()
     
-    The isakmp dissector is modified to use g_hash_table_new_full for
-    destruction of its keys and values.
+    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);
     
-    Fix a memleak in ipsec dissector when libgcrypt is not enabled.
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 0375244
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Jul 18 18:25:36 2015 +0200
+
+    Qt/Minimap: Fix for Qt < 4.8
     
-    Generated using
-    https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=3c6128ee266024d164650955f93c7740484abd68
-    (with AUDIT = True).
+    I hope it is quite right solution.
     
-    Change-Id: I3fd910bdee663842ac0196334fe0189b67e251b0
-    Reviewed-on: https://code.wireshark.org/review/9225
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ia9c883a832ddd03985eda37a9b344c4d7c8135e2
+    Reviewed-on: https://code.wireshark.org/review/10091
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit ea46cf4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 13:18:58 2015 -0700
-
-    Split init of misc dissectors into init/cleanup functions
-    
-    Convert remaining dissectors to use cleanup routines when possible.
-    (Single-)linked lists require NULL, so do reset their pointers to NULL.
-    
-    Generated with
-    https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=69af86e6c2cf965ba3d7f9636b647b195f0b7d57
-    (with AUDIT = ALWAYS_EMIT_CLEANUP_CODE = True)
-    
-    Remaining dissectors which did not need further changes:
-    epan/dissectors/packet-aeron.c
-    epan/dissectors/packet-bootp.c
-    epan/dissectors/packet-brdwlk.c
-    epan/dissectors/packet-drda.c
-    epan/dissectors/packet-etch.c
-    epan/dissectors/packet-fix.c
-    epan/dissectors/packet-fw1.c
-    epan/dissectors/packet-lbm.c
-    epan/dissectors/packet-ldss.c
-    epan/dissectors/packet-simulcrypt.c
-    epan/dissectors/packet-spdy.c
-    epan/dissectors/packet-starteam.c
-    epan/dissectors/packet-udp.c
-    
-    Change-Id: Idcacfea6a5de38d40e67db4cdcd0452ad9f9a6a9
-    Reviewed-on: https://code.wireshark.org/review/9228
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+commit e25562b
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Jul 20 11:09:06 2015 -0400
 
-commit 7ce77c6
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 07:35:00 2015 -0700
+    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
 
-    Split four more init routines into init/cleanup
+    rewrite the H1 dissector
     
-    Three of them are trivial movements, the smb-sidsnooping is an odd one.
-    Ronnie Sahlberg disabled the sid_name_snooping feature on 9 July 2007.
-    There is a preference to override it though... For now add a TODO
-    marker and ensure that the hash tables are always initialized.
+    * 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: I61f5e215c9fa72a6785fb48eaa2d50c1975d7483
-    Reviewed-on: https://code.wireshark.org/review/9227
+    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 f5340b2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 16:10:51 2015 -0700
+commit acc0c14
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 17 23:06:21 2015 -0400
 
-    Split init routine into init/cleanup for more dissectors
+    Eliminate proto_tree_add_text from XMPP dissectors.
     
-    This patch converts some dissectors using g_hash_table_foreach_remove.
-    
-     - 9p: drop no-op free func.
-     - nfs: use g_hash_table_new_full such that a destructor function can
-       be used. Drop NULL check since g_free can handle these just fine.
-     - nlm: use g_hash_table_new_full such that a destructor function can
-       be used. Simplify "matched" destruction by replacing the wrapper by
-       a direct g_free call.
-    
-    Change-Id: I455e7f0ad4e47e70dae05af7233fdcdebf583f9f
-    Reviewed-on: https://code.wireshark.org/review/9224
+    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 126e02c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 16:02:45 2015 -0700
+commit 8fd7197
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Aug 17 23:06:50 2015 -0400
 
-    Call reassembly_table_destroy and move g_hash_table_destroy
-    
-    This patch moves g_hash_table_destroy calls from the init routine to
-    the cleanup routine. Besides that, the conditional check for the hash
-    table has been removed, assuming that init is always paired with a
-    cleanup call.
-    
-    If reassembly_table_init is found, a reassembly_table_destroy call is
-    prepended to the cleanup function as well.
-    
-    Comments have been removed from the init function as well as these did
-    not seem to have additional value ("destroy hash table" is clear from
-    the context).
-    
-    The changes were automatically generated using
-    https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=4d11f07180d9c115eb14bd860e9a47d82d3d1dcd
-    Manually edited files (for assignment auditing): dvbci, ositp, sccp,
-    tcp.
+    Lua: add FT_PROTOCOL as a ProtoField type
     
-    Other files that needed special attention due to the use of
-    register_postseq_cleanup_routine:
+    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 300bb98
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Aug 17 16:50:39 2015 -0400
+
+    Install GTK3 too.
     
-     - ipx: keep call, do not add another cleanup routine.
-     - ncp: remove empty mncp_postseq_cleanup. mncp_hash_lookup is used
-       even if a frame is visited before (see dissect_ncp_common), hence
-       the hash table cannot be destroyed here. Do it in cleanup instead.
-     - ndps: add cleanup routine to kill reassembly table, but do not
-       destroy the hash table as it is already done in ndps_postseq_cleanup.
+    It was in the list of packages but not in the final command line.
     
-    Change-Id: I95a72b3df2978b2c13fefff6bd6821442193d0ed
-    Reviewed-on: https://code.wireshark.org/review/9223
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I361e660cc4ac91121314a3f8a7388b48fb2c61b7
+    Reviewed-on: https://code.wireshark.org/review/10081
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 80f7ee0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 13:06:31 2015 +0200
+commit c57f585
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 17 10:47:46 2015 -0700
 
-    Call reassembly_table_destroy for some dissectors
-    
-    This patch adds reassembly_table_destroy calls as cleanup function for
-    dissectors which have a simple init routine that just calls
-    reassembly_table_init (comments are ignored).
+    Fixup tap listener registration.
     
-    The changes were automatically generated using
-    https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=4cc0aec05dc67a51926a045e1955b7a956757b5e
-    (with the if and assignment parsers disabled).
+    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_.
     
-    The only difference from the autogenerated output is that the XXX
-    comments from the init routines in smb-pipe and tds dissectors are kept.
+    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 41cb3bd
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 13 22:44:29 2015 +0200
+
+    h1: remove if (tree) checks, indent according to the modelines
     
-    Change-Id: I64aedf7189877247282b30b0e0f83757be6199e7
-    Reviewed-on: https://code.wireshark.org/review/9222
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I878aa23b5d718653b9039aeb94a0ece88c9c03cf
+    Reviewed-on: https://code.wireshark.org/review/10079
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 750babc
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jul 2 17:46:27 2015 -0400
+commit c78d7c8
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 13 22:32:43 2015 +0200
 
-    rpc: use direct hashing rather than malloced ints
+    h1: don't THROW() an exception from a dissector
     
-    Equivalent but saves some allocations and is slightly simpler.
+    leaving the parsing loop should be enough in this case...
     
-    Change-Id: Id0fde980e11256018641d8fb39330c07f33ee3f5
-    Reviewed-on: https://code.wireshark.org/review/9474
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ic250961aeb4d3cfcd74ee8caacb59657c32444de
+    Reviewed-on: https://code.wireshark.org/review/10078
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit d52837d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Jun 24 01:54:19 2015 +0200
+commit ec1d25d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 17 22:00:57 2015 +0200
 
-    packet: add cleanup routines support
+    Qt: Avoid double call to toUtf8()
     
-    Currently reassembly tables are not freed on shutdown. This makes
-    memleak debugging more difficult due to noise. Support cleanup
-    routines that can do smarter things.
+    Change-Id: I4d31063b4aa37e4b0a68b5dbc17be22ef2cd151a
+    Reviewed-on: https://code.wireshark.org/review/10077
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 68c5172
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 17 21:39:41 2015 +0200
+
+    Qt: Always rebuild columns when fields changed
     
-    After this change, "init" routines are not called anymore when
-    closing files. Further changes should split init routines to
-    cleanup routines as needed.
+    The columns must be recreated even if no capture file is loaded
+    because custom columns may have reference to deregistered fields.
     
-    Change-Id: Ib0b2cef6dd9c16905259063ac2c2fdfb7e066be6
-    Reviewed-on: https://code.wireshark.org/review/9135
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I4ed7345b3200e5af211695f1a6511ee229d5f13c
+    Reviewed-on: https://code.wireshark.org/review/10076
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit fdb8502
+commit 0368b82
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jun 5 13:17:13 2015 -0700
+Date:   Wed Aug 12 15:11:39 2015 -0700
 
-    Add ServiceResponseTimeDialog.
+    Improve multicast address checking.
     
-    Add ServiceResponseTimeDialog as a subclass of TapParameterDialog,
-    similar to StatsTreeDialog. Add initial plumbing for statistics menu
-    items and command line invocation.
+    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.
     
-    Don't append "..." to menu item names. Don't add menu icons. In each
-    case this avoids repetitive UI clutter.
-    
-    Change-Id: I463b95c93090160bb81d2e80b16aad389dc0bd6c
-    Reviewed-on: https://code.wireshark.org/review/8864
+    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>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7fdc534
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jun 24 20:46:42 2015 -0400
+commit 821ea20
+Author: Selvamegala <sselvamegala@gmail.com>
+Date:   Sat Aug 8 20:35:30 2015 -0400
 
-    Convert BOOTP/DHCP tap stats to new "generic stat API".
+    Add Decryption support for Lwmesh
     
-    Change-Id: I0edc3909516452e6497a050b4617f9aafcea2688
-    Reviewed-on: https://code.wireshark.org/review/9112
+    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 a8ff1e2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jun 23 08:53:17 2015 -0400
+commit b660fd4
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Aug 17 11:12:12 2015 -0400
 
-    Create very basic "generic" stat tap API to create a "GUI" independent table.
-    
-    A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API.  The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there.
+    Pcapng: set interface description's tsprecision when reading file
     
-    Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt)
+    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 2eec7fe
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 17 13:35:40 2015 +0200
+
+    BPDU: Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab
-    Reviewed-on: https://code.wireshark.org/review/9110
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I91cc96f92ae2e6b07144120d70f8db5b7ad45fce
+    Reviewed-on: https://code.wireshark.org/review/10070
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 09ea473
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jul 3 22:16:51 2015 +0100
+commit 77193ef
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 17 06:00:27 2015 +0100
 
-    bootp: try to fix OSX builtbot
+    dissect_ip_heur(): Remove TODO (done)
     
-    Change-Id: I0204b6c947e302a6f38b43593e19c6b816a180a4
-    Reviewed-on: https://code.wireshark.org/review/9482
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I0c36179b63f5d60037de80badfea352c903c2525
+    Reviewed-on: https://code.wireshark.org/review/10065
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ecc29ee
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jul 3 18:28:22 2015 +0100
+commit 9a6e36d
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Aug 16 20:06:50 2015 -0400
 
-    DHCP: Lookup OUI for TR111 suboption.  Also add Ubiquisys OUI to oui_vals.
+    Remove proto_tree_add_text from packet-xml.c
     
-    Change-Id: I49b833ee4df01d37cfabb11fd177c00f34f41eb4
-    Reviewed-on: https://code.wireshark.org/review/9481
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Required introducing packet_info* to xml_frame_t structure.
+    
+    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: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit bd6065f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Jul 3 10:53:51 2015 -0400
+commit af62264
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 13 16:08:18 2015 +0200
 
-    [smb2] Update some comments
+    DNP3: add support for udp multi frame packets.
     
-    Change-Id: I95dc8743b6db579eb197bd64ab2f26cf43ebc308
-    Reviewed-on: https://code.wireshark.org/review/9480
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    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 363511c
+commit 2ba0ea3
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 19:51:22 2015 -0700
+Date:   Sun Aug 16 12:33:31 2015 -0700
 
-    Move some frame control field #defines to a header and use them elsewhere.
+    Fix the conversion of milliseconds to seconds and nanoseconds.
     
-    Move a bunch of #defines that involve the frame control field to
-    packet-ieee80211.h and have the WLAN statistics tap use them rather than
-    hardcoded numbers.
+    1 millisecond = 1000000 nanoseconds, not 1000 nanoseconds, and
+    nstime->nsecs is nanoseconds, not microseconds.
     
-    Change-Id: I893cc50e546af67c910755357cefd86c39a1c783
-    Reviewed-on: https://code.wireshark.org/review/9476
+    Change-Id: I6925ff80f6443015f83ca00bad2a347d10eadd7c
+    Reviewed-on: https://code.wireshark.org/review/10060
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit df5a315
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 16:17:20 2015 -0700
+commit 8b8d378
+Author: Petr Gotthard <petr.gotthard@honeywell.com>
+Date:   Sun Aug 16 16:50:52 2015 +0200
 
-    Fix address resolution for columns.
+    AMQP 1.0: Fix OSX build errors
     
-    Have address_to_name() be a routine that takes an address and returns a
-    string with a "sufficiently long" lifetime for use in columns, using the
-    address type's addr_name_res_str routine for most address types, rather
-    than having a too-small set of address types wired into it.  It replaces
-    both the internal solve_address_to_name() routine and get_addr_name(),
-    and can, for example, handle the special WLAN address types rather than
-    leaving them unresolved even with an ethers file.
+    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: Id09bc412adf5d2752155650a14a77c5378af2e42
-    Reviewed-on: https://code.wireshark.org/review/9475
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 ed21afa
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 2 22:57:34 2015 +0200
+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 3755bc6
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 16 07:35:24 2015 +0100
 
-    LLDP: fix dissection of Power Class field
+    Fix IP Destinations stats tree
     
-    Bug: 11330
-    Change-Id: I865fe694706606c091a32f58a35658800a9dacc6
-    Reviewed-on: https://code.wireshark.org/review/9473
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    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 bcf7533
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Apr 3 09:56:18 2015 -0400
+commit c643cbf
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sat Aug 15 17:05:17 2015 -0700
 
-    Add proper "Decode As" mechanism for NFS file handles instead of preference.
+    Run abicheck commands at compile time.
     
-    Change-Id: I8509b9290a7255a91fa5f10a8312ca80eb94ead6
-    Reviewed-on: https://code.wireshark.org/review/7900
-    Reviewed-by: Cal Turney <cturney@charter.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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: I6e4d691e24c73ea05d638a0f897f570541c84e38
+    Reviewed-on: https://code.wireshark.org/review/10052
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 7151029
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 2 19:57:52 2015 +0200
+commit 8d1a549
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 16 08:10:40 2015 -0700
 
-    PEEKREMOTE: ensure to initialize mandatory fields in info_11ac structure
+    [Automatic update for 2015-08-16]
     
-    Bug: 11326
-    Change-Id: I5a438bda7448f6b6b9959bdc03b0252b3cf22697
-    Reviewed-on: https://code.wireshark.org/review/9469
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Update manuf, services enterprise-numbers, translations, and other items.
+    
+    Change-Id: Idb8a2cff075a1ffe5e3cd1d6f4d3fb1b6c357cdb
+    Reviewed-on: https://code.wireshark.org/review/10055
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit ccd552a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 12:03:42 2015 -0700
+commit b1d33db
+Author: Petr Gotthard <petr.gotthard@honeywell.com>
+Date:   Sat Jul 4 01:19:02 2015 +0200
 
-    Remove more unnecessary null checks.
+    AMQP 1.0: Refactor to fix parsing of timestamps
     
-    These routines are called from dissect_bthci_evt(), which ensures that
-    bluetooth_data is non-null, and passes that non-null value to the
-    routines.
+    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()
     
-    Should fix CIDs 1306908 and 1306911.
+    (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.
     
-    Change-Id: Ie25de02f36bda9a9ae25ced034e758fc7f745681
-    Reviewed-on: https://code.wireshark.org/review/9472
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 7e461a9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 11:56:19 2015 -0700
-
-    Remove check for null bluetooth_data.
+    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.
     
-    It's guaranteed to be non-null at that point. as noted by Coverity.
+    (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
     
-    Should fix CID 1306904.
+    I propose to make this mechanism less table-driven (more explicit and more
+    flexible) and allow all alternates permitted by the standard.
     
-    Fix indentation while we're at it.
+    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: Michael Mann <mmann78@netscape.net>
+
+commit 8fa4016
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 15 18:07:10 2015 +0100
+
+    make-taps.pl: Remove duplicate slash in pathname
     
-    Change-Id: I414844e9b6f9f01e215f42ba087a56b0544d289a
-    Reviewed-on: https://code.wireshark.org/review/9471
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id5e13df24409267c405cdd05479610a8ba898289
+    Reviewed-on: https://code.wireshark.org/review/10047
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 90af3de
-Author: anilkumar911 <anilkumar911@gmail.com>
-Date:   Mon Jun 29 16:26:56 2015 +0530
+commit 2e2129a
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Aug 15 09:39:05 2015 -0400
 
-    Interpret reserved fields netscaler header.
+    Conversion of random proto_tree_add_text calls.
     
-    Change-Id: I64d6ae733bda880f5afbe1a755799823d835bfa4
-    Reviewed-on: https://code.wireshark.org/review/9466
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    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: Michael Mann <mmann78@netscape.net>
 
-commit 622be70
+commit 8b45727
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 11:25:59 2015 -0700
+Date:   Sat Aug 15 11:34:46 2015 -0700
 
-    Zero out the nss array when we don't have the 802.11ac information we need.
+    Un-reference actions after adding them to an action group.
+    
+    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.
     
-    Change-Id: I576be8c1a1badf6befe90a226f83e8d03f8326a7
-    Reviewed-on: https://code.wireshark.org/review/9470
+    Also, rename "menu_item" to "menu_action", to indicate that it's an action.
+    
+    Change-Id: I54543dcc2e6c3b341a9f584fe1b6099a134771b3
+    Reviewed-on: https://code.wireshark.org/review/10049
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit cd69772
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 2 19:48:42 2015 +0200
+commit 1b46738
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 11:20:36 2015 -0700
 
-    ixveriwave: fix what seems to be a copy/paste error
+    Do the "plugin" menu stuff in one pass.
     
-    Change-Id: I79fc9b11fcdd54e0644d01b34a7f37644c85ad0f
-    Reviewed-on: https://code.wireshark.org/review/9468
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Also, use g_strconcat() in other places where we prepend / to action
+    names.
+    
+    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: Iee876866730cada64428df17f1f3c4552cc3ac93
+    Reviewed-on: https://code.wireshark.org/review/10048
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit cc12a6a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 2 19:02:11 2015 +0200
+commit c222719
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 10:49:51 2015 -0700
 
-    RPC: do not add a protocol without dissection function to the dissector table
+    Fix creation of menu actions in ws_menubar_create_action_group().
     
-    This seems to be a typo
+    Action names are expected to begin with /, so prepend a /.
     
-    Bug: 11327
-    Change-Id: I0182003b77f0deba9421002f5626175af30125f5
-    Reviewed-on: https://code.wireshark.org/review/9467
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 9421af3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jul 2 12:19:02 2015 +0200
-
-    Try to fix: warning C6244: Local declaration of 'airpcap_if_list' hides
-    previous declaration.
+    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: Id0c3b74ac52c427d9c1efdf749dc410bc5bb450f
-    Reviewed-on: https://code.wireshark.org/review/9460
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ic45412399078796359649cc876d2c8bfc9a790c6
+    Reviewed-on: https://code.wireshark.org/review/10046
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 523ce15
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 2 10:48:58 2015 +0200
+commit 88f334b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 15 19:31:51 2015 +0200
 
-    Do not try to display a value_string for FT_FRAMENUM type
-    
-    The hfinfo->strings pointer is used to store a ft_framenum_type_t
+    Fixed a comment in cleanup_dissection
     
-    Bug: 11325
-    Change-Id: Ia6ee1bdd4f1e6ff93907e6107fcecab56c0320de
-    Reviewed-on: https://code.wireshark.org/review/9458
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I445e09803023d1a22a663ba0501c013f113b5bfe
+    Reviewed-on: https://code.wireshark.org/review/10045
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit dcd7368
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 2 07:32:52 2015 -0400
+commit 5f13933
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 15 19:25:13 2015 +0200
 
-    Update Debian symbols for recent packet API additions.
+    Lua: Free true_false_string values at reload
     
-    Change-Id: Ib6e5a48fa0b0802c920e68d3dc7d62362818d36b
-    Reviewed-on: https://code.wireshark.org/review/9465
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I8ab194bf094e82f08ddafb0a1451aec42989b93d
+    Reviewed-on: https://code.wireshark.org/review/10044
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 8b7f5f7
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jul 2 13:19:07 2015 +0200
+commit 0a16350
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 15 17:55:27 2015 +0100
 
-    Update libwireshark0.symbols
+    Add a newline for readability
     
-    Change-Id: I04cdba9633d3fc131ecd9dc218bc6dd458378a35
-    Reviewed-on: https://code.wireshark.org/review/9464
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I7dbfa8f82454bd93ca5a66f22c29982923803918
+    Reviewed-on: https://code.wireshark.org/review/10043
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 88302f2
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jul 2 13:02:12 2015 +0200
+commit 2bc6f01
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 09:26:45 2015 -0700
 
-    Try to fix OSX build boot
-    lemon.c:1784: warning: implicit conversion shortens 64-bit value into a 32-bit value
-    lemon.c:1790: warning: implicit conversion shortens 64-bit value into a 32-bit value
-    1790: warning: implicit conversion shortens 64-bit value into a 32-bit value
-    1928: warning: implicit conversion shortens 64-bit value into a 32-bit value
-    2707: warning: implicit conversion shortens 64-bit value into a 32-bit value
+    *More* issues.
     
-    Change-Id: Ief1b64009891de6885c2c9a6cb0e290752de889f
-    Reviewed-on: https://code.wireshark.org/review/9463
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ib415582f4bf2529c412bed329b3ee7daccde29b0
+    Reviewed-on: https://code.wireshark.org/review/10042
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 051986c
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Wed Jul 1 18:32:50 2015 +0200
+commit 7f38b65
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Aug 9 08:03:21 2015 -0400
 
-    opcua dissector: Add DefaultXml encoding IDs
+    Don't clear the tcp_analysis if a conversation is not provided to get_tcp_conversation_data().
     
-    Currently only DefaultBinary encoding IDs can be displayed, this commit adds the DefaultXml encoding IDs
+    Callers may need to know information like retransmissions, etc which will be lost.
     
-    Change-Id: I19f3693d3aa03451655058770383222c3828b570
-    Reviewed-on: https://code.wireshark.org/review/9442
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I3f8b6b0aeb308701eb34ae6f6f735af6995ed441
+    Reviewed-on: https://code.wireshark.org/review/9940
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7d1a86d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 2 00:02:16 2015 -0400
+commit 85e2018
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 15 08:29:51 2015 +0100
 
-    Have RPC dissector use real dissector tables for its subdissectors instead of a "homegrown" method.
+    udp: fix minimum jumbo length
     
-    Change-Id: I06d7d4e9747ed8593cf40506cae3a09ae237846b
-    Reviewed-on: https://code.wireshark.org/review/9456
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I5ab4974cc60cdec0c3571bdec815c8cb9e8f7255
+    Reviewed-on: https://code.wireshark.org/review/10040
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit cc7dc03
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 1 23:56:54 2015 -0400
+commit 85d2eef
+Author: Evan Huus <eapache@gmail.com>
+Date:   Tue Aug 11 18:35:45 2015 -0400
 
-    Add support for a "custom" dissector table.  This allows for a "custom" (not UINT or string) key to register dissector handles.
+    btatt: guard against incomplete reassembly
     
-    This was designed for RPC dissectors, but probably has use elsewhere.
+    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: I1bca6b50ba312129a0c4fad5cc3c18cd9297c217
-    Reviewed-on: https://code.wireshark.org/review/9455
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 987cf4c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 1 09:12:09 2015 -0400
+commit 677d4d6
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 9 23:13:06 2015 +0100
 
-    Have RPC program hash table use native gtk hash functions.
+    Add IPv6 Jumbogram support (RFC 2675)
     
-    Change-Id: Ie3c6daf69a1ac155ac09794a5ec87c89bbf0607d
-    Reviewed-on: https://code.wireshark.org/review/9454
+    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: Michael Mann <mmann78@netscape.net>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b68a0ed
+commit 8282540
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 1 07:33:02 2015 -0400
+Date:   Wed Aug 12 09:01:45 2015 -0400
 
-    Replace RPC "dissect_function_t" function signature with "new style" dissector function signature.
+    Eliminate proto_tree_add_text from GSM dissectors.
     
-    This paves the way for using dissector tables.
-    
-    Change-Id: I88ac165ef9aa5bf5c05e1115f7321e18e734d683
-    Reviewed-on: https://code.wireshark.org/review/9453
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 9d8b810
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jun 1 07:56:17 2015 +0200
+commit 8368f3b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 14 20:54:22 2015 -0700
 
-    Lemon: Update lemon tools
-    
-    Update from SQLite trunk (19 April 2015)
-    
-    Add include <config.h>
-    
-    Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_)
-    
-    Fix implicit conversion loses integer precision
-    
-    Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]
+    Update the previously-added comment.
     
-    Fix function declaration isn’t a prototype [-Wstrict-prototypes]
+    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.
     
-    Fix warning: old-style function definition [-Wold-style-definition]
+    I'm not sure whether the right thing happens on Windows.
     
-    Fix trailing whitespace
-    
-    Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake
-    
-    Fix -Wmissing-prototypes Remove unused function (acttab_free)
-    
-    Add basename the filename with only filename (no path...)
-    
-    Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value
+    Change-Id: I1e4c0d510f31f68d574c4d4cf20524666382930f
+    Reviewed-on: https://code.wireshark.org/review/10039
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 463caf8
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 14 18:49:17 2015 -0700
+
+    Discuss alternatives to polling all the recent files every 2 seconds.
     
-    Add "new" version of lempar.c (3 November 2009).
+    Somebody asked about repeated SMB traffic when running the Qt Wireshark:
     
-    LEMPAR: fix trailing whitespace
+    https://ask.wireshark.org/questions/45036/permanent-smb2-traffic-with-1997
     
-    LEMPAR: fix -Wunused-parameter
+    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: I2df7e39c9a6846de26743a981fb76aca423fe813
-    Reviewed-on: https://code.wireshark.org/review/6502
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I3a1d0110fedcdb442ed09c16dab4bf0cb06ca331
+    Reviewed-on: https://code.wireshark.org/review/10038
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit dc6d68c
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Wed Jul 1 18:19:01 2015 +0200
+commit 6137197
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 14 17:19:37 2015 -0700
 
-    opcua dissector: Fix display of status code in error message
+    Fix for the current wireshark.desktop.
     
-    Instead of just displaying the hex representation, use parseStatusCode which adds the textual representation of the status code
+    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: I43b9ff846ef48d727e77cfa247b9dcea7061bbab
-    Reviewed-on: https://code.wireshark.org/review/9441
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I4e59026b5c4f26d02e4a96686e339f8d54bdcd1e
+    Reviewed-on: https://code.wireshark.org/review/10035
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b6c63e2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jul 2 04:42:06 2015 +0000
+commit 0ddae1b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 14 16:19:13 2015 -0700
 
-    Revert "SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error."
+    Put it in the Qt category, not the GTK category.
     
-    This reverts commit b591f07273f4e055a286ca36b6fda5da99952b5d.
+    The default binary, "wireshark", is now a Qt binary; "wireshark-gtk" is
+    the GTK+ one.
     
-    Change-Id: I73e7b6a8ea37b1d5869e785633b74c89d7476b54
-    Reviewed-on: https://code.wireshark.org/review/9457
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ibfec5d796a9796c2588c4305b18dc4506a435228
+    Reviewed-on: https://code.wireshark.org/review/10034
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b591f07
-Author: cturney <cturney@charter.net>
-Date:   Wed Jul 1 16:07:29 2015 -0400
+commit 4c6da64
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Fri Aug 14 10:44:11 2015 -0400
 
-    SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error.
-    
-    In value string table "smb2_ioctl_vals[]" of packet-smb2.c
-    
-    {0x0011C017, "FSCTL_PIPE_TRANSCEIVE" } was placed before
-    {0x00110018, "FSCTL_PIPE_WAIT"}
+    Ident the merge.c/h files by 4 spaces
     
-    which causes "Extended value string 'smb2_ioctl_vals[]' forced to fall back
-    to linear search: entry , value 0x00110018 < previous entry, value
-    0x0011C017"
+    Using 2 spaces for indent is way past its prime.
     
-    Change-Id: I99afe5aa12c031e90bb0bd4c8e8aadfffad0135d
-    Reviewed-on: https://code.wireshark.org/review/9449
-    Reviewed-by: Cal Turney <cturney@charter.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I80caf89f15e576f9aeb25754576a9f18215ccb3c
+    Reviewed-on: https://code.wireshark.org/review/10032
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit a66714b
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Thu Jul 2 05:51:20 2015 +0200
+commit 46d6e8c
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 14:48:49 2015 +0200
 
-    Fix Buffer overrun while writing to 'airpcap_dir_utf16':  the writable
-    size is '520' bytes, but '1042' bytes might be written.
+    Added some missing breaks
     
-    Change-Id: Ic88bc977011eff9ae3c2a4a5ba717e78dbb1171c
-    Reviewed-on: https://code.wireshark.org/review/9452
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I3b2f25832ca878ec3e7f9e4dcce258dc870fc5ad
+    Reviewed-on: https://code.wireshark.org/review/10031
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit ae5172f
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Thu Jul 2 05:41:45 2015 +0200
+commit 7833b93
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 13:46:01 2015 +0200
 
-    Try to fix warning C6340: Mismatch on sign: 'short' passed as _Param_(2) when some
-    unsigned type is required in call to 'printf'.
+    Free all hfi->strings in free_deregister_field
     
-    Change-Id: I3076454502e1c98ac225d33d520be5bbe5172c2a
-    Reviewed-on: https://code.wireshark.org/review/9451
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I6fe78266a2e881fa80e1e3a3423b685d3c1764de
+    Reviewed-on: https://code.wireshark.org/review/10029
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit fa6fb76
-Author: Patrick <patrick.servello@gmail.com>
-Date:   Wed Jul 1 23:30:21 2015 +0100
+commit 12ff69d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 11:02:10 2015 +0200
 
-    fixed spelling errors in Omron FINS packet dissector
+    Qt: Fixed funnel text dialog append and prepend
     
+    Append to end and prepend to start, not the opposite.
     
-    Change-Id: I7cce1769d3e3c2c70d18e247b1e1040b05715c20
-    Reviewed-on: https://code.wireshark.org/review/9448
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ic0e2a7f04a0d9ff18a6fd7063d0550ad35eece1a
+    Reviewed-on: https://code.wireshark.org/review/10027
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 4a8f0e1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 1 23:48:29 2015 +0200
+commit 28b5206
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 09:26:50 2015 +0200
 
-    PMPROXY: avoid doing an invalid memory access when no token was found
+    Free protocol in proto_free_deregistered_fields
     
-    Bug: 11320
-    Change-Id: Ie1fd3f1060e13cf742923aadebe375da4389422a
-    Reviewed-on: https://code.wireshark.org/review/9447
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    This fixes some issues with use-after-free when reload Lua plugins.
+    
+    Change-Id: I63f3fd9ebe8a19008f560e72067f2078f5eaf759
+    Reviewed-on: https://code.wireshark.org/review/10026
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit c445570
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 1 13:11:20 2015 -0700
+commit 8426225
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 07:54:51 2015 +0200
 
-    Give instructions for installin Chcocolatey's Win flex-bison.
+    Qt: Avoid redissect twice when changing fields
     
-    Fix a typo ("and and") while we're at it.
+    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.
     
-    Change-Id: Ib68bbdf0b358f56b36cf53906f105c5ee6493ec4
-    Reviewed-on: https://code.wireshark.org/review/9446
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3cd8c16
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 1 21:16:53 2015 +0200
-
-    NAS EPS: upgrade dissector to v12.9.0
+    This also fixes reloading Lua plugins with Lua fields in custom columns.
     
-    Change-Id: Ic1fa22dee21b71b523ba5fcfc1ea1bf4c8029e6f
-    Reviewed-on: https://code.wireshark.org/review/9445
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I805a765690decbe7434dbf1c33ebd1113e23d16d
+    Reviewed-on: https://code.wireshark.org/review/10025
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 5d8cb03
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 1 21:14:59 2015 +0200
+commit 6cc1c8d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Aug 13 20:05:43 2015 -0700
 
-    3GPP NAS: upgrade dissector to v12.10.0
+    Clean up heuristic checks.
     
-    Change-Id: Ia89e49d098f86450245c73c4d06a4359a25e3d53
-    Reviewed-on: https://code.wireshark.org/review/9444
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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.
+    
+    Clean up some comments.
+    
+    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 b475b0e
+commit 3c5fd58
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 1 11:12:36 2015 -0700
+Date:   Thu Aug 13 16:36:03 2015 -0700
 
-    Sort smb2_ioctl_vals[] numerically.
+    Get rid of trailing whitespace.
     
-    Change-Id: I2d5fd1c640d3ac6fa60d84f2b8080eb7866b2641
-    Reviewed-on: https://code.wireshark.org/review/9443
+    Change-Id: I035fad79dd8d01aa3121732f2a9b07d20cc4384f
+    Reviewed-on: https://code.wireshark.org/review/10023
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 8a00a4b
-Author: Gregor Beck <gbeck@sernet.de>
-Date:   Wed Jul 1 10:35:50 2015 +0100
+commit 814f617
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Aug 13 16:30:51 2015 -0700
 
-    add WERR_INVALID_STATE & WERR_TIMEOUT
+    Update to reflect reality.
     
-    Change-Id: Ie42cca588c9d5e02279083817382ac77f4ed74d6
-    Signed-off-by: Noel Power <noel.power@suse.com>
-    Reviewed-on: https://code.wireshark.org/review/9439
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    The Ixia trailer is a variable-length sequence of TLVs followed by some
+    fixed-length fields.  Describe it as such.
+    
+    Realign some #defines while we're at it.
+    
+    Change-Id: I5fc45a1d44978f1dc1f13e7098c3f797838db7b3
+    Reviewed-on: https://code.wireshark.org/review/10022
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit fa2c41f
-Author: Gregor Beck <gbeck@sernet.de>
-Date:   Tue Oct 2 10:22:49 2012 +0200
+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:   Thu Aug 13 12:02:33 2015 -0400
 
-    add function guid_cmp() to compare guids
+    [config.nmake] Add minor comment about /Zo option for MSVC-2015
     
-    Change-Id: I6e34bcfb2205c1647e82dd396a13b0957532c4ae
-    Signed-off-by: Noel Power <noel.power@suse.com>
-    Reviewed-on: https://code.wireshark.org/review/9438
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ia4ffc543965160aaf6c39dc19764e62e9e82faa8
+    Reviewed-on: https://code.wireshark.org/review/10020
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 7ee967c
-Author: Gregor Beck <gbeck@sernet.de>
-Date:   Thu Sep 13 17:27:51 2012 +0200
+commit cd76cf6
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 13 17:27:10 2015 +0200
 
-    smb2: dissect FSCTL_PIPE_WAIT
+    ieee802.11: changed blurb to stop checkAPI complains.
     
-    Change-Id: Iec4fe90d792f745d8c754afc9b18ca6f7a708caa
-    Signed-off-by: Noel Power <noel.power@suse.com>
-    Reviewed-on: https://code.wireshark.org/review/9437
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I9ec74a7af229a1af3ca946acc5af94ede1913c29
+    Reviewed-on: https://code.wireshark.org/review/10016
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 9c7acde
-Author: Gerhard Gappmeier <gerhard.gappmeier@ascolab.com>
-Date:   Thu Jun 25 14:53:14 2015 +0200
+commit 7661bb2
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Aug 13 17:38:09 2015 +0200
 
-    opcua dissector: Fix parsing of 7 byte numeric service NodeIds.
-    
-    The service NodeIds of OPC UA are normally encoded as 4 byte numeric NodeId.
-    However, it is technically also possible to encode these as (less efficient) 7 byte numeric NodeId.
-    This kind of NodeId was already implemented, but wrong.
-    Since then no one ever used this kind of NodeId for service NodeIds.
+    Qt: fix copy of newer files when building with qmake
     
-    Change-Id: I8654d969604e18bce8415931e455632e72d578ef
-    Reviewed-on: https://code.wireshark.org/review/9435
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I8ea5e2770a0c5be3d981d986fa96fe30445db167
+    Reviewed-on: https://code.wireshark.org/review/10018
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit fbf0c34
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Jul 1 10:18:47 2015 +0200
+commit 2d5f2ae
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Aug 13 16:16:03 2015 +0200
 
-    Try to fix some warnings from Visual Studio Code Analysis.
+    GVCP: fix dissection of Stream Channel Packet Size register
     
-    Change-Id: Ibbbb89af23d0e37ea57a1079e311d8205d254ddd
-    Reviewed-on: https://code.wireshark.org/review/9434
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    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 8e87fad
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 30 20:46:05 2015 +0200
+commit 738cf42
+Author: Anders <anders.broman@ericsson.com>
+Date:   Fri May 29 10:33:58 2015 +0200
 
-    proto.c : fix indent
+    Make building with MSVC2015 work
+    TODO:
     
-    Change-Id: I74461666bcfc6e85a92409819e2c63811284e8f8
-    Reviewed-on: https://code.wireshark.org/review/9433
+    - 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 b107e93
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 30 21:37:34 2015 -0700
+commit 6087f2a
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 13 10:13:52 2015 +0200
 
-    Don't assume the source directory's path has no spaces in it.
-    
-    Have SOURCES_TAP just contain the file names of the taps to run through
-    make-tap-reg.py, and pass $$PWD, properly quoted, as the "source directory"
-    argument to make-tap-reg.py.
+    fuzz-test.sh: added missing option in help.
     
-    Change-Id: I09382ccf9931db636aaeeb5d94c0ae029453ea9d
-    Reviewed-on: https://code.wireshark.org/review/9432
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I7651e18ec6e8338cddc82be90257c5f183804c7c
+    Reviewed-on: https://code.wireshark.org/review/10011
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b0b027d
+commit beb5c0b
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Aug 13 11:21:58 2014 -0400
+Date:   Tue Aug 11 19:50:43 2015 -0400
 
-    Explicitly check for DCE/RPC dissector name in the Decode As dialog because it doesn't have a specific subdissector table to invoke the DCE/RPC "Decode As" tab.
+    Eliminate proto_tree_add_text from some dissectors.
     
-    bug:10368
-    Change-Id: Iff94ddaf0c9f4d002be89dab480b6f9550ebd82f
-    Reviewed-on: https://code.wireshark.org/review/3575
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Cal Turney <cturney@charter.net>
+    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 986e347
-Author: Peter Hatina <phatina@redhat.com>
-Date:   Fri Jun 26 13:25:54 2015 +0200
+commit 61d1ea4
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 12 15:19:25 2015 -0700
 
-    Disable overlay scrolling
+    Initialize another variable.
     
-    Overlay scrolling causes problems when selecting eg. the last packet in Packet List. The last packet gets covered by the scollbar.
-    
-    Change-Id: If23152721a457c7834d6727fc342ee0501a07302
-    Reviewed-on: https://code.wireshark.org/review/9169
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Change-Id: Ie53a16dc482a9c38538077f6d6a2717cfaddbaa4
+    Reviewed-on: https://code.wireshark.org/review/10010
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 98a7b1e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 30 12:58:44 2015 -0700
+commit 0b7d161
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Aug 11 23:58:54 2015 +0200
 
-    Put quotes into xcopy command and note that it might need privileges.
-    
-    The pathnames have spaces, so they must be quoted.
+    editcap: add change offset.
     
-    At least on my VM, I had to run it as Administrator.
-    
-    Change-Id: I7600edbdbe3205c7f766cc651bd6b86340efa0ff
-    Reviewed-on: https://code.wireshark.org/review/9429
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 74338f5
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jun 29 21:43:40 2015 -0700
-
-    Set the PHY value when providing our own metadata structure.
+    This option skips some bytes when fuzzing, that prevents some headers from being changed. This focuses fuzzer to a smaller part of the packet.
     
-    Bug: 11319
-    Change-Id: I8b746f7238729173b2ca23734e9f7fdbbe4f5110
-    Reviewed-on: https://code.wireshark.org/review/9232
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 2325550
+commit 99e3244
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jun 29 22:20:53 2015 -0500
+Date:   Wed Aug 12 14:12:24 2015 -0700
 
-    Fix setting widget visibility when changing the layout.
-    
-    Fixes a bug exposed by g5265bc3.
+    Initialize a couple of variables.
     
-    Change-Id: Ia0775aa068f5e9e1eeb66384bac97fe57f3c957c
-    Reviewed-on: https://code.wireshark.org/review/9231
+    Change-Id: I10471b770356ad46a10740198156055e1480eeb3
+    Reviewed-on: https://code.wireshark.org/review/10008
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 63a78d4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jun 29 18:04:59 2015 -0700
+commit db2692c
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 12 20:58:14 2015 +0200
 
-    Use ws_fstat64() to determine the size of an open file.
+    Qt (main_window) fix no previous prototype for '...' [-Wmissing-prototypes]
     
-    fseek() to the end, followed by ftell(), is a bit of an odd way to get
-    the file size.  Use ws_fstat64() instead.
     
-    Check that the file is a regular file, while we're at it.  This means we
-    don't have to check before opening.
+    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: Anders Broman <a.broman58@gmail.com>
+
+commit 2449c7a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 12 21:06:08 2015 +0200
+
+    GTP: fix indent (use 4 spaces)
     
-    Bug: 11268
-    Change-Id: I31ee20dd5568d10541375cf97b286abfc1384d1c
-    Reviewed-on: https://code.wireshark.org/review/9230
-    Petri-Dish: Guy Harris <guy@alum.mit.edu>
-    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 1e511d8
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jun 29 13:13:55 2015 +0200
+commit 451dd05
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Aug 12 16:47:36 2015 -0400
 
-    ssl: test for file type before reading key file
+    [lwres] Fix (32 bit ?) MSVC-2015 warning: "conversion from 'size_t' to 'guint16', possible loss of data"
     
-    ftell() is undefined for directories. In practice, it will report
-    0x7fffffffffffffff on an ext4 filesystem. Ensure that the given key file
-    is not a directory.
+    Change-Id: Ifc71d1c2afc3ff16f950f2f1c3c9e7142d62fc16
+    Reviewed-on: https://code.wireshark.org/review/10007
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit d20f2b6
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Aug 12 16:24:03 2015 -0400
+
+    [pdc] Fix a few [msvc-2015?] warnings about 'constant compared to constant'
     
-    By the way, this is the only user of ftell that is affected.
+    Essentially: Do the version checks at compile time using
+                 #if statements (even though the compiler
+                 probably optimized out the run time checks).
     
-    Bug: 11268
-    Change-Id: Iaecd42c9b60da9e7945703a794601773749f2d97
-    Reviewed-on: https://code.wireshark.org/review/9213
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: I4879b39729ba5bd6b1c478ac43c107cb9fb445b3
+    Reviewed-on: https://code.wireshark.org/review/10006
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit a36db75
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jun 30 00:38:45 2015 +0200
+commit 6ae8df4
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Aug 12 16:15:05 2015 -0400
 
-    plugins/mate: fix some memleaks
-    
-    Fixes about 5kB leaks in 500+ allocations.
+    [pdc] [msvc-2015] Change a variable type to prevent 32-bit MSVC-2015 "internal error"
     
-    There are still some other remaining (and not fixed in this patch
-    because it is hard to track them):
+    [...]\packet-pdc.c(205) : fatal error C1001: An internal error has occurred in the compiler.
     
-     - The g_strdup'ed memory via MATE_PARSE for some types (cannot simply
-       g_free after use, it is still needed in some cases).
-     - cfg->transforms and cfg->transport_ranges as used in pdu_decl
-       (mate_grammar.lemon).
+    (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
     
-    Tested on a http capture with: tshark -o mate.config:tcp.mate -r ...
-    where tcp.mate is from
-    https://wiki.wireshark.org/Mate/GettingStarted?action=AttachFile&do=get&target=tcp.mate
+    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: I4c06f948136fc30dfcdb56f7ac8a32a2326ae30d
-    Reviewed-on: https://code.wireshark.org/review/9221
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 305d983
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jun 29 17:09:18 2015 +0200
-
-    capchild: fix uninitialized data pointer on failure
-    
-    Fixes a crash / heisenbug in wireshark-qt on startup:
-    
-        ==26808==ERROR: AddressSanitizer: attempting free on address which was not malloc()-ed: 0x7fff8cf3bf70 in thread T0
-            #0 0x7f42ce3b66da in __interceptor_free /build/gcc-multilib/src/gcc-5-20150519/libsanitizer/asan/asan_malloc_linux.cc:28
-            #1 0x842847 in WirelessFrame::setChannel() ui/qt/wireless_frame.cpp:257
-            #2 0x842bf5 in WirelessFrame::on_channelComboBox_activated(int) ui/qt/wireless_frame.cpp:282
-            #3 0x84407d in WirelessFrame::timerEvent(QTimerEvent*) ui/qt/wireless_frame.cpp:134
-            #4 0x7f42ba94ea92 in QObject::event(QEvent*) (/usr/lib/libQt5Core.so.5+0x2b0a92)
-            #5 0x7f42bb6218ea in QWidget::event(QEvent*) (/usr/lib/libQt5Widgets.so.5+0x1948ea)
-            #6 0x7f42bb71c16d in QFrame::event(QEvent*) (/usr/lib/libQt5Widgets.so.5+0x28f16d)
-            #7 0x7f42bb5df62b in QApplicationPrivate::notify_helper(QObject*, QEvent*) (/usr/lib/libQt5Widgets.so.5+0x15262b)
-            #8 0x7f42bb5e4d0f in QApplication::notify(QObject*, QEvent*) (/usr/lib/libQt5Widgets.so.5+0x157d0f)
-            #9 0x7f42ba91d57a in QCoreApplication::notifyInternal(QObject*, QEvent*) (/usr/lib/libQt5Core.so.5+0x27f57a)
-            #10 0x7f42ba973b1c in QTimerInfoList::activateTimers() (/usr/lib/libQt5Core.so.5+0x2d5b1c)
-            #11 0x7f42ba974020  (/usr/lib/libQt5Core.so.5+0x2d6020)
-            #12 0x7f42cdde7a16 in g_main_context_dispatch (/usr/lib/libglib-2.0.so.0+0x49a16)
-            #13 0x7f42cdde7c6f  (/usr/lib/libglib-2.0.so.0+0x49c6f)
-            #14 0x7f42cdde7d1b in g_main_context_iteration (/usr/lib/libglib-2.0.so.0+0x49d1b)
-            #15 0x7f42ba974cfe in QEventDispatcherGlib::processEvents(QFlags<QEventLoop::ProcessEventsFlag>) (/usr/lib/libQt5Core.so.5+0x2d6cfe)
-            #16 0x56c8ba in main_window_update wireshark-qt.cpp:128
-            #17 0xe4b612 in sync_pipe_open_command capchild/capture_sync.c:972
-            #18 0xe4b823 in sync_pipe_run_command_actual capchild/capture_sync.c:1034
-            #19 0xe4c590 in sync_pipe_run_command capchild/capture_sync.c:1211
-            #20 0xe4e9a5 in sync_if_capabilities_open capchild/capture_sync.c:1356
-            #21 0xe48b7a in capture_get_if_capabilities capchild/capture_ifinfo.c:249
-            #22 0xdf539a in scan_local_interfaces ui/iface_lists.c:186
-            #23 0xdf6a65 in fill_in_local_interfaces ui/iface_lists.c:405
-            #24 0x56e49d in main wireshark-qt.cpp:1154
-            #25 0x7f42b81c178f in __libc_start_main (/usr/lib/libc.so.6+0x2078f)
-            #26 0x56ba58 in _start (wireshark+0x56ba58)
-    
-        AddressSanitizer can not describe address in more detail (wild memory access suspected).
-        SUMMARY: AddressSanitizer: bad-free /build/gcc-multilib/src/gcc-5-20150519/libsanitizer/asan/asan_malloc_linux.cc:28 __interceptor_free
-    
-    Change-Id: I63744261096b3cfd0eddcf75bcf85103a3f0788d
-    Reviewed-on: https://code.wireshark.org/review/9220
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: I505898d0c76244a56d75af1a1c5bf30554dd9a2b
+    Reviewed-on: https://code.wireshark.org/review/10005
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit b1ab36a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 00:33:57 2015 +0200
+commit 5c80f08
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 11 11:48:07 2015 -0700
 
-    tools/asn2wrs.py: fix isdn-sup generation with Py3
+    Add DCE-RPC and ONC-RPC service response time dialogs.
     
-    Python 3 has removed the cmp function for sort functions, relying on a
-    key function instead.
+    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.
     
-    Tested with Python 2.7.10 and 3.4.3.
+    Allow program names on the command line in place of numbers or UUIDs. Make
+    matches case-insensitive. E.g. the following are equivalent:
     
-    Change-Id: Id571b836304528ecc3b23a0f8a2843c4538c3e1b
-    Reviewed-on: https://code.wireshark.org/review/9212
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit a6f9cf5
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jun 29 13:13:36 2015 -0500
-
-    Don't free col_item->col_data.
+        -z rpc,srt,100003,3
+        -z rpc,srt,nfs,3
+        -z rpc,srt,NFS,3
     
-    It either points to col_item->col_buf (which we explicitly free) or to
-    a static string.
+    as are the following:
     
-    Change-Id: I4d6db3fa16e69a4321be9d01076026c024df9a00
-    Reviewed-on: https://code.wireshark.org/review/9219
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 0b0100b
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jun 28 11:18:26 2015 -0700
-
-    Fixup the packet list navigation action behavior.
+        -z dcerpc,srt,f5cc5a18-4264-101a-8c59-08002b2f8426,56
+        -z dcerpc,srt,nspi,56
+        -z dcerpc,srt,NSPI,56
     
-    Change-Id: I124fe3c3755556e81c65443b8b9744a89394dc70
-    Reviewed-on: https://code.wireshark.org/review/9218
+    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 5ae8c92
+commit 412f5b3
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jun 29 10:00:37 2015 -0700
+Date:   Wed Aug 12 10:49:34 2015 -0700
 
-    Try to fix NSIS packaging dependencies.
+    Expert information dialog performance improvements.
     
-    Split the nsis_package target into nsis_package_prep which has
-    dependencies and nsis_package which has no dependencies and as a result
-    blindly builds the package. Remove the nsis_uninstaller target since
-    that's now handled by nsis_package_prep. Nsis_package_prep *should*
-    also take care of the dependencies for portableapps_package, but that
-    hasn't been tested.
+    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.
     
-    Update the Developer's Guide.
+    While we're here, make sure we show the dialog before tapping packets.
     
-    This requires coordination with the Windows buildbots.
-    
-    Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1
-    Reviewed-on: https://code.wireshark.org/review/9217
+    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 df62a1b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jun 29 15:13:12 2015 +0200
+commit bde416a
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 12 15:21:46 2015 +0200
 
-    [GSM DTAP]: fix indent (use 4 spaces)
+    Lua: Moved deregister out of wslua_cleanup
     
-    Change-Id: I07fd87b4e72ac7309e320deab963017c96ba2c60
-    Reviewed-on: https://code.wireshark.org/review/9215
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ia43aa0e5f09400ef9923288b362256094a1241b8
+    Reviewed-on: https://code.wireshark.org/review/9998
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 23ad9b3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Jun 29 16:01:43 2015 +0200
+commit 5a92694
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 12 14:51:29 2015 +0200
 
-    [FIP] Use value_string_ext for fip_desc_types.
+    Initialize is_reloading_lua at startup
     
-    Change-Id: Ifb4ad35b2a9454366d58cc4bfc81f96630122565
-    Reviewed-on: https://code.wireshark.org/review/9216
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I211e0f4b86cff1c311d4ae67cbb47de14846144f
+    Reviewed-on: https://code.wireshark.org/review/9997
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 60ef92b
-Author: Anders <anders.broman@ericsson.com>
-Date:   Mon Jun 29 14:36:00 2015 +0200
+commit dc7443f
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 12 14:07:24 2015 +0200
 
-    [GSM DTAP] Add Sequence number for Non call related SS messages.
+    Added guards for deregistered fields
     
-    Change-Id: Iec97801e1eb6803c4168c2e302f84a7732654ecf
-    Reviewed-on: https://code.wireshark.org/review/9214
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 59d56bf
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jun 29 11:22:08 2015 +0200
-
-    gtk: Fix use-after-free on removing recent file
+    This is functions used when redissecting after a Lua plugins reload.
     
-    Change-Id: I930b0522d116d53aeef366ae0b43f818b9a81d7f
-    Reviewed-on: https://code.wireshark.org/review/9211
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: Ida14526faec1992006938a6732ee894ac83c2d12
+    Reviewed-on: https://code.wireshark.org/review/9995
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 149d0b7
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Jun 24 20:03:51 2015 +0200
+commit a3e3d60
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Aug 12 13:24:06 2015 +0200
 
-    tools/asn2wrs.py: handle windows-1252 encoding
-    
-    The RRC ASN.1 definitions resulted in a decode error in Python because
-    the file is encoded as windows-1252 instead of UTF-8. This patch makes
-    the tool more forgiving in handling windows-1252 encodings.
+    Align comments
     
-    Tested with Python 2.6.9, 2.7.10, 3.4.3.
-    
-    Change-Id: I9c9269e1065c98b8bcfb57ab4bfd21d5e183a656
-    Reviewed-on: https://code.wireshark.org/review/9133
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: Iab59ba51700b018337552018c76e30dcbd41f3f6
+    Reviewed-on: https://code.wireshark.org/review/9993
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1141033
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Jun 28 13:31:14 2015 +0100
+commit cd16301
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Aug 12 10:00:01 2015 +0200
 
-    editcap: add new option (-a) to help
+    [GTP] Direct Tunnel Flags  7.7.81 is currently specified with one data
+    octet.
     
-    Change-Id: Ic1a07e29d30d96bf1dd86e10b198c42dd9349838
-    Reviewed-on: https://code.wireshark.org/review/9198
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Iab7917b23e6be03f63a92ef0aaf0814c9cbea2c3
+    Reviewed-on: https://code.wireshark.org/review/9992
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit da09a1b
+commit bfdc2cb
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jun 26 23:00:33 2015 -0400
+Date:   Mon Aug 10 19:28:54 2015 -0400
 
-    Take all epan_column_info members that always get allocated to "number of columns" to share their own data structure.
+    Eliminate proto_tree_add_text from some dissectors.
     
-    Change-Id: Ib982662db6cf68730a7d121eac60d9bc5ae67429
-    Reviewed-on: https://code.wireshark.org/review/9195
+    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>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit b9145bc
+commit 50b51a6
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jun 28 12:43:33 2015 -0700
+Date:   Tue Aug 11 22:42:26 2015 -0700
 
-    "Short preamble" is 802.11[bg]-only, so put it in the PHY-specifc info.
-    
-    We're already only setting it for 11b and 11g; this makes it a bit
-    cleaner, e.g. we don't need to say "oh, wait, we *don't* have short
-    preamble" for 11n and 11ac.
+    Some further questions, asked in comments.
     
-    Change-Id: Idcf3e8c93d6a417f0319e4bd33247b98f07b6052
-    Reviewed-on: https://code.wireshark.org/review/9209
+    Change-Id: I41c7918b7396934c651fb957d3b61db0c7a19527
+    Reviewed-on: https://code.wireshark.org/review/9990
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 8aaf42d
+commit 260ae6a
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jun 28 10:28:38 2015 -0700
+Date:   Tue Aug 11 19:00:26 2015 -0700
 
-    If we don't know whether STBC is being used, we don't know NSTS.
-    
-    If we don't know whether space-time block coding is being used, we don't
-    know the number of space-time streams, so don't try to calculate it and
-    don't put it into the protocol tree.
-    
-    Mark it as generated, while we're at it, as it's not a value from the
-    radiotap header, and make it a guint.
+    Clean up the file header description.
     
-    Change-Id: Ib0b14f2f4f94e042d034311e10bb96b9b29a9d3e
-    Reviewed-on: https://code.wireshark.org/review/9206
+    Change-Id: I4928f99cdc2b8fc2a3aef648b613ce0b93ed3563
+    Reviewed-on: https://code.wireshark.org/review/9989
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 2762995
+commit 1100ba9
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jun 28 09:51:22 2015 -0700
+Date:   Tue Aug 11 18:38:08 2015 -0700
 
-    If we don't know whether STBC is being used, we don't know NSTS.
+    Update comments.
     
-    If we don't know whether space-time block coding is being used, we don't
-    know the number of space-time streams, so don't try to calculate it and
-    don't put it into the protocol tree.
-    
-    Change-Id: I7ffd1b0e79e45fee526305846aadca04eb135b11
-    Reviewed-on: https://code.wireshark.org/review/9205
+    Change-Id: I4b0b4bb31901208e09a535ef922e134116309531
+    Reviewed-on: https://code.wireshark.org/review/9988
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ad18161
+commit 36c50fe
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jun 28 09:32:35 2015 -0700
+Date:   Tue Aug 11 18:32:18 2015 -0700
 
-    The two bits of NESS are numbers, not Booleans.
-    
-    Found by Pascal Quantin.
+    Document Colasoft Capsa file support.
     
-    Change-Id: I843db0c1d28bcd4714799285da5e1ea8a81307a1
-    Reviewed-on: https://code.wireshark.org/review/9204
+    Change-Id: I89374413f3e08e2a35923b8bd4c128b3c659158a
+    Reviewed-on: https://code.wireshark.org/review/9987
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7d7f6be
+commit 7b39eac
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jun 28 09:23:04 2015 -0700
+Date:   Tue Aug 11 18:27:10 2015 -0700
 
-    We only have the short preamble flag if we have a Flags field.
-    
-    Don't set PHDR_802_11_HAS_SHORT_PREAMBLE or phdr.short_preamble unless
-    we have the flags bits from the Flags field.
+    It looks as if the origin of the time stamps is the UN*X epoch.
     
-    Discovered by Pascal Quantin by running valgrind on the capture from bug
-    11317.
+    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: I7e91dea116f6cc977101b7b5e76067021f68a0bf
-    Reviewed-on: https://code.wireshark.org/review/9203
+    Change-Id: Id0e29c03dc8ada40f1040b95f169b4f3a8954a0f
+    Reviewed-on: https://code.wireshark.org/review/9986
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b09891d
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jun 28 08:08:24 2015 -0700
+commit 14c7525
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Tue Aug 11 21:57:11 2015 +0200
 
-    [Automatic update for 2015-06-28]
+    [Qt Expert Info dialogue] remove our tap listener when the dialogue is destroyed
     
-    Update manuf, services enterprise-numbers, translations, and other items.
+    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
+    
+    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
     
-    Change-Id: Idf976da88eab4126089b612084ce9d4a4643d80c
-    Reviewed-on: https://code.wireshark.org/review/9201
+    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 e4dc332
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sun Jun 28 12:23:41 2015 +0100
+commit f1a4db3
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 11 22:04:58 2015 +0200
 
-    Set 802.11.ac Partial AID field size
-    
-    The assignment of a short to a guint8 in packet-ieee80211-radiotap.c line 1696
-    generates a narrowing warning.
-    
-    In my reading of the spec which shows the field as 9 bits,
-    and looking at the hf fields for this item I think it should be a guint16.
+    Lua: Remove unneeded call in wslua_cleanup
     
-    Change-Id: Ic7785c2bfc66d72f7b1e914b1a46f32079fc99d9
-    Reviewed-on: https://code.wireshark.org/review/9197
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I0cda00001b40e5951d680d72dbc8043cbe8b9309
+    Reviewed-on: https://code.wireshark.org/review/9980
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit d4bdbb9
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Jun 28 12:51:55 2015 +0200
+commit 58ec64c
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 11 21:52:32 2015 +0200
 
-    1.5.17 seems to be a typo. Change it to the probably intended 1.6.17
+    wmem: Fix wmem_tree_remove_string
     
-    Change-Id: I43fc4962e1fdc9fb264b313afd3f5612de42116a
-    Reviewed-on: https://code.wireshark.org/review/9196
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 95dbae4
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sat Jun 27 23:17:09 2015 +0100
-
-    ISAKMP: consistently use two-space indentation (as per modelines).  Also added one missing break
+    Always set is_removed when insert data in a node.
     
-    Change-Id: I26f03b56765ffd69dab53988c8e35c7cf3f99f16
-    Reviewed-on: https://code.wireshark.org/review/9193
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I8fb50932a369e3f4fe8a1f743462683fff705cc2
+    Reviewed-on: https://code.wireshark.org/review/9978
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 80efc53
+commit 4309b96
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 27 15:29:37 2015 -0700
+Date:   Tue Aug 11 12:16:23 2015 -0700
 
-    Quick and dirty overflow checking.
+    Sort dump_open_table_base[] in the right order.
     
-    We really need a better way to handle packet offset overflows.
+    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: I6e476f7bc6ddac2c5515c4e09192d88f528ea091
-    Reviewed-on: https://code.wireshark.org/review/9194
+    Change-Id: I06afe7bb98cb36c54ddc831113bb632598ab2eb0
+    Reviewed-on: https://code.wireshark.org/review/9975
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 74a5f50
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sat Jun 27 16:46:44 2015 +0100
+commit de70d2a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 19:11:20 2015 +0200
 
-    ipsec: correct some format specifiers
+    H225: fix indent (use 2 spaces) and add modelines info
     
-    Change-Id: I340ab6186d5d5d9c5d0fa301a1b1e5824932d547
-    Reviewed-on: https://code.wireshark.org/review/9192
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Ibe4cf8d004c6c94f745e5c620100af9483fa6a31
+    Reviewed-on: https://code.wireshark.org/review/9934
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 40f330f
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jun 26 14:24:28 2015 -0700
+commit d6c6b08
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 11 16:11:46 2015 +0200
 
-    Free a malloc'ed error message to not leak memory
+    wmem: Mark removed strings with is_removed
     
-    Change-Id: I59b43e8d4efe8320cf17c6dd086440d3522ef247
-    Reviewed-on: https://code.wireshark.org/review/9183
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    This will allow integer value 0 again.
+    
+    Change-Id: Ibfa4249ea8b887971d3b3214ad9e4d095d20d155
+    Reviewed-on: https://code.wireshark.org/review/9973
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 48f7ce7
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Jun 26 21:04:01 2015 -0700
+commit ecc4f75
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 11 14:08:08 2015 +0200
 
-    checkAPIs.pl: check how ui class files are included
+    Added Reload Lua plugins.
     
-    flag up a warning if a ui class file is included from the current
-    directory by using #include ""
+    This is initial support for reloading Lua plugins without
+    restarting the application.
     
-    Visual Studio needs #include <> to make sure that we always pick up
-    these files from the build directory if we're building with CMake
+    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
     
-    combine this check with the other check for gcrypt.h so that included
-    files are checked in one common subroutine
+    Change-Id: I48870d8741251705ca15ffe1068613fcb0cb18c1
+    Reviewed-on: https://code.wireshark.org/review/5028
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 70d06de
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 11 13:52:34 2015 +0200
+
+    [SMCR] Minimum 4 bytes is required to perform the heuristic check.
     
-    Change-Id: If8420ff5886f8eb2a71aa8fbfe6bc5d2bda607ce
-    Reviewed-on: https://code.wireshark.org/review/9189
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I29426147cb1443af3c9cc9dc1b60beabe9a94277
+    Reviewed-on: https://code.wireshark.org/review/9972
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 13df6e9
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jun 26 17:02:26 2015 -0700
+commit f233824
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 11 13:32:41 2015 +0200
 
-    bacapp: cleanup and remove some add_text
+    [Diameter] Add expert info to subdissection of 3GPP AVP:s
     
-    Change-Id: I991269db9c2705a4ac41a576000a612aa6de2242
-    Reviewed-on: https://code.wireshark.org/review/9186
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Change-Id: Ic2ec0696f1f6b8bb918dd04aa898dccdb8b90ece
+    Reviewed-on: https://code.wireshark.org/review/9971
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b24a45c
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sat Jun 27 06:10:20 2015 +0100
+commit 2579607
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 11 13:06:40 2015 +0200
 
-    Avoid some Visual Studio Code Anaylzer warnings
+    [ENEA LINX over TCP] Make the TCP port registration a preference defalted
+    to 0.
     
-    Change-Id: I320386b02bea09658636a9281ee3cbba34a5e4cd
-    Reviewed-on: https://code.wireshark.org/review/9188
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I837bf8ac9d5724dd485f0bc62f3fe32bedd3eb0e
+    Reviewed-on: https://code.wireshark.org/review/9970
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 26a1ccb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 27 00:41:37 2015 -0700
+commit c262bf2
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 11 11:08:20 2015 +0200
 
-    Handle the VHT flavor of the HT Control field.
-    
-    The low-order bit of the field indicates whether it's the HT or VHT
-    version.
-    
-    Show subfields as part of a 32-bit bitfield; few subfields begin and end
-    on a byte boundary (the Link Adaptation Control field no longer does so;
-    its low-order reserved bit became the VHT flag).
-    
-    Update references to the 11n spec.
+    [GIOP] A GIOP message can have size = 0 (CloseConnection)
     
-    Update a comment.
-    
-    Change-Id: I9fcb99a5517afb319b67d4deb2355c7cb0be73b6
-    Reviewed-on: https://code.wireshark.org/review/9191
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit f196061
+commit b1be6bc
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Jun 26 22:45:43 2015 -0700
+Date:   Mon Aug 10 22:41:13 2015 +0200
 
-    (trivial) daap: remove if(tree) and return; at the end of a function
+    zigbee: remove some more if (tree) checks
     
-    Change-Id: I969efbaeda75d2790165a6cbc214f58f1bd0ba7f
-    Reviewed-on: https://code.wireshark.org/review/9190
+    Change-Id: I81b46ec7d9d919ff2779d1005063e9ef6c92e097
+    Reviewed-on: https://code.wireshark.org/review/9966
     Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit ac9f64a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jun 26 21:48:14 2015 -0700
+commit 52a7b79
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Aug 10 22:27:58 2015 +0200
 
-    Handle a "should not happen" case, to squelch compiler warnings.
+    remove some unnecessary if (tree) checks
     
-    Change-Id: Icb3497924c88963688d60a59c5873a271b7e4d21
-    Reviewed-on: https://code.wireshark.org/review/9187
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ib0f4cc47ede7b840cba38ecad04bd17bb6bccd55
+    Reviewed-on: https://code.wireshark.org/review/9965
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit b401fb0
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jun 26 19:25:05 2015 -0700
+commit 94bb276
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Aug 10 13:19:25 2015 +0200
 
-    Use the PHY type in the radio information to recognize HT packets.
-    
-    Rather than having a separate "802.11 HT" dissector, just look for the
-    802.11n (HT) PHY.
+    Try to fix the build bou by copying tha cast made in glib.
     
-    (As a side-effect, This also causes PPI HT frames to have the radio
-    information dissected by the wlan_radio dissector, as is the case with
-    other 802.11 frames accompanied by radio information.)
-    
-    Change-Id: I854c42e19481a17767e64a3b92222b09dbaa02dd
-    Reviewed-on: https://code.wireshark.org/review/9185
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I6da06b8e6ae272b940ef4ee47ce6b253bf9f3699
+    Reviewed-on: https://code.wireshark.org/review/9961
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d6e5379
+commit e1003ee
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jun 26 10:33:11 2015 -0700
+Date:   Fri Aug 7 16:29:50 2015 +0200
 
-    RTP: create conversation when using heuristic dissector
+    editcap: fix -T <encapsulation type> option when output format is pcapng
     
-    This gives a chance to perform RTP reassembly when "Try to decode RTP outside of conversations"
-    option is activated.
+    Right now the output encapsulation type is ignored if the output (default) format is set to pcapng.
     
-    Bug: 11310
-    Change-Id: Ic8bd9532a88a072c3cb1f1907cf7117b5072a954
-    Reviewed-on: https://code.wireshark.org/review/9175
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 5c438e1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jun 26 14:27:22 2015 -0700
+commit 7fb514f
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:52:38 2015 +0200
 
-    Those aren't booleans, they're counts of streams.
+    GSM (a_common): fix indent (replace tab by 8 spaces)
     
-    Change-Id: Id0520da614f239d3146f5c03ef1a930e8a0fcd94
-    Reviewed-on: https://code.wireshark.org/review/9184
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id1d6bfcb04ac75d767fe6f09454dc8235de7bc75
+    Reviewed-on: https://code.wireshark.org/review/9928
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4ee22e8
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jun 26 14:16:47 2015 -0700
+commit 76d4b80
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Aug 10 10:26:16 2015 +0200
 
-    Update valgrind script for the UI
+    g_slist_free_full () does not exist until GLIB 2.28
     
-    Plain 'wireshark' is now the Qt version, and 'wireshark-gtk' is the GTK version.
-    
-    Change-Id: I893d6ae9a205998e191cbf6160cf27fcfd09bb4d
-    Reviewed-on: https://code.wireshark.org/review/9181
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I81df5b4dbe1916eca51cdb72199de7a90471bd07
+    Reviewed-on: https://code.wireshark.org/review/9960
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b2a6dff
+commit 75d46fe
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jun 26 13:12:18 2015 -0700
+Date:   Mon Aug 10 00:53:34 2015 -0700
 
-    Clean up switch statement whitespace.
+    Get rid of trailing white space.
     
-    (Try to keep the same indentation style within a single switch
-    statement, at least.)
-    
-    Change-Id: I5b349fd90881d1a1d2be377a291bfceda56476aa
-    Reviewed-on: https://code.wireshark.org/review/9180
+    Change-Id: I3c0091612bdd518f749abbfbefbd0e2097b8c18b
+    Reviewed-on: https://code.wireshark.org/review/9958
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0f42ed0
+commit 43c2e57
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jun 26 12:21:37 2015 -0700
+Date:   Mon Aug 10 00:30:33 2015 -0700
 
-    Squelch a compiler warning.
+    Don't try to decrypt the payload if it was cut short by the snapshot length.
     
-    It's a bogus warning, but not all compilers do enough dataflow analysis
-    to figure that out.
+    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...).
     
-    Change-Id: Iebc1fffab87e83b16210003b60aae2333e0b5ec9
-    Reviewed-on: https://code.wireshark.org/review/9179
+    Bug: 11389
+    Change-Id: Ie863ddc5c4aa7fbf6cde317823a413d226a41c0d
+    Reviewed-on: https://code.wireshark.org/review/9954
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5e6be95
+commit 3157114
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jun 26 12:03:04 2015 -0700
+Date:   Sun Aug 9 23:55:55 2015 -0700
 
-    Use "Present"/"Absent" for VHT presence flags.
+    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.
     
-    Change-Id: I1571cf52d240c5d32dd8db0af2f18b91cc6e6d34
-    Reviewed-on: https://code.wireshark.org/review/9178
+    Bug: 11389
+    Change-Id: I4395c5a48c16110fcf31b611b99749c61000d489
+    Reviewed-on: https://code.wireshark.org/review/9953
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b855a9f
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jun 26 11:40:35 2015 -0700
+commit d108f28
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 9 18:06:47 2015 +0200
 
-    wmem: permit lookups in NULL trees (oops)
+    zigbee: fix two memory leaks
     
-    Change-Id: I222b95b48b7ac8debbd717b32dd471742222c16b
-    Reviewed-on: https://code.wireshark.org/review/9177
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 0953c36
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jun 25 14:39:43 2015 -0700
-
-    Qt: tweaks to Capture Interfaces dialog
+    ==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)
     
-    - Add option to stop capture after X files are created
-    - Increase the max value for number of packets / files / bytes / seconds from 1000 to INT_MAX
-    - Fix capture name file selection
+    ==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)
     
-    Change-Id: I9fb8eeaa925e5bd5380bb654686575f41126546a
-    Reviewed-on: https://code.wireshark.org/review/9162
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 66c7388
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 15:24:03 2015 -0700
-
-    wmem: convert string trees to single-layer
+    second version that uses glib memory routines and does not mix
+    g_hash_table and wmem
     
-    The whole radix tree thing is kind of neat (and may even be more performant for
-    short strings?) but it's really confusing to reason about and is terribly
-    inefficient for long strings.
+    remove an obsolete comment and an unnecessary return; while at it
     
-    Ping-Bug: 9078
-    Change-Id: I1bd333918a6e557801e82f4553d386120138065e
-    Reviewed-on: https://code.wireshark.org/review/9165
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    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 78adf17
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jun 26 11:28:25 2015 -0700
+commit c462f1b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Aug 9 18:33:30 2015 -0400
 
-    Fix handling of 11ac radio metadata.
-    
-    Add more fields to the metadata to handle everything radiotap has, and
-    show them.
-    
-    Call the FEC type field just "FEC", and have it be an integer field with
-    0 meaning BCC and 1 meaning LDPC, rather than a Boolean.
-    
-    11ac doesn't have *an* MCS, it can have up to 4, one per user.
+    Eliminate proto_tree_add_text from packet-wbxml.c
     
-    Label the 11ac bandwidth values the same way we do in the radiotap
-    dissector.
-    
-    Change-Id: I2c2415baff3e5d68d49dda497980e8271d26b1f6
-    Reviewed-on: https://code.wireshark.org/review/9176
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 51d2eef
-Author: Michal Pazdera <michal.pazdera@gmail.com>
-Date:   Fri Jun 26 15:32:29 2015 +0200
-
-    Added option in h245 preferences to print h245 messages content
-    into Information column in typical fashion (append) instead of
-    just in reversed order (prepand)
+    While I was at it, some (mostly) duplicate functionality allowed rearranging of functions to eliminate most forward declarations.
     
-    Change-Id: Id78c307fc6d34a378ac7b9335ac1e578837b08a6
-    Reviewed-on: https://code.wireshark.org/review/9170
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    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 2c9a9af
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jun 26 10:05:37 2015 -0700
+commit 6d8b4af
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Thu Aug 6 22:35:23 2015 +0100
 
-    Replace pinfo->fd->flags.visited calls by PINFO_FD_VISITED(pinfo) in documentation
+    Cleanup variable name in dissect_frag6()
     
-    Change-Id: If92787ddf3444edc466f04d7c2d9327cb8a50fba
-    Reviewed-on: https://code.wireshark.org/review/9173
+    Change-Id: Ib6bdea5dbc95b5221e41ca30c11288ff8c1dbb7f
+    Reviewed-on: https://code.wireshark.org/review/9952
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 304f902
+commit 655b0dc
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 13:06:53 2015 -0700
+Date:   Mon Aug 10 00:00:21 2015 +0200
 
-    PTP: just return, don't throw an exception
+    use the captured length as payload length for zigbee decryption
     
-    Change-Id: Icaca74f7d5038b4e2e232fb499933219b322e02d
-    Reviewed-on: https://code.wireshark.org/review/9159
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 29aecdf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jun 26 08:48:44 2015 -0700
-
-    RRC: remove non ASCII characters from ASN.1 description
+    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
     
-    Change-Id: I7edb23651caa5ccf8e9989069803a8800e358670
-    Reviewed-on: https://code.wireshark.org/review/9172
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit caf06fe
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jun 26 08:39:04 2015 -0700
-
-    PDU export: increase time precision to nano seconds
-    
-    It will avoid losing precision in case of export from a nseclibpcap input file.
-    As Wireshark is probably the only tool able to read this link type, we do not need to bother with compatibility.
-    
-    Change-Id: Iea5b5c88b02ff4799c255f795be2469a091161fe
-    Reviewed-on: https://code.wireshark.org/review/9171
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit a7a7c68
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Jun 25 14:25:42 2015 +0200
-
-    epl: Set Payload to remaining bytes
+    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
     
-     The payload dissection now only includes the remaining bytes,
-     even if the actual number of payload bytes should be bigger.
+    also, tvb_reported_length_remaining() does not return values < 0 any
+    more, remove the check for this
     
-     An expert Info is added, to inform the user, that the trace was
-     truncated, but the payload is still given to a sub-dissector,
-     as it may contain valid information
-    
-    Change-Id: Iefef78e7c7aed7f87e40875f345ff5debf364f3a
-    Reviewed-on: https://code.wireshark.org/review/9124
-    Reviewed-by: Roland Knall <rknall@gmail.com>
+    Bug: 11389
+    Change-Id: I42cb4526483160416b51e3cb72442148b5fac4f3
+    Reviewed-on: https://code.wireshark.org/review/9950
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit fe679bf
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Jun 25 11:29:59 2015 +0200
-
-    openSAFETY: Fix various heuristic bugs
-    
-     - Wrong true-positives if the frame got wrongly detected
-    
-    Change-Id: Ifaaec601bde260f8a38c61aad1e5e79b16003c60
-    Reviewed-on: https://code.wireshark.org/review/9123
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 8f40e2c
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 23:48:48 2015 -0700
+commit aafc7ff
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:55:15 2015 +0200
 
-    tools: permit setting BIN_DIR in the environment
-    
-    For out-of-tree builds you have to pass the location of your build to our tools
-    like the fuzz script, valgrind script etc. Modify them so that the value can be
-    set in the environment rather than requiring a shell script flag.
+    H225: fix no previous prototype for 'h225_stat_init' [-Wmissing-prototypes]
     
-    Set the environment variable in the vagrant provision step, so that the scripts
-    Just Work (TM) in the VM.
-    
-    Change-Id: If8ce6b278176085ba6dd994137b82fc989b80124
-    Reviewed-on: https://code.wireshark.org/review/9168
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I945bbbb3b10258f22c60b04b19cf55671fc6ed94
+    Reviewed-on: https://code.wireshark.org/review/9933
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 4975c06
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Jun 26 08:49:05 2015 +0200
+commit a051961
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Aug 9 14:55:27 2015 -0400
 
-    Disabling GTK by default in the official source was not intentional
-    (but maybe it should be).
+    [wiretap/nettrace_3gpp_32_423] Add editor modelines
     
-    Change-Id: I9dba032951265204e1ced517ad7eb331ec71a6a2
-    Reviewed-on: https://code.wireshark.org/review/9167
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Change-Id: Ie2b9da2b3a08d18fc913a00cf076aa881a583552
+    Reviewed-on: https://code.wireshark.org/review/9949
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 40649e3
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 13:24:45 2015 -0700
+commit a29f513
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Aug 9 14:16:22 2015 -0400
 
-    ctdb: exit instead of throwing an exception
+    [skinny] Add missing change to source (.in); Also do minor cleanup.
     
-    Change-Id: I58561cf7e8e7f0e20870d271f68eb486b0bb812e
-    Reviewed-on: https://code.wireshark.org/review/9160
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 227f0af
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Jun 26 02:16:51 2015 +0200
-
-    Make autotools install optional.
-    Reformat build and install instructions at the end a bit.
+    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.
     
-    Change-Id: I0f6be9e4b58f3987615abcec6521f59ba33b3b0a
-    Reviewed-on: https://code.wireshark.org/review/9166
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 8ad9019
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Jun 25 22:48:20 2015 +0200
-
-    Commit d4aa1a1c24e984339806c4ddb000ea9f9b352659 added some Q_UNUSED
-    statements to c++ files. The standard method to mark function parameters
-    as unused in cpp is to just leave out the variable name.
+    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.
     
-    Change-Id: I4f07ad9f494ad16388eadb67e93ea7b26ae70eb5
-    Reviewed-on: https://code.wireshark.org/review/9152
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit dd16c55
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Thu Jun 25 15:36:54 2015 -0700
-
-    editcap:  allow command-line option to set comments for given frame numbers
+    packet-skinny.c regenerated using 'cog'
     
-    Change-Id: I608d3c5f56acc58ef7b3e59821a15be49344cc35
-    Reviewed-on: https://code.wireshark.org/review/9154
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Ib3510c257e0b98bb7da8fae9aa010e134ec381cb
+    Reviewed-on: https://code.wireshark.org/review/9948
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit d81ba67
+commit 2ef3cda
 Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 15:23:29 2015 -0700
+Date:   Sun Aug 9 10:36:18 2015 -0400
 
-    wmem: bubble up key type change another function
+    t124: kill evil global variables
     
-    Follow-up to gb679e2a.
-    
-    Change-Id: I6cc168c3f3a6e1c8ce7bfa9344255acd3c8a7d20
-    Reviewed-on: https://code.wireshark.org/review/9164
+    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 acbbce9
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Thu Jun 25 22:02:42 2015 +0100
-
-    Fix Windows CMake PortableApps dependencies
-    
-    The nsis_uninstall target appears to create a temporary file
-    uninstaller_installer.exe that is renamed to uninstall.exe
-    
-    The above rename upsets the portableapps_app_dir target that is
-    copying files from the CMake run dir into the portable apps dir.
-    
-    The change adds a dependency on nsis_uninstall to the portableapps_package
-    target in an attempt to sequence the copy operation.
-    
-    Change-Id: I9feb55599eff000f983c23ce29c89fbd3be0a6ac
-    Reviewed-on: https://code.wireshark.org/review/9153
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6122b4b
+commit b3207c0
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 14:32:30 2015 -0700
+Date:   Sun Aug 9 18:33:04 2015 +0200
 
-    Qt: when a capture file is closed, go back to the welcome screen only
-    if we're not capturing to multiple files
+    zigbee: remove a numer of unnecessary if (tree) checks
     
-    Change-Id: I18d36ef8e7e3525b2bd8d94f2b2349cefa3ecb52
-    Reviewed-on: https://code.wireshark.org/review/9161
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ifd0dcc220cfdd0809f2e7cf2fc54fc8bdeb987be
+    Reviewed-on: https://code.wireshark.org/review/9947
     Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit b89a485
+commit c5af152
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Jun 25 17:42:15 2015 -0400
+Date:   Sun Aug 9 12:20:54 2015 -0400
 
-    Add Makefile_common.common to wireshark-tap-register.c dependencies (windows)
+    Trivial: Convert 'tabs' indentation to '4 space' indentation
     
-    Change-Id: I22d60e10554e419acda945732faa192fbc21aee6
-    Reviewed-on: https://code.wireshark.org/review/9163
+    Change-Id: If71dd8a04050ce11e37ad88ee862419313c06639
+    Reviewed-on: https://code.wireshark.org/review/9946
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit e31aef0
+commit dbf314a
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Thu Jun 25 17:30:48 2015 -0400
+Date:   Sun Aug 9 12:14:39 2015 -0400
 
-    Regenerate *-tap-register.c when associated Makefile.common is updated (*nix)
+    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: I638e4362bbc24e5a0a990dc7339e285e2ac55839
-    Reviewed-on: https://code.wireshark.org/review/9158
+    Change-Id: I92ff551e70274f459c466e1c1d449905e0e7dc92
+    Reviewed-on: https://code.wireshark.org/review/9945
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit cf537c1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jun 25 14:33:00 2015 -0700
+commit 394773c
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sun Aug 9 08:57:29 2015 -0700
 
-    If we don't have both frequency and channel, try to calculate the other.
+    Switch the guides back to html output.
     
-    Just for completeness' sake.
+    DocBook's xhtml5 stylesheet output didn't render correctly in Firefox.
     
-    Change-Id: I1ed609431c8bc62a79ebbf837fa2fc62f627a002
-    Reviewed-on: https://code.wireshark.org/review/9157
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a124424
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jun 25 14:28:40 2015 -0700
-
-    CredSSP: update template after the API change done in gcdc7d25
+    This reverts commit dc09d18e8ecdc55de2361d8ff6d2b0bf36345a70.
+    This reverts commit 62e56ad92a50c7dd58e83447207b8be0cc0bbb76.
+    This reverts commit 53a80334bcb3ca40a5aaef504e2aca0f04bcc9f3.
     
-    Change-Id: I548870ba423c7c3b714047f9f02c6cfb9a6a0661
-    Reviewed-on: https://code.wireshark.org/review/9156
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Iafcf18cfce25772146fc2e155728401fd105a44b
+    Reviewed-on: https://code.wireshark.org/review/9944
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 5265bc3
+commit a8af51d
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jun 25 14:18:36 2015 -0700
+Date:   Sun Aug 9 08:10:47 2015 -0700
 
-    Make sure the byte view maintains visibility.
+    [Automatic update for 2015-08-09]
     
-    In ByteViewTab::clear, make sure we stay hidden or visible as
-    appropriate.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Bug: 11313
-    Change-Id: I12fa5169e840dbc4d27b6525fe6be72e13acce5d
-    Reviewed-on: https://code.wireshark.org/review/9155
+    Change-Id: I14806e32e93b7f189ccc68834afa4645bda3e1aa
+    Reviewed-on: https://code.wireshark.org/review/9942
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 26dd5d2
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jun 25 13:42:11 2015 -0700
+commit 4bba83b
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Aug 8 16:29:24 2015 -0700
 
-    Squelch a compiler warning.
+    Reset the splash timer after processing events.
     
-    Change-Id: I7a833915173248cda68857493f2000a71052ec53
-    Reviewed-on: https://code.wireshark.org/review/9151
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id71a3ac5e8f04df6a19e92021e47ea64728c2595
+    Reviewed-on: https://code.wireshark.org/review/9936
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 4b1f364
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 13:16:47 2015 -0700
+commit de872cb
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Aug 8 15:44:02 2015 -0700
 
-    Basic vagrant readme
+    Generate DocBook conditionally.
     
-    Change-Id: Iad77ad54e5a810bde35af076c5e9b91c43405b77
-    Reviewed-on: https://code.wireshark.org/review/9149
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 5bc3861
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jun 25 10:59:46 2015 -0700
-
-    mergecap: check input files time precision before exporting to pcapng format
+    Add back a check when generating DocBook.
     
-    Bug: 11202
-    Change-Id: I0891235e9fd41687a12eb8c7e05048e25de3d8b9
-    Reviewed-on: https://code.wireshark.org/review/9137
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    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 b0584ae
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 11:25:44 2015 -0700
+commit 0626e76
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 18:17:04 2015 -0700
 
-    bootp: replace THROW() by an expert info
+    CMake: Try to fix generated docbook dependencies.
     
-    abort the dissection in this case
+    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: Ic65f7535422d1c0a6e395a15fbc4a8ae550c0976
-    Reviewed-on: https://code.wireshark.org/review/9144
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    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 f613b92
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 13:03:28 2015 -0700
+commit 11e5422
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:50:17 2015 +0200
 
-    Tell vagrant that it's a dev environment
+    GSM (a_common): fix no previous prototype for 'gsm_a_*_init' [-Wmissing-prototypes]
     
-    Put WIRESHARK_RUN_FROM_BUILD_DIRECTORY in the shell profile so that wireshark
-    knows it's running from a build directory (which it otherwise sometimes doesn't
-    for out-of-tree cmake). This fixes lua and other things in the vagrant build.
-    
-    Change-Id: I69775612d0f9161ce9b30c32122aee52a1106cbc
-    Reviewed-on: https://code.wireshark.org/review/9148
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    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 b18fbf4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jun 25 12:24:47 2015 -0700
+commit 524db99
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:46:45 2015 +0200
 
-    Squelch a 64-bit-to-32-bit-narrowing warning.
+    GSM (a_common): fix comma at end of enumerator list [-Wpedantic]
     
-    Change-Id: I6efc077dedd50514bf06ef46deb21a85ae9ed23f
-    Reviewed-on: https://code.wireshark.org/review/9147
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 f1bc598
+commit f6fb630
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jun 25 12:14:39 2015 -0700
+Date:   Sat Aug 8 10:04:47 2015 -0700
 
-    Clean up 802.11 radio information handling.
-    
-    Have a field that holds the PHY type but nothing else.  Have
-    a union with structures holding PHY-type-specific information, as a
-    bunch of attributes are PHY-specific.
-    
-    If we have a channel and band, but don't have the frequency, attempt to
-    calculate the frequency, and add that to the radio information if we
-    succeed.  If we have the frequency, but don't have the channel, attempt
-    to calculate the channel, and add that to the radio information if we
-    succeed.
-    
-    Handle FHSS information, 11a "half/quarter-clocked" and turbo
-    information, 11g normal vs. Super G, additional 11n and 11ac
-    information, and the "short preamble" flag for 11b and 11g.
-    
-    Add a PHY type for 11 legacy DSSS and detect it if possible.
+    Fix another typo.
     
-    Clean up the AVS dissector - make all fields wlancap. fields (if you
-    want generic fields, use the wlan_radio. fields).
-    
-    Set more fields when writing out Commview Wi-Fi files.
-    
-    Change-Id: I691ac59f5e9e1a23779b56a65124049914b72e69
-    Reviewed-on: https://code.wireshark.org/review/9146
+    Change-Id: I1fee679b4b0f582806b0e9302c3e404c0222cd6d
+    Reviewed-on: https://code.wireshark.org/review/9930
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 8a89ebb
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 11:59:51 2015 -0700
-
-    cigi: if the packet is not cigi, just return
-    
-    don't THROW() an exception
-    
-    Change-Id: Ie0ddd8caf1963ab0ab7e8bb47a275ce887e19d60
-    Reviewed-on: https://code.wireshark.org/review/9145
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 419f672
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Apr 28 12:04:34 2015 -0700
+commit c60c1b9
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:37:58 2015 +0200
 
-    Replace Folder.CopyHere with 7-Zip.
-    
-    Server Core editions of Windows don't have shell.application. As a result
-    CopyHere and its unzip capabilities aren't guaranteed to be available.
-    Plus, CopyHere is just plain slow.
+    IEEE802.11: Fix typo
     
-    Remove the CopyHere code. Search for 7z and 7za in various places and
-    download the standalone 7za if needed.
+    Pseduo -> Pseudo
     
-    Bug: 11151
-    Change-Id: Ie719effbdcee3141764183bf3535ec9bd1c3e97a
-    Reviewed-on: https://code.wireshark.org/review/8226
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I34700b3392bfd7e47e79cb2cad0f65a1046a26a2
+    Reviewed-on: https://code.wireshark.org/review/9925
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 78e71f6
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 11:55:32 2015 -0700
+commit 454f08d
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Aug 8 09:57:14 2015 -0400
 
-    Remove the other g_hash_table_contains
+    If SOCKS server doesnt't require authentication, then client should be ready for commands.
     
-    Missed a bunch of them in g131f8f0.
-    
-    Change-Id: I5b1df810a31c26c3ab3cd778f8774519283217c8
-    Reviewed-on: https://code.wireshark.org/review/9143
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    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 cb0ee64
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jun 25 20:18:10 2015 +0200
+commit 9a16a69
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:10:48 2015 +0200
 
-    cmake/add_lemon_files: depend on lemon and lempar
-    
-    Add a dependency on the lemon binary and lempar.c files because the
-    output depends on these tools. This is already done for autotools and
-    nmake.
-    
-    In addition, clean up the generated .h and .out files.
+    NCP2222.py : fix generate indent (use 4 spaces)
     
-    Change-Id: Ic1fa2c23949abf05e976a67d226c90293b2ce834
-    Reviewed-on: https://code.wireshark.org/review/9139
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: Ibe55260e837f0a839649675c08e1bf66d8bcdb52
+    Reviewed-on: https://code.wireshark.org/review/9924
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 8b6c4c3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jun 25 14:41:53 2015 -0400
+commit 39ad1bf
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 13:20:52 2015 +0200
 
-    Limit the text displayed for the Filter label in the SRT dialog so it doesn't push the table off of dialog.
+    NCP2222(.inc): fix indent (use 4 spaces)
     
-    Add tooltip that displays entire filter string
-    
-    Bug: 6399
-    Change-Id: I094f3785eb15daf6e05485748f01c36a9a98e163
-    Reviewed-on: https://code.wireshark.org/review/9142
+    Change-Id: I8161423ae270f685c28003eac36adf15be83c5fd
+    Reviewed-on: https://code.wireshark.org/review/9922
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7f57175
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jun 25 14:33:28 2015 -0400
+commit b703f47
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 13:08:57 2015 +0200
 
-    Bugfix parsing filters out of SRT tables with parameters.
+    GTPv2: fix indent (use 4 spaces)
     
-    Change-Id: I5f9315b144333be789f8555f4128371994d4245b
-    Reviewed-on: https://code.wireshark.org/review/9141
+    Change-Id: I7836360ae4fe67098776911a496ecc969d3e093d
+    Reviewed-on: https://code.wireshark.org/review/9921
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit fcbf1d2
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jan 20 13:19:23 2014 +0100
+commit 5cf66db
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 15:38:34 2015 -0700
 
-    File: Add BTSNOOP File Format support
+    Add a missing dependency.
     
-    BTSNOOP format is supported by libwiretap and this dissector add
-    ability to open the same file in second mode:
-    1. Wireshark aka Protocol Viewer (default)
-    2. Fileshark aka File Viewer
-    
-    Mode 2 also has feature to dissect protocols contained by this file,
-    try "Protocol Preferences -> Dissect next layer".
-    
-    Change-Id: I99f0df5b55d31bf5a7d6e9269bfc054c09022b51
-    Reviewed-on: https://code.wireshark.org/review/17
-    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>
+    Change-Id: I2c9814419882f9bee30e70697d6f284393f275a9
+    Reviewed-on: https://code.wireshark.org/review/9919
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit b679e2a
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 11:09:28 2015 -0700
+commit 7cb2b11
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 15:08:22 2015 -0700
 
-    wmem: convert tree key to void*
+    Rework CMake dependendencies in the docbook directory.
     
-    Rather than forcing everything to live in guint32. We still use guints for now
-    via the G_POINTER_TO_UINT and vice-versa, but this paves the way in future for
-    custom comparison functions which will make e.g. string trees far more
-    efficient for long strings.
+    Create dependencies explicitly using add_dependencies. Otherwise MSBuild
+    only builds one output per run.
     
-    Change-Id: Ibb15400f74761ae295948507df8d2e022f2ebb05
-    Reviewed-on: https://code.wireshark.org/review/9138
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: If42605d7e7df499cf4d4b70336d97ac6d37e8ba6
+    Reviewed-on: https://code.wireshark.org/review/9918
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 131f8f0
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 10:45:25 2015 -0700
+commit a001ed6
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 7 15:27:11 2015 -0700
 
-    Remove g_hash_table_contains from plugin_if
+    Avoid (unlikely) NRB record size overflows.
     
-    The OSX 10.5 build doesn't seem to like it.
+    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.
     
-    Change-Id: I7471639f649dbf89ba77d78f77faebbeefcf4ed3
-    Reviewed-on: https://code.wireshark.org/review/9134
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit e4f88dd
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 10:34:25 2015 -0700
-
-    Fix a memory leak registering prefs
-    
-    Built-in string prefs have to be dynamic, but get overwritten by the
-    registration routine, so we have to save and then free them after-the-fact.
+    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).
     
-    Change-Id: Ib418b14296391dd198a8b49b0c99c5f697d8050f
-    Reviewed-on: https://code.wireshark.org/review/9132
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 9dd21d9
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 09:44:58 2015 -0700
-
-    Qt, cmake: put the build dir before the source dir in the include path
+    Clean up some comments.
     
-    this should prevent Visual Studio from picking up generated include
-    files which may be lying around in the source tree (as leftovers from
-    previous in-tree builds)
+    Remove a _U_ that's applied to a variable that *is* used.
     
-    Change-Id: I2406c31bc0638eb13ed4b539ddc607512051033d
-    Reviewed-on: https://code.wireshark.org/review/9130
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I153d5aa885105149c62a5e5d2b78b54cf6ed7b4e
+    Reviewed-on: https://code.wireshark.org/review/9917
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 534d1d5
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 09:17:03 2015 -0700
+commit 817d9bd
+Author: Timothy Geiser <slimshady007@inbox.lv>
+Date:   Wed Aug 5 15:19:48 2015 -0400
 
-    Qt: use <> for including the generated ui_*.h files
+    Add SHA2 algos to certificate dissection in SSL
     
-    this should make Visual Studio pick up the generated include files
-    from the build directory instead of the source directory (which may
-    contain lefovers from an in-tree build)
-    
-    Change-Id: Ie3de4cdd85a2865e203118a42ab10f443372f03b
-    Reviewed-on: https://code.wireshark.org/review/9129
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
+    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 6c698f3
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 09:54:06 2015 -0700
+commit 240105e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 12:37:33 2015 -0700
 
-    diameter: fix a memory leak on startup
+    Fixup the Qt splash overlay progress calculations.
     
-    If we can't read the dictionary containing all our definitions, free necessary
-    memory before returning.
+    Fix a couple of issues in the way we calculate the splash overlay
+    progress.
     
-    Change-Id: I814962d920852b9a82acb3bb2e7bc41addd835f7
-    Reviewed-on: https://code.wireshark.org/review/9131
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 74e526f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Apr 2 23:11:51 2015 -0400
-
-    Add proper "Decode As" mechanism for L2TPv3 subdissectors instead of preference.
+    Avoid unnecessary repaints.
     
-    Change-Id: I87f6f9f40e1c33148de43b53a8881d51416f5d2c
-    Reviewed-on: https://code.wireshark.org/review/7898
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I1f4800b2c2836b67ca9ff3d6d24af150f4379ba9
+    Reviewed-on: https://code.wireshark.org/review/9916
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit acc5810
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Fri Jun 5 11:19:37 2015 +0200
+commit 0a1d1bd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 10:19:22 2015 -0700
 
-    Plugin Interface: Add GUI callbacks
+    More casting issues with older versions of GLib.
     
-     Rename ext_menubar to a more appropriate plugin_if.
+    Try to fix
     
-     External menus can be implemented by plugins to present
-     additional menus for deep-packet analysis. One side-effect
-     of such menus being implemented as plugins is, that they
-     are being executed in different threads and therefore can
-     only use limited access to the main GUI. Also, there is
-     no safe cross-gui (GTK and Qt) way for many features.
+    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
     
-     This patch implements a first functionality, by which a
-     plugin implemented using ext_menubar can apply a display
-     filter to the main view.
+    packet-btrfcomm.c: In function 'btrfcomm_directed_channel_value':
+    packet-btrfcomm.c:287: warning: cast to pointer from integer of different size
     
-     For now the implementation supports filtering, as well as
-     saving a preference.
+    packet-btobex.c: In function 'btobex_profile_value':
+    packet-btobex.c:1134: warning: cast to pointer from integer of different size
     
-    Change-Id: Iffe4caa954bbeb8ce356352de4dae348a50efba9
-    Reviewed-on: https://code.wireshark.org/review/8773
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    on the 32-bit OS X builder.
+    
+    Change-Id: Ieb2fe6c31fdad0cf776c24bada7a6a83e8aa91ec
+    Reviewed-on: https://code.wireshark.org/review/9915
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit d4aa1a1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jun 25 18:11:42 2015 +0200
+commit 147ab19
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 08:39:09 2015 -0700
 
-    Qt: mark unused parameters as such
+    Switch the floats in stat_tap table items to doubles.
     
-    Change-Id: Ib53d6da0d6660cf2c6a3283ff6123a2f18a8abda
-    Reviewed-on: https://code.wireshark.org/review/9128
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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 e963cbf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jun 24 16:58:25 2015 -0700
+commit c90fcba
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 7 14:55:50 2015 +0200
 
-    editcap: keep timestamp resolution when converting a nseclibpcap file to pcapng
+    Lua: Count Lua plugins in splash screen
     
-    As reported on https://ask.wireshark.org/questions/43483/why-does-editcap-write-out-nseclibpcap-correctly-with-nanosecond-timestamps-but-not-with-pcapng
+    This will avoid slow startup when having many Lua plugins.
     
-    Change-Id: I81ec6dd6bdc6008297141ca8e210f4fb989cd3d6
-    Reviewed-on: https://code.wireshark.org/review/9111
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    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: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit cb84022
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Jun 24 15:41:22 2015 -0700
+commit c8ca0ae
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 09:10:39 2015 -0700
 
-    Qt: fix crashes when Wireshark is closed while running a capture
+    Try to fix casting issues with older versions of GLib.
     
-    if we haven't captured any packets yet, don't display a warning about
-    unsaved changes
+    Try to fix
     
-    make sure that we're not running into a scenario where
-    MainWindow::testCaptureFileClose() tries to close the capture file at
-    the same time as the pipe handler who sees an eof on the pipe
+    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
     
-    cf_has_unsaved_data() should return false if we have a temporary file
-    that contains no packets
+    on the 32-bit OS X builder.
     
-    Change-Id: I18d75bd658b85d45dd3313d49e2cd654c6300de5
-    Reviewed-on: https://code.wireshark.org/review/9109
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I02884c02e7f7f5f7b50da122127fa96c41c3603a
+    Reviewed-on: https://code.wireshark.org/review/9913
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1810112
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Feb 11 16:34:08 2015 -0500
+commit 7171ee5
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Thu Aug 6 17:44:42 2015 -0400
 
-    Add minimize and maximize buttons to the TCP stream dialogs.
+    [ieee80211] Rework QoS Capability and QoS info code.
     
-    The first thing I generally do when I open a graph is to maximize it.
-    Having a maximize button makes that a lot easier. Call QDialog(NULL,
-    Qt::Window) similar to g80342e4.
+    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.
     
-    Call QDialog(NULL) in the about box.
+    - 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: I4f229ab579d0912cb03ba8f8d0300d933d0ba914
-    Reviewed-on: https://code.wireshark.org/review/7072
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    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>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 7e62a03
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jun 6 15:07:53 2015 +0200
+commit f657e6a
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 7 14:50:02 2015 +0200
 
-    fix the 'then' statement is equivalent to the 'else' statement found by PVS Studio (V523)
+    [GTPv2] Mark a parameter as unused.
     
-    Change-Id: I016e69f43bad98eb0604852ea658adaa5fe77c12
-    Reviewed-on: https://code.wireshark.org/review/8786
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I37c983d756f23469e4cf1abd31b9c591f5612542
+    Reviewed-on: https://code.wireshark.org/review/9909
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3f5d183
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jun 25 02:05:30 2015 +0200
+commit 5bbb6ff
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 7 14:19:30 2015 +0200
 
-    Stop using atof/strtod (fixes column sorting of float types)
-    
-    atof is locale-dependent. In locales such as Swedish, German and Dutch,
-    the dot is a thousand separator, resulting in wrong conversions for
-    floats.
-    
-    While at it, make the mate dissector also be independent of locale.
-    Blacklist atof in checkAPIs. Lemon is still using strtod, but that is
-    not our problem for now.
+    Try to fix packet-rpc.c:3909: warning: implicit conversion shortens 64-bit value into a 32-bit value
     
-    Bug: 11297
-    Bug: 8964
-    Change-Id: I6fe3e45eb1d6d95d41aa4f3af1f81a6204a60c63
-    Reviewed-on: https://code.wireshark.org/review/9116
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I8962f93662047d01ef71ba9689b338d095f31300
+    Reviewed-on: https://code.wireshark.org/review/9908
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit fe6ece9
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Jun 24 19:15:43 2015 -0700
+commit 99873f7
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 7 14:04:52 2015 +0200
 
-    afp: replace all calls to THROW() and do proper error handling
+    [GTPv2] Dissect IE MM Context for CS to PS SRVCC, update value strings.
     
-    Change-Id: Ie471a67a978aeb54727d03f93b98e3e422441a58
-    Reviewed-on: https://code.wireshark.org/review/9119
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Bug: 11423
+    Change-Id: I5a845e40fcbd4e06dec60c64edca9e8fea1459e1
+    Reviewed-on: https://code.wireshark.org/review/9907
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 47abcfc
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 08:17:23 2015 -0700
+commit fd19aaf
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 6 10:56:22 2015 -0700
 
-    Vagrant setup fixes
+    Add ONC RPC program stats.
     
-    - add license headers to the scripts
-    - don't mount `.` into the VM manually, vagrant already puts it in /vagrant/
-      for us, just use that.
-    - build with -j3, slightly more efficient even with two cores
+    Convert ONC RPC program stats to the stat_tap API.
     
-    Change-Id: I43580ade7ae2635696072b39e4f18a401a030a85
-    Reviewed-on: https://code.wireshark.org/review/9127
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 92c8c3a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jun 25 05:04:27 2015 +0200
-
-    TCP: Add expert info to indicate when there is TCP Fast Open SYN (with Cookie)
-    
-    Coming after Jasper talk #Sharkfest15 about TCP stuff
+    Add a "user_data" member to the stat_tap_table_item_type struct.
     
-    Change-Id: I2b01bc6dfe24e28454101da59720d2c74603b88f
-    Reviewed-on: https://code.wireshark.org/review/9120
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    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 c37b05d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jun 24 19:07:16 2015 +0200
+commit 0c9998d
+Author: Jan-Hendrik Bolte <jabolte@uos.de>
+Date:   Mon Jul 20 14:37:49 2015 +0200
 
-    ARUBA (ERM): Add type 5
-    
-    it using PeekRemote-Ng (with Header version = 2)
+    Add dissector for MQTT-SN v1.2
     
-    Change-Id: I601cb7ecfaf01e51ec696502d10918f869486d01
-    Reviewed-on: https://code.wireshark.org/review/9126
+    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: Michael Mann <mmann78@netscape.net>
-
-commit 85d3989
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jun 24 18:51:35 2015 +0200
-
-    Aruba (ERM): Add missing type 4 (PPI) to Decode AS
-    
-    Change-Id: If2cb75fc9992bec2d699c5abace06dccc8bfb4ae
-    Reviewed-on: https://code.wireshark.org/review/9125
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0a28aa4
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Jun 25 09:37:28 2015 +0200
+commit 4557c17
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Aug 5 17:30:47 2015 +0200
 
-    Revert commit cc8ed845ed53ed60fa776728f1d7f2659dd311a3
-    Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-    Date:   Wed Nov 12 13:39:07 2014 +0100
+    androiddump: Try to make MVS14.0 happy
     
-        Invoke asn2wrs.py using a custom command
+    I guess using glib's gssize instead of ssize_t should be enough for:
     
-    Fixes  bugid 11304
+    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
     
-    Once there is a better solution feel free to revert the revert.
-    
-    Change-Id: Id64b621c5f3b8a934ce9ec5c3c127326efab46f2
-    Reviewed-on: https://code.wireshark.org/review/9122
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    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>
 
-commit ba5e0a3
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Jun 24 23:23:03 2015 -0700
+commit dc33bba
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Thu Aug 6 21:47:37 2015 -0400
 
-    Netflow: fix typo (wrong time units for duration)
+    [ieee80211] Change one ENC_LITTLE_ENDIAN MAC address to ENC_NA; byte order doesn't
+    apply to them.
     
-    Bug: 11295
-    Change-Id: Id732dd77609bc453e81703595882b20f68742618
-    Reviewed-on: https://code.wireshark.org/review/9121
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: I4b0fcfe5d970877d7f8453e6c6f8c48ee69c2e38
+    Reviewed-on: https://code.wireshark.org/review/9905
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 5aaaa55
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Jun 24 19:05:38 2015 -0700
+commit ff24ecc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 6 11:23:55 2015 -0700
 
-    Add basic Vagrant configuration
-    
-    For non-linux developers this should somewhat simplify development with e.g.
-    valgrind and other useful tools.
+    Fixup stat_tap table freeing.
     
-    Change-Id: I973ab7412ad9a61f0892c25c079ea3424208abd1
-    Reviewed-on: https://code.wireshark.org/review/9117
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit d1a81df
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jun 24 19:34:26 2015 -0700
-
-    NAS EPS: fix a missed capital letter
+    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: I937b832807e7fb5af69d0f3238011b41f9223f12
-    Reviewed-on: https://code.wireshark.org/review/9118
-    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 6126a64
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jun 24 18:04:13 2015 -0700
+commit 9fd3bcc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 6 12:31:21 2015 -0700
 
-    Fix proto_tree_add_bytes_item() when we fail to decode number from string
+    Add an elide mode preference for the Qt packet list.
     
-    We still need to insert an empty g_byte_array
-    
-    Bug: 11309
-    Change-Id: Idf2ed8ea81b3f612ef8d6ae1aed158108dcc4356
-    Reviewed-on: https://code.wireshark.org/review/9114
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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 585f944
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Jun 24 18:00:16 2015 -0700
+commit fda29e1
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Aug 6 08:39:22 2015 -0700
 
-    acse: don't THROW() an exception from a dissector
+    Use int_to_qstring in a few more places.
     
-    we already have an expert info, we can simply exit
-    
-    Change-Id: I8adbfb084991195152a02bbef64c38c5aa9e841e
-    Reviewed-on: https://code.wireshark.org/review/9113
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    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 cdc7d25
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jun 24 12:21:42 2015 -0700
+commit 5fa57ec
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Thu Aug 6 13:30:59 2015 +0200
 
-    Add ability to export PDUs for heuristic dissectors also
+    [MSVC 2015]Once agin revert tho original, now as a separate patch.
     
-    Change-Id: I1bf1aa9794f9b4f106edffd4986fc0b1014522fa
-    Reviewed-on: https://code.wireshark.org/review/9099
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: If25a1e4ced74d88c87def010b9d8032b5d870307
+    Reviewed-on: https://code.wireshark.org/review/9898
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit f5b09f2
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Jun 24 16:03:17 2015 -0700
-
-    print blank strings in -Tfields
-    
-    I'm not 100% sure if this is really a good idea in all cases, but at least some
-    people want it.
-    
-    Bug: 10906
-    Change-Id: I26e69a683781cdc6ba1cfcd6a41458bbca7ca2c0
-    Reviewed-on: https://code.wireshark.org/review/9108
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit cf8eed9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Mar 7 16:37:14 2015 -0500
+commit 544bca7
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Thu Aug 6 13:21:26 2015 +0200
 
-    Dissect 802.3 Jumbo frames while capturing.
+    include <stdlib.h> to make windows build boot happy.
     
-    Following the code Olivier Montanuy's code suggestion from bug 5390.
-    
-    Bug: 5390
-    Change-Id: Ie7425a76fd65fc9d50474c010b4a5beb1b3cf73e
-    Reviewed-on: https://code.wireshark.org/review/7588
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I7a8b259698fdca0707464929a77c0b320f6a19f1
+    Reviewed-on: https://code.wireshark.org/review/9897
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f75e52b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jun 24 22:36:53 2015 +0200
+commit aa2184f
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Thu Aug 6 13:01:45 2015 +0200
 
-    file.c: fix Fix Branch condition evaluates to a garbage value found by Clang Analyzer
+    Fix pcapng.c:3788: warning: implicit conversion shortens 64-bit value into a 32-bit value
     
-    Change-Id: Ib7c9e114973f78775cf17889b6aeab217cb6d0ef
-    Reviewed-on: https://code.wireshark.org/review/9101
+    Change-Id: Ie796cee755470bea0416b46ff8ff6a94cd8d93d3
+    Reviewed-on: https://code.wireshark.org/review/9896
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 89cc85b
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Jun 24 14:33:27 2015 -0700
-
-    Disable "Refresh Interfaces" when capturing
-    
-    It breaks restarts, and doesn't do anything useful at this point anyways.
-    
-    Bug: 11176
-    Change-Id: I6a010becf851fea8690b445874b29b54546fb2e3
-    Reviewed-on: https://code.wireshark.org/review/9106
-    Reviewed-by: Evan Huus <eapache@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 0d28caf
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Jun 24 14:41:44 2015 -0700
+commit b4dea54
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 20:44:09 2015 -0700
 
-    qt: fix more button states
-    
-    As in gcc614a9 we have to manually uncheck buttons if we decide not to action
-    them.
+    Try to fix dist.
     
-    Change-Id: Ia5dc29a292bc6d75a1e8753da06a053cafa66866
-    Reviewed-on: https://code.wireshark.org/review/9107
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I04c4a06f8d2db4d9ac1a09fea25d4f587c1f1fc1
+    Reviewed-on: https://code.wireshark.org/review/9893
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit cc614a9
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Jun 24 14:18:04 2015 -0700
+commit 910438b
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Jul 20 10:35:06 2015 -0400
 
-    qt: fix button state when cancelling save
+    Pcapng: support Name Resolution Block options
     
-    If the user decides not to capture after all, by hitting cancel when prompted
-    for their unsaved changes, we have to manually uncheck the button again because
-    Qt helpfully checks it for us.
+    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).
     
-    Bug: 11145
-    Change-Id: I362d72787ddb138d382a899d091698c6652eebb2
-    Reviewed-on: https://code.wireshark.org/review/9102
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 1f0226c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jun 24 14:18:13 2015 -0700
+commit 1420f3d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Aug 5 20:12:31 2015 -0700
 
-    dumpcap: fix files capture autostop condition
-    
-    CND_CLASS_CAPTURESIZE condition type needs the tested parameter to be a guint64
+    Add ui_gsm_map_summary_dialog.h so it goes into the source tarball.
     
-    Bug: 11305
-    Change-Id: I096d995e1e08ff3a81b2a95710185d272d849c86
-    Reviewed-on: https://code.wireshark.org/review/9104
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ib0780e5ba62d069d2b41ef7ac7da513981660c7f
+    Reviewed-on: https://code.wireshark.org/review/9892
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ec094b5
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Jun 24 11:52:19 2015 -0700
+commit c6889d8
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Aug 5 19:45:12 2015 -0700
 
-    Initialize default stats before using them
-    
-    Quick hack fix for bug 11275.
+    Fix some encoding arguments.
     
-    The longer fix I am still thinking about, but it goes something like this: we
-    have a terribly confusing dependency graph in ordering our various preferences,
-    so it's fragile and needs refactoring.
+    802.11 is overwhelmingly little-endian; change all 1-byte fields that
+    were ENC_BIG_ENDIAN to ENC_LITTLE_ENDIAN.
     
-    1. We must call epan_init before we read the preferences files, since dissectors
-    register many preferences.
-    2. We must call pre_init_prefs before we call prefs_register_modules, since that
-    inits the default values of the "global" preferences structure. `init_prefs()`
-    handles this normally.
-    3. We must call epan_init before we call init_prefs since init_prefs depends on
-    UATs being initialized (which is something epan_init does).
-    4. We must call prefs_register_modules before we call epan_init since that
-    generates the `protocols` subtree which is needed for registering
-    dissector-specific preferences.
+    Change one ENC_BIG_ENDIAN MAC address to ENC_NA; byte order doesn't
+    apply to them.
     
-    The above graph has a cycle, which I *think* can be solved by splitting
-    prefs_register_modules?
+    The remaining ENC_BIG_ENDIANs should be checked.
     
-    Bug: 11275
-    Change-Id: I08dae6a7ade178896e0de5e5091f7eeaca95846f
-    Reviewed-on: https://code.wireshark.org/review/9098
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I3dc51a5555b99c25dce0d3b7f3be4c441b13d1a3
+    Reviewed-on: https://code.wireshark.org/review/9890
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 137c495
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jun 24 12:26:26 2015 -0700
+commit f30ac4a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Aug 5 19:08:36 2015 -0700
 
-    Run compress-pngs.sh.
+    Fix a bunch of typoes in variable and field names.
     
-    Change-Id: If662cfbe6ad2ce80916d32750476e95f607fe902
-    Reviewed-on: https://code.wireshark.org/review/9100
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 58b0354
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Jun 24 19:46:20 2015 +0200
-
-    Add a bunch of " I missed in my previous patch.
+    Fix spelling, get rid of period at end of some field names.
     
-    Change-Id: Ia94034bdb2148bca641b7c9bc6ec3f900c7574d3
-    Reviewed-on: https://code.wireshark.org/review/9097
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Change-Id: I1963cdc92657dca8708133796f8835bdffee0c47
+    Reviewed-on: https://code.wireshark.org/review/9888
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 95ac390
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Jun 23 21:35:46 2015 -0700
+commit b7f5eaa
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 17:42:53 2015 -0700
 
-    Remove the last deprecated tvb_length calls
+    Convert the GSM MAP stats to new "generic stat API".
     
-    And remove the shims themselves!
-    
-    Change-Id: I511c06eb21eaf68d1dc36bbb9558408807472f9c
-    Reviewed-on: https://code.wireshark.org/review/9088
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 86e562f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jun 24 19:16:18 2015 +0200
-
-    Qt: Add x-capture-file-reload@2x.svg to Makefile.am
+    Convert both the MAP statistics and summary. As with the GSM A stats
+    this are mostly untested.
     
-    Change-Id: I497290eff821167a31468a10af23ab762eff32fe
-    Reviewed-on: https://code.wireshark.org/review/9095
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    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 d406b28
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 23 21:33:09 2015 -0700
+commit 05eb9b6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 17:03:03 2015 -0700
 
-    Don't export libnghttp2 routines outside libwireshark.
+    Add proper base prefixes in display filter expressions.
     
-    Hopefully this will fix build issues that popped up on Windows, as well
-    as making the library a bit cleaner.
+    When the user selects an enum in the display filter expression dialog
+    make sure we add the proper base prefix
     
-    Change-Id: I5b5266af4b41e10aba32abdb46bfe811ab11b45d
-    Reviewed-on: https://code.wireshark.org/review/9087
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 17c59f5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 23 20:26:30 2015 +0200
-
-    Qt: Add Reload button on MainToolBar
+    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.
     
-    Add @2x versions of x-capture-file-reload as well.
+    Fix search visibility while we're here.
     
-    Change-Id: I08819cf66903884e0344a4f9bcd891befb582e90
-    Reviewed-on: https://code.wireshark.org/review/9066
+    Bug: 11421
+    Change-Id: I1368bc8f464983793bdc90760cf3b7c18b6bd859
+    Reviewed-on: https://code.wireshark.org/review/9885
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 5dcd207
-Author: Evan Huus <eapache@gmail.com>
-Date:   Wed Jun 24 08:32:13 2015 -0700
+commit ef0bdbc
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Aug 5 18:23:53 2015 -0700
 
-    Check _MSC_VER is defined before we use it
+    Cleanup a bunch of 802.11ad stuff.
     
-    Otherwise it breaks a bunch of stuff on Linux machines because of the way gcc's
-    preprocessor works (buildbot decryption tests, extcap, etc).
+    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.
     
-    Originally added in Ic5360089f96be620fbe99ba4e819e0caa5ca0215
+    For the "number of taps" bitfields, interpret the values.
     
-    Change-Id: Iad43fa1415aa331ae375771adac0818ea1b99060
-    Reviewed-on: https://code.wireshark.org/review/9091
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit b7aacfd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jun 24 17:29:15 2015 +0200
-
-    libnghttp2: readd remove check for CONFIG.H
+    Fix a typo ("pseduo" -> "pseudo").
     
-    i hope will be fixed Windows 32 buildbot
+    The length of an OCT MMPDU is 16 bits, not 8 bits, and it's not a text
+    string, it's an octet string.
     
-    Change-Id: Ie4429193d354ff70b4802fa8a734cb35a69c090c
-    Reviewed-on: https://code.wireshark.org/review/9090
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 69cdfe9
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Jun 23 21:30:15 2015 -0700
-
-    Remove another batch of deprecated tvb_length calls
+    The Beacon Interval Control is 48 bits, not 64 bits.
     
-    Change-Id: Icfdde38e40cca05d0705a081153a4ea3e8782ee7
-    Reviewed-on: https://code.wireshark.org/review/9086
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit d0faa9a
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 23 15:17:10 2015 +0200
-
-    HTTP2: Update to libnghttp2 1.0.4
+    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.
     
-    Change-Id: Ia92d183b7e7b5a604d75eee13b64b827ad0af903
-    Reviewed-on: https://code.wireshark.org/review/9054
-    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>
+    Bug: 11419
+    Change-Id: Ib00ad030ecb33cf676bec23c05b15a4211c75c07
+    Reviewed-on: https://code.wireshark.org/review/9886
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ae92a83
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Wed Jun 24 04:22:16 2015 +0200
+commit dc09d18
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 16:19:24 2015 -0700
 
-    Update build instructions for cmake near the end a bit
+    Output xhtml guides everywhere.
     
-    Change-Id: I7d5b8ab3479cc4268b6cc5ae7822066a69b740dc
-    Reviewed-on: https://code.wireshark.org/review/9085
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 1425255
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 23 19:08:14 2015 -0700
-
-    Handle downloading and installing CMake 3.x.
+    Update Autotools / Nmake to generate xhtml5 user and developer guides.
     
-    Change-Id: I2347e3e36008fee006e9f66997d45b562eacc7dc
-    Reviewed-on: https://code.wireshark.org/review/9084
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I5024151aecaee62ea6d8469807fabda552d3f663
+    Reviewed-on: https://code.wireshark.org/review/9884
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 9b5b7c1
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Jun 23 17:30:22 2015 -0700
+commit 6aabad5
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Wed Aug 5 09:36:20 2015 +0200
 
-    Remove deprecated tvb_length calls
+    epl: Fix Payload sub-dissection
     
-    Trust that the files in epan/ immediately (not dissectors) know what they're
-    doing so just blindly convert them to captured length.
+     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: I872f7d58b2e15ae82c75fd56f4873996fbc97be7
-    Reviewed-on: https://code.wireshark.org/review/9083
-    Reviewed-by: Evan Huus <eapache@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 893e1e5
+commit 504f5b3
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 23 17:25:17 2015 -0700
+Date:   Wed Aug 5 13:00:38 2015 -0700
 
-    Fill in the 802.11 pseudo-header and call the "802.11+radio" dissector.
+    Clean up some fields.
     
-    Do with the Prism and AVS headers what we do with the radiotap, PPI,
-    etc. headers.
+    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".
     
-    Change-Id: I4b2522a2b294f53f22c363cd43604c4af0304fc2
-    Reviewed-on: https://code.wireshark.org/review/9082
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit f92fab4
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Jun 23 17:22:18 2015 -0700
-
-    Remove a bunch more deprecated tvb_length calls
+    Rename it to "docsis.len", as it's always LEN, not SID; there's a
+    separate field for the SID.
     
-    (getting really close!)
+    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.
     
-    Change-Id: Ibf22a5f727c4dc0070b78144a4b0ab8e0c5e1bce
-    Reviewed-on: https://code.wireshark.org/review/9081
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit ad784bc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 23 17:21:17 2015 -0700
-
-    Put the frequency/channel and RSSI data into columns.
+    Update some comments while we're at it.
     
-    Change-Id: I039e727aff46c08b93908a216608e196ed4bd662
-    Reviewed-on: https://code.wireshark.org/review/9080
+    Change-Id: Ib7c4a0cda65cef25dcaf0051b3de89758ef4c29c
+    Reviewed-on: https://code.wireshark.org/review/9881
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a8acb53
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 23 17:18:45 2015 -0700
+commit f0beaa1
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Wed Aug 5 09:39:08 2015 +0200
 
-    Pass the signal and noise dBm values to the 802.11 radio dissector.
+    openSAFETY: Better display of packet info
     
-    Change-Id: Ia3fa6ba0b1d16315c77895f3e8ae96ed7e5e1e02
-    Reviewed-on: https://code.wireshark.org/review/9079
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit fa6ebae
-Author: Robert Cragie <robert.cragie@arm.com>
-Date:   Thu Jun 11 16:36:34 2015 +0100
-
-    Improved prefix display and comments for IID copying
+     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: I58f56dd5cfc212e53bd7e9d575d2cf9b4b4f2b27
-    Reviewed-on: https://code.wireshark.org/review/8886
-    Petri-Dish: 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: Anders Broman <a.broman58@gmail.com>
-
-commit 93592e4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Jun 24 00:46:56 2015 +0200
-
-    openwire: remove useless register_init_routine call
-    
-    Change-Id: Ifc638e92d4b148a2efeb6c488ab4dc2a57a054e7
-    Reviewed-on: https://code.wireshark.org/review/9076
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 0a9a255
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Jun 23 15:17:27 2015 -0700
-
-    Remove more deprecated tvb_length calls
-    
-    Change-Id: Ie137e6f4e20fe26b1a4d9510e267896219c1c631
-    Reviewed-on: https://code.wireshark.org/review/9075
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit d4f6480
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Jun 23 14:01:22 2015 -0700
-
-    ISAKMP: fix Cisco fragmentation support.
-    
-    Last flag wasn't mapping to 'more fragments' properly, and reassembly
-    should only be attempted on the last frame.
-    
-    Bug: 7940
-    Change-Id: I565f2b72b6eb68dc32e0f57a43a098a8f203a800
-    Reviewed-on: https://code.wireshark.org/review/9073
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit e53337a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Jun 23 13:58:55 2015 -0700
-
-    replace another bunch of deprecated tvb_length calls
-    
-    Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2
-    Reviewed-on: https://code.wireshark.org/review/9074
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 99ab5c9
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Tue Jun 23 11:19:07 2015 -0700
+commit 62e56ad
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 10:59:51 2015 -0700
 
-    netflow: cope with multiple duration types in one flow.
+    Make sure we use "*.html" in our chunked output.
     
-    Bug: 11295
-    Change-Id: I71493e13989dbc29e3e3e7d518d3b6686fbec01a
-    Reviewed-on: https://code.wireshark.org/review/9063
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Idb441084ec50ec336b7f514895aba799832e8f66
+    Reviewed-on: https://code.wireshark.org/review/9879
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 633ba95
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Jun 23 13:21:02 2015 -0700
+commit 3b2e6d9
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Aug 5 16:25:16 2015 +0000
 
-    [Qt] switch screens only if we're acutally starting a capture
-    
-    don't do the switch when the capture can't be started
-    (e.g. because we didn't select any interface from which to capture)
+    Revert "[MSVC 2015] Fix errors seen with the released version by reverting the code to what failed on the RC version *sigh*"
     
-    Change-Id: Ibabd703863d546c95b9fbe9bd2280d67a22dfc26
-    Reviewed-on: https://code.wireshark.org/review/9072
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 911b934
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Jun 23 12:53:26 2015 -0700
-
-    [Qt] if the capture is stopped before we received any packet...
+    Reverted commit break DecodeAs for Bluetooth, also caused crashes.
     
-    ... we go back to the main welcome screen like we do in GTK
+    This reverts commit 2221153a9cc083a50248a72a4b4009908d84e38b.
     
-    Change-Id: I64ef29665af61da55c1971ca59d1fab25d205874
-    Reviewed-on: https://code.wireshark.org/review/9071
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 2b68a6f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jun 23 21:46:48 2015 +0200
-
-    tshark: fix memleak from version lookup
-    
-    Immediately release memory after using it, fixes a direct memleak
-    warning from ASAN.
-    
-    Change-Id: Icd3ff19c607da790a4a093966e1966cb0df6bb9d
-    Reviewed-on: https://code.wireshark.org/review/9069
+    Change-Id: Idb91747b986f110fffa3444f8c52d800c128e141
+    Reviewed-on: https://code.wireshark.org/review/9877
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d85a221
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Jun 23 10:58:38 2015 -0700
+commit 53a8033
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 5 09:30:40 2015 -0700
 
-    proto_tree_add_item_ret_(u)int: do the NULL check at the start
+    Generate XHTML5 documentation.
     
-    before hfinfo is actually used (coverity 1293631)
+    When converting from DocBook to HTML, use DocBook's xhtml5 XSL
+    stylesheets.
     
-    Change-Id: I270c30c4699cd6f831a38986e6c8024c2e9ef47a
-    Reviewed-on: https://code.wireshark.org/review/9061
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I7a49d60c46a17e1e639b78ee10c4b9fa832d4a77
+    Reviewed-on: https://code.wireshark.org/review/9878
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit b216d26
-Author: Cenk Gündoğan <cnkgndgn@gmail.com>
-Date:   Sun Jun 21 22:42:00 2015 +0200
+commit 2221153
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Aug 5 14:37:20 2015 +0200
 
-    extend the RPL dissector with basic P2P RPL support
+    [MSVC 2015] Fix errors seen with the released version by reverting the
+    code to what failed on the RC version *sigh*
     
-    Bug: 11301
-    Change-Id: I5569322a05c770524e0f0e7892addd15c7f7dbab
-    Reviewed-on: https://code.wireshark.org/review/9053
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I1b7f6d57da4cb71473a074291da7e5a0d5242c95
+    Reviewed-on: https://code.wireshark.org/review/9874
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 89fbf02
+commit 5de487a
 Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Jun 23 22:03:20 2015 +0200
+Date:   Wed Aug 5 14:30:27 2015 +0200
 
-    [MSVC 2015] file_exists() fails on MSVC2105 as file_stat.st_ino gets reset
-    to zero in the function call if the file does not exist. The general code
-    seems to work with MSVC2015 so use that.
+    [MSVC 2015] Compiler and visual studio version are off by 5 not 6 in MSVC
+    2015.
     
-    Change-Id: Ic5360089f96be620fbe99ba4e819e0caa5ca0215
-    Reviewed-on: https://code.wireshark.org/review/9070
+    Change-Id: I5476656789893af2c8aeb5dfe5cf06972fd8bd4b
+    Reviewed-on: https://code.wireshark.org/review/9873
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 65bac2d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 23 11:29:46 2015 -0700
+commit 8bf1237
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Aug 3 22:21:24 2015 +0200
 
-    Remove the P1 dissector from the dirty dissectors list.
+    MAC CTRL: fix dissection of PAUSE frame
     
-    It was already added to the clean dissectors list, but wasn't removed
-    from the dirty dissectors list, so it was built twice and linked in
-    twice, and hilarity ensued.
+    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: Ic4636f17b61e619546dc21a04ebbaace0296d583
-    Reviewed-on: https://code.wireshark.org/review/9067
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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: Anders Broman <a.broman58@gmail.com>
 
-commit 0901e26
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jun 23 10:31:58 2015 -0700
+commit ad4ab2a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 14:56:46 2015 -0700
 
-    Qt: change default behavior of 'Decode As' window
+    Convert the GSM A stats to new "generic stat API".
     
-    Up to know Qt 'Decode As' window was saving manual configuration automatically, contrary to GTK UI.
-    This can be misleading when decoding protocols without a fixed identifier (port number, USB bus/device id, ...).
-    Opening a new trace might lead to previous and now irrelevant settings being applied.
-    Make this optional and add a Save button to permanently store the current configuration.
+    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: I077c560f9e71cab16a74247e2e9d87523c0ed85e
-    Reviewed-on: https://code.wireshark.org/review/9058
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    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>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 8bc294c
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Jun 23 11:24:48 2015 -0700
+commit 4d673b2
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 08:56:28 2015 -0700
 
-    Replace more deprecated tvb_length calls
+    Convert Camel tap stats to new "generic stat API".
     
-    The return values of new-style dissectors always use the captured length, so
-    replace those automagically with sed.
+    Migrate the Camel stats similar to the recent BOOTP and H.225
+    migrations.
     
-    Change-Id: Ic43072ee4a80d433cd4264444583a0e670adc26a
-    Reviewed-on: https://code.wireshark.org/review/9065
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    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 d7b286c
+commit 3e6b527
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jun 23 11:19:48 2015 -0700
+Date:   Tue Aug 4 10:16:23 2015 -0700
 
-    Qt: Be less aggressive about reselecting packets.
+    Remove the CLI H.225 counter.
     
-    Don't reselect the current row in redrawVisiblePackets. That routine is
-    called in quite a few places, including ones where we don't want to
-    automatically scroll to the current packet.
+    Stats were moved to the dissector in g03802cc.
     
-    Change-Id: Ia29a832235c0e260d8b17f1ce76745047700537b
-    Reviewed-on: https://code.wireshark.org/review/9064
+    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 9723c7a
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Jun 23 11:13:21 2015 -0700
+commit 4e14a26
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 11:45:24 2015 -0700
 
-    Remove more deprecated tvb_length calls
+    Don't zero stat tap elements.
     
-    Change-Id: Ie40a195db622ebfb096fa5088c5467a1385e69bf
-    Reviewed-on: https://code.wireshark.org/review/9062
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Let the reset callback take care of resetting our rows.
+    
+    Change-Id: I59b0e9d36a9a1cedc5a5893664c875b7416a5229
+    Reviewed-on: https://code.wireshark.org/review/9868
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit bc14725
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Jun 23 09:26:34 2015 -0700
+commit d51d83b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 4 10:00:23 2015 -0700
 
-    [afp] improve the error handling for extended attributes
+    Fix the selected packet indicator width.
     
-    distinguish between the length field in the packet and the current item's length
-    make sure that the length field fits into a gint variable
-    add a cast to the return value of tvb_strsize()
-    don't throw an exception manually
-    
-    Change-Id: I2debab778be3e34d68b1be31963d2d9260a30e0e
-    Reviewed-on: https://code.wireshark.org/review/9056
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ic792c232524b4124bb4607cbe1979cdce8fd7e23
+    Reviewed-on: https://code.wireshark.org/review/9866
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit eb321f8
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Jun 23 10:55:22 2015 -0700
+commit 03802cc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 3 10:30:04 2015 -0700
 
-    Remove deprecated tvb_length from PIDL dissectors
+    Convert H.225 tap stats to new "generic stat API".
     
-    Also regenerate all to pick up the usage of https in some comment links.
+    Migrate the H.225 stats similar to the recent BOOTP migration.
     
-    Change-Id: Ic17b6368d2118627178b0b560031450d98e5b5e5
-    Reviewed-on: https://code.wireshark.org/review/9060
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    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>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 17ac383
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Jun 22 10:23:36 2015 -0700
+commit 632b402
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 3 21:25:00 2015 -0700
 
-    [zvt] the TLV container starts with an overall length field
+    Zero stat table elements instead of freeing them.
     
-    new function dissect_zvt_tlv_len(), use it for the total length
-    and for each tlv entry's length field
+    Stat table element arrays are allocated once at startup. Reset each
+    element in free_stat_table() instead of freeing them.
     
-    Change-Id: I2b7ba6939ddf0326b014c565ffbe5d16e3a88282
-    Reviewed-on: https://code.wireshark.org/review/9059
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    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: Gerald Combs <gerald@wireshark.org>
 
-commit ed8ad06
+commit 3413ddf
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jun 8 15:24:49 2015 +0200
+Date:   Sat Jul 25 20:07:59 2015 +0200
 
-    P1: Remove from ASN1 DIRTY list
+    EPL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-    Change-Id: If44cdddea6709b824ae242d504d7469756c87b91
-    Reviewed-on: https://code.wireshark.org/review/8838
+    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 3f6af3b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jun 4 13:17:53 2015 +0200
+commit 992c892
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 4 16:48:06 2015 +0200
 
-    P1: fix 'dissect_p1_T_report_type' defined but not used [-Wunused-function]
+    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.
     
-    Change-Id: Idee443cd35846bb197070cff5fb37e3904afb856
-    Reviewed-on: https://code.wireshark.org/review/8757
+    Change-Id: Ie05fb42d59556aec300d4e007b1db5cc79d8d6f1
+    Reviewed-on: https://code.wireshark.org/review/9864
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit be67f53
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 23 10:15:44 2015 -0700
+commit 8421af3
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Tue Aug 4 19:42:19 2015 +1000
 
-    Exit with the exit status of the command we ran.
+    Rename nettrace3gpp324423 to 3gpp32423
     
-    Also, expand a comment.
+    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: Icbb8ead02f55087f3ac09747fe518f211d488172
-    Reviewed-on: https://code.wireshark.org/review/9057
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic981d0351a3014fb79702955ebef7b13f6ce4a2e
+    Reviewed-on: https://code.wireshark.org/review/9863
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b59e28d
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Jun 23 09:36:40 2015 -0400
+commit 4908c75
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 4 10:58:45 2015 +0200
 
-    Regenerate *-tap-register.c when associated Makefile.common is updated
+    [ISUP] Read the country code at offset
     
-    Change-Id: Id9a83aeb285466f409a0e5ee651ef0c9f26ddda8
-    Reviewed-on: https://code.wireshark.org/review/9055
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I5a03fdbdf7079c354bc9b63acba3d205f82a4e8a
+    Reviewed-on: https://code.wireshark.org/review/9862
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6fe3f2c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jun 22 20:51:20 2015 -0400
+commit 6e87802
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 4 10:46:48 2015 +0200
 
-    Use RTD functionality for H.225
+    tvb_new_octet_aligned() should return both the captured and reported
+    length set to datalen in the returned tvb.
     
-    This got missed in the initial refactoring.
-    
-    Change-Id: I98dcc0816e065efab9b497f753c8d2d388349ff3
-    Reviewed-on: https://code.wireshark.org/review/9044
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ie6649a285a9fa4a0564e29ce18ec9459b8da2541
+    Reviewed-on: https://code.wireshark.org/review/9861
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7cdd22f
+commit 2964c28
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 23 00:21:20 2015 -0700
+Date:   Mon Aug 3 14:14:50 2015 -0700
 
-    Try to catch TShark crashing and get a stack trace.
-    
-    It's currently crashing in the Solaris buildbot when we do "tshark -v";
-    hopefully this will give us something more useful than
-    
-      test.sh: line 144: 21543 Abort                   (core dumped) $TSHARK -v
+    Update a comment to reflect reality as of 1997.
     
-      "Version information" Failed!
-      Failed to print version information
-      Binary file ./core matches
+    "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.
     
-    as a diagnostic.
-    
-    Change-Id: I278c8dd9f6acf5ddfa83bc0a7f3f7a3c48577ac2
-    Reviewed-on: https://code.wireshark.org/review/9052
+    Change-Id: Ie7f61e48cb2a343a7c83e0747a6eee46964fc335
+    Reviewed-on: https://code.wireshark.org/review/9858
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 74c5ab0
+commit ae05f77
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jun 22 23:59:59 2015 -0700
+Date:   Mon Aug 3 11:58:36 2015 -0700
 
-    Treat channel flags fields as just collections of bits, not as type fields.
-    
-    The radiotap and PPI specs don't call them type fields, and don't list
-    them as having type values, they call them flags fields and list the
-    individual bits.
-    
-    Listing them as type fields is especially confusing with radiotap, as
-    you can have multiple fields giving *different* channel types, as per,
-    for example
-    
-        https://ask.wireshark.org/questions/42888/multiple-channel-types-and-mcs-missing
-    
-    where an 802.11ac packet has one "channel type" field claiming it's
-    802.11a and another one claiming it's 802.11n when it is, in fact,
-    *neither* 11a *nor* 11n.
+    Give an I-D reference for this.
     
-    If you want to know the channel type, look at the "802.11 radio
-    information" tree that comes before the 802.11 header tree; it gives a
-    reasonable summary of most of the radio metadata, giving the *correct*
-    channel type, and not showing any field multiple times.  Look at the
-    radiotap or PPI or... tree only if either 1) you're debugging a driver
-    that creates those headers or 2) there's some data in the header that
-    *doesn't* show up in any form in the 802.11 radio information tree (in
-    which case the code for radio information probably needs to be changed
-    to show it).
-    
-    Change-Id: I545b81b08a993dbb219fa7a4f54daac3637ea071
-    Reviewed-on: https://code.wireshark.org/review/9051
+    Change-Id: I5bbc1b390215e11cba86af9b325ae94d3708ae93
+    Reviewed-on: https://code.wireshark.org/review/9855
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1dc608a
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jun 19 16:56:44 2015 -0700
+commit 56ee4b1
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Mon Aug 3 12:02:37 2015 +0100
 
-    Morph ProgressBar into CaptureProgressFrame.
+    TFTP: strengthen heuristic used over STUN/TURN
     
-    Switch from a plain QProgressBar to a QFrame with a QProgressBar and a
-    stop button.
-    
-    Add a stop_flag boolean to the capture_file struct.
+    Change-Id: I133199abda100a89e219804c3003dee76389c43a
+    Reviewed-on: https://code.wireshark.org/review/9839
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+
+commit 9557c73
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sun Aug 2 15:33:07 2015 -0700
+
+    Make sure per-packet tap callbacks return gbooleans.
     
-    To do:
-    - Start adding the progress bar to dialogs.
-    - Don't complain so loudly when the user stops a capture.
+    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: Iedd1d7d79f2044f1a53e4fb22186d25930a3ef03
-    Reviewed-on: https://code.wireshark.org/review/9029
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    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 0c71b13
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jun 22 08:56:34 2015 +0200
+commit 08e80b1
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Aug 2 08:41:27 2015 -0400
 
-    prefs: fix memleak
+    Skip files larger than 8MB in valgrind fuzzing
     
-    Calling g_list_remove_link(link, llink) does not free the removed
-    last link llink. g_list_next or g_list_foreach+g_free followed by
-    g_list_free should be used instead such that the data is freed before
-    and then dropped from the list.
+    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.
     
-    This fixes a memleak in tshark -r dns.pcap detected by ASAN (single
-    packet).
+    Based on a quick scan of the menagerie this only excludes another dozen or so
+    files so we won't lose much coverage.
     
-    Set pref->default_val.list = NULL just in case, and with symmetry with
-    capture_columns handling.
-    
-    Change-Id: I3cc52e275784037ab40c0b42c68d0dd83b73cd98
-    Reviewed-on: https://code.wireshark.org/review/9026
+    Ping-Bug: 11395
+    Change-Id: I8d684bebad553408c68b125330f2878deedc3bff
+    Reviewed-on: https://code.wireshark.org/review/9849
     Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit 42c324d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jun 23 01:30:13 2015 +0200
+commit 7c46b25
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Aug 2 09:12:23 2015 -0400
 
-    packet: fix memleak
+    qt: fix scrollbar crash applying conv. filter
     
-    It turns out that a heur_dissector_list_t structure was not released,
-    only the GSList inside it. Ensure that this list gets released as well.
+    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: If79deb5d011d306477d082368744addcee794ae1
-    Reviewed-on: https://code.wireshark.org/review/9040
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: I5fa0cac3e67f50a6c603a6fa10b117de5540d444
+    Reviewed-on: https://code.wireshark.org/review/9850
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 167f9b7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jun 7 21:23:47 2015 +0200
+commit 78ca0af
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 1 11:38:03 2015 +0200
 
-    IS-IS (LSP): Remove proto_tree_add_text call
+    HTTP2: remove weak part of the heuristic
     
-    Part 2 !
+    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.
     
-    Change-Id: Iaa46f3d785cbff6b397edf5bd54c0c3cf65a7264
-    Reviewed-on: https://code.wireshark.org/review/8822
+    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>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 61e127a
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Mon Jun 22 16:46:57 2015 -0700
+commit d12283b
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 1 18:38:15 2015 +0200
 
-    RANAP: call nsap properly when bindingID is included in transport address
+    proto.c: exclude hf_text_only from proto_registrar_is_protocol()
     
-    Change-Id: I45fed890cc2f7f5d106bbb7b35038d8db141fa4e
-    Reviewed-on: https://code.wireshark.org/review/9036
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 6fd7e5b
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Jun 22 20:53:46 2015 -0700
-
-    Remove more deprecated tvb_length calls
+    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: I56260a82b19001ab2f87f4be34a9510f127f841f
-    Reviewed-on: https://code.wireshark.org/review/9050
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    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: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 46e5fd8
-Author: JustinKu <jiunrong@gmail.com>
-Date:   Mon Jun 22 20:47:23 2015 -0700
+commit 37a1bb8
+Author: Hauke Mehrtens <hauke@hauke-m.de>
+Date:   Mon Jul 20 23:31:43 2015 +0200
 
-    CFM: fix CFM Type Test signal (TST) without CRC dissection
+    CoAP: add media type number for application/cbor
     
-    Bug: 11286
-    Change-Id: I8efce21e2bab55f9fea50a234419082cdc288f4e
-    Reviewed-on: https://code.wireshark.org/review/9048
+    application/cbor got the number 60 by the IANA, see
+    https://www.iana.org/assignments/core-parameters/core-parameters.xml#content-formats
+    
+    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 ce9c1df
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Jun 22 20:31:23 2015 -0700
+commit b1ce653
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 2 08:10:45 2015 -0700
 
-    coverity 1306905: integer overflowed argument
+    [Automatic update for 2015-08-02]
     
-    tvb_strsize() returns guint
-    remove the if (tree) while we're at it
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: Icc24f166104a3e9b95fca2ef14a7bd8be2677cba
-    Reviewed-on: https://code.wireshark.org/review/9047
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I1c6b1044870e93459bcf4743f00be68ff8ce8ff6
+    Reviewed-on: https://code.wireshark.org/review/9851
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit db72eb4
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Jun 22 17:48:54 2015 -0700
+commit 711edcf
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 1 11:27:09 2015 -0700
 
-    wmem_tree_new_autoreset() never returns NULL
+    Set the reported length of chunk data correctly.
     
-    Change-Id: I497b77dec1eb4617179d492838ecd7d267539ba4
-    Reviewed-on: https://code.wireshark.org/review/9043
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 958cef5
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Jun 22 17:19:23 2015 -0700
-
-    Remove more deprecated tvb_length
+    The reported length should be the size of the chunk, not the remaining
+    size of dechunked data.
     
-    Change-Id: Iac23a6c804ad3720d37186559477909b2ff33eb2
-    Reviewed-on: https://code.wireshark.org/review/9042
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 67ab8a0
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Jun 22 17:05:37 2015 -0700
-
-    Remove more deprecated tvb_length
+    Update some comments while we're at it.
     
-    Change-Id: I36603453c2563406f82663683930088dedd5f39c
-    Reviewed-on: https://code.wireshark.org/review/9041
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ia71948fb5ecebdaae3e171c53fd88cf72dcf76a3
+    Reviewed-on: https://code.wireshark.org/review/9846
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a43682d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jun 21 15:53:53 2015 +0200
+commit 86a8b9c
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 1 13:28:01 2015 +0200
 
-    srt_table.h: fix parameter 'opt_arg/filter' not found in the function declaration [-Wdocumentation]
+    MS-WSP: fix some Coverity warnings
     
-    Change-Id: I6edda434d02a4926a2ec7a2580a7f684b6e96ee6
-    Reviewed-on: https://code.wireshark.org/review/9008
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    - 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
+    
+    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 a7f5e18
+commit f8cac8e
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jun 22 11:38:52 2015 -0700
+Date:   Sat Aug 1 16:41:52 2015 +0200
 
-    SIP: add support for draft-ietf-insipid-session-id
+    PNRP: add support for message reassembly
     
-    Bug: 11294
-    Change-Id: I54f7e19d129cddb1f11525f6ee9931270cc41f40
-    Reviewed-on: https://code.wireshark.org/review/9028
+    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 79c384d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jun 22 16:16:23 2015 -0700
+commit 1afe288
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 16:52:37 2015 -0700
 
-    Don't use the value of the Flags field if we didn't have it.
+    More packet detail context menu items.
     
-    Change-Id: Idd7771bd39ee823981b31b827645abd2ae516f66
-    Reviewed-on: https://code.wireshark.org/review/9039
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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: 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 eaf62bb
+commit c8fec28
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jun 22 16:07:20 2015 -0700
+Date:   Fri Jul 31 15:37:49 2015 -0700
 
-    Fix handling of XChannel radiotap field.
-    
-    Fetch the flags before using them; thanks to Peter Wu for catching that
-    one.
+    Print times with the resolution from the capture file.
     
-    Fetch and use the frequency and channel.
+    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.
     
-    Have cflags be the variable for the flags in Channel and xcflags be the
-    variable for the flags in XChannel.
-    
-    Change-Id: If82f7adb448eef04b769186a90a8722d03a702a3
-    Reviewed-on: https://code.wireshark.org/review/9038
+    Change-Id: I111fbbf91b5957e63dca650b85f182c5f103c5fd
+    Reviewed-on: https://code.wireshark.org/review/9840
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5ab4570
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jun 22 22:54:30 2015 +0200
+commit 2e3be54
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 31 22:20:34 2015 +0200
+
+    RRC: upgrade dissector to v12.6.0
+    
+    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 26c933b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 13:44:42 2015 -0700
 
-    gtk,qt: Fix minor buffer underrun
+    Fix binary data copying.
     
-    Avoid accessing the first byte before an empty dirname. No idea why this
-    was not triggered before. Reproduced with an empty Wireshark profile and
-    wireshark and wireshark-qt.
+    As the QClipboard::setMimeData documentation says, "Ownership of the
+    data is transferred to the clipboard." Allocate the mime data object
+    accordingly.
     
-    Caught with ASAN.
+    Note the results of trying to paste into hex editors on Windows.
+    Frhed works. Hex Editor Neo and HxD do not.
     
-    Change-Id: I44f8fdab03ad0f24e663df63a1c54567996a3dfc
-    Reviewed-on: https://code.wireshark.org/review/9037
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: I46691ba95bf1f5c38817cd42ded73e8e67e4ee97
+    Reviewed-on: https://code.wireshark.org/review/9837
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1504531
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jun 23 00:45:12 2015 +0200
+commit 5336c9a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 12:21:28 2015 -0700
 
-    packet: write explicit type for destroy_heuristic_dissector_list
+    More spacing fixups.
     
-    It is an implementation detail that the data pointer contains a GSList*.
-    Use the type that got inserted into function
-    register_heur_dissector_list.
+    Make spacing more consistent.
     
-    Change-Id: I25b6414afa73818baa0c955a5c8aa7669f3058ee
-    Reviewed-on: https://code.wireshark.org/review/9035
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: I8980a84ca70660057016985299b0f95761076893
+    Reviewed-on: https://code.wireshark.org/review/9835
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 7db3021
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jun 22 15:14:46 2015 -0700
+commit 787fa27
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 12:08:30 2015 -0700
 
-    IEEE 802.11: add an expert info when tag length value is bigger than remaining payload
+    Remove spaces.
     
-    Bug: 11298
-    Change-Id: I18082a15fbeaa843099741511292eec19acf94b9
-    Reviewed-on: https://code.wireshark.org/review/9033
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Iabf5f7610ea5205ad4500502e2b531a8ee130484
+    Reviewed-on: https://code.wireshark.org/review/9834
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit e34e6c6
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jun 23 00:27:11 2015 +0200
+commit d8d3c52
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 31 10:34:43 2015 -0700
 
-    Fix "Unescaped left brace in regex is deprecated"
+    Use an ellipsis character instead of three dots.
     
-    This got reported with Perl 5.22:
+    The OS X Human Interface Guidelines at
     
-        Unescaped left brace in regex is deprecated, passed through in
-        regex; marked by <-- HERE in m/^typedef enum { <-- HERE / at
-        epan/wslua/make-init-lua.pl line 228.
+    https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/OSXHIGuidelines/TerminologyWording.html#//apple_ref/doc/uid/20000957-CH15-SW3
     
-    The perldelta manual page says this about it:
+    says:
     
-        "[..] a future version of Perl (tentatively v5.26) will consider
-        this to be a syntax error."
+    "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."
     
-    Change-Id: I7f23cc10dc3311a35d8c15faa4337e4d50d0bd61
-    Reviewed-on: https://code.wireshark.org/review/9034
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-
-commit 8aa91b3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jun 22 15:04:28 2015 -0700
-
-    Provide PHY type and band information in the 802.11 pseudo-header.
+    The Windows desktop applications guidelines has a section on ellipses:
     
-    Provide that information so that the "802.11 radio information" protocol
-    can indicate whether a packet was 802.11 legacy/11b/11a/11g/11n/11ac,
-    and possibly whether it's 2.4 GHz or 5 GHz 11n.  (Sometimes the center
-    frequency might not be supplied, so the band information can be useful.)
+    https://msdn.microsoft.com/en-us/library/windows/desktop/dn742478.aspx
     
-    Also, provide some 11ac information, now that we can distinguish between
-    11n and 11ac.  Don't calculate the data rate from the MCS index unless
-    it's 11n; we don't yet have code to calculate it for 11ac.
+    but doesn't specify the a single glyph vs three dots.
     
-    For radiotap, only provide guard interval information for 11n and 11ac,
-    not for earlier standards.
+    The GNOME HIG at
     
-    Handle the 11ac flag in the Peek remote protocol.
+    https://developer.gnome.org/hig/stable/typography.html.en
     
-    For Peek tagged files, the "extension flags" are 11n/11ac flags, so we
-    don't have to check for the "MCS used" bit in order to decide that the
-    packet is 11n or 11ac or to decide whether to provide the "bandwidth" or
-    "short GI" information.
+    says "Take Advantage of Unicode" then specifically says to use U+2026
+    HORIZONTAL ELLIPSIS.
     
-    Change-Id: Ia8a1a9b11a35243ed84eb4e72c384cc77512b098
-    Reviewed-on: https://code.wireshark.org/review/9032
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 8abe108
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jun 22 08:45:21 2015 +0200
+commit c768087
+Author: Noel Power <noel.power@suse.com>
+Date:   Thu Jul 30 14:27:01 2015 +0100
 
-    ieee80211: fix memleak
+    MSWSP: Fix clang warnings and handle gracefully needed missing messages
     
-    parse_key_string reads from rec->string and rec->key (without
-    modifying those parameters), then returns a newly allocated
-    decryption_key_t struct which is not used except for reading the
-    type field. Release memory after copying that single field!
+    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: Iac19bea23dedb73cab9dd1ea09f98cc83556e96c
-    Reviewed-on: https://code.wireshark.org/review/9025
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    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 11803d4
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Jun 22 14:40:23 2015 -0700
+commit c321171
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jul 30 16:15:40 2015 -0700
 
-    Remove more tvb_length
+    Add Colorize to the packet detail menu.
     
-    Change-Id: I940704e927001b2a051a59fd0738e7a02328472b
-    Reviewed-on: https://code.wireshark.org/review/9031
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Idaac0b52e6e4534f40e13839e6dbce2408ca6bfa
+    Reviewed-on: https://code.wireshark.org/review/9831
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit df352c5
+commit da07c62
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jun 22 14:03:02 2015 -0700
+Date:   Thu Jul 30 13:55:46 2015 -0700
 
-    Use StockIcon to load toolbar icons.
+    More context menu updates.
     
-    StockIcon loads each available icon size.
+    Add "Follow" and "Export Packet Bytes" to the packet detail context
+    menu. Remove duplicate SCTP menu. Remove redunant action text.
     
-    Change-Id: Ia5604cc11ed8350e7f4f782312939cf30c94f548
-    Reviewed-on: https://code.wireshark.org/review/9030
+    Change-Id: If69815dc774806e267fbd71aa390b0af6f3b0d14
+    Reviewed-on: https://code.wireshark.org/review/9829
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit f99e20e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jun 22 19:19:39 2015 +0200
+commit 9603db4
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jul 30 12:34:53 2015 -0700
 
-    rtd_table.h: fix parameter 'srt/srt_array' not found in the function declaration [-Wdocumentation]
-    
-    srt => rtd
+    Make copy menu item names more consistent.
     
-    Change-Id: I297258ebb22723f280588692fdbb5d062d08ced9
-    Reviewed-on: https://code.wireshark.org/review/9024
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ia7b2a87ba9ad843dfa9200d69eeb94275a3dc0bb
+    Reviewed-on: https://code.wireshark.org/review/9827
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 2e3629a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Jun 20 13:53:14 2015 +0200
+commit 549b8f0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jul 30 12:23:03 2015 -0700
 
-    fix the interface list in the main welcome screen
+    Add a missing menu item.
     
-    when no interfaces are available at startup, the number of columns in
-    the interface tree is set to 1
-    when new interfaces become available later, the column number is not
-    reset to the default value and we end up with an interface list whose
-    entries are not visible
-    reset the number of columns each time the interface list is updated
+    Add "Copy as Filter" to the packet list context menu. Remove completed
+    item comments.
     
-    Change-Id: I267c5b47da6d5ae9e7769b1036622f79da4d97f2
-    Reviewed-on: https://code.wireshark.org/review/8996
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I1e2d9ebcff2fb36918d3e7525690cfb105cb1b13
+    Reviewed-on: https://code.wireshark.org/review/9826
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit be6fb60
-Author: Evan Huus <eapache@gmail.com>
-Date:   Mon Jun 22 09:59:50 2015 -0700
+commit 16b048d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 29 16:24:39 2015 -0700
 
-    Remove a bunch of deprecated tvb_length calls
+    Packet list and detail context menu updates.
     
-    Change-Id: I9362e0fdc4519ba5f3d656152966e7030f478839
-    Reviewed-on: https://code.wireshark.org/review/9022
-    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 45872b9
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jun 22 11:38:04 2015 -0700
-
-    checkAPIs.pl: proto_tree_add_bytes_item takes an encoding parameter
+    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.
     
-    Change-Id: Iebe0e2483d9fd1661bf87ea5efaeb4ae14f6e105
-    Reviewed-on: https://code.wireshark.org/review/9027
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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.
+    
+    Enable and disable packet detail context menu items from a set of
+    booleans similar to the packet list.
+    
+    Change-Id: Iaa931c766aa476c33f27de089e5c4dbaf9ce74d6
+    Ping-Bug: 9320
+    Bug: 10831
+    Reviewed-on: https://code.wireshark.org/review/9825
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit a94b443
+commit e482786
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jun 22 19:17:10 2015 +0200
+Date:   Mon Jul 27 23:21:15 2015 +0200
 
-    NCP: fix comma at end of enumerator list [-Wpedantic]
+    conversation: fix indent (use tabs)
     
-    Change-Id: I47795fb9e1044f4319721c3bf1208c269a4b9c34
-    Reviewed-on: https://code.wireshark.org/review/9023
+    Change-Id: I256c364954e1b9edd479e5f25a1d742cc216ffff
+    Reviewed-on: https://code.wireshark.org/review/9809
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit d23d53e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jun 21 15:56:16 2015 +0200
+commit e4f418c
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Jul 29 18:48:14 2015 -0400
 
-    ws80211_utils.h: fix empty paragraph passed to '@param' command [-Wdocumentation]
+    [ieee80211]  Don't call expert_...() under 'if (tree)'
     
-    Change-Id: Iecd9f8820840959a2f226120cbc359977d20c757
-    Reviewed-on: https://code.wireshark.org/review/9009
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Idcda58191ca664412ef874a69f40eb09a5b38234
+    Reviewed-on: https://code.wireshark.org/review/9820
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit c079420
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jun 21 15:40:55 2015 +0200
+commit d6f59cd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jul 29 12:09:28 2015 -0700
 
-    PKCS12: Remove from ASN1 DIRTY list
+    Main menu and packet list menu updates.
     
-    Change-Id: I454c48d5342ebe5682217667e4cafd6164e58d41
-    Reviewed-on: https://code.wireshark.org/review/9004
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit 475a232
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jun 21 15:37:26 2015 +0200
-
-    PKCS12: fix unused function 'dissect_AuthenticatedSafe_PDU' [-Wunused-function]
+    Enable and disable packet list-relasted menu items in one place. Add
+    "Colorize Conversation" items to the packet list context menu.
     
-    Change-Id: Iaaaaffc8a271ac844b745d1b9265eb06df2efe9c
-    Reviewed-on: https://code.wireshark.org/review/9003
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    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.
+    
+    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 02b4977
+commit a03a43b
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jun 22 08:53:34 2015 -0700
+Date:   Wed Jul 29 10:36:46 2015 -0700
 
-    Add a strlen cast.
+    Capture file retapping fixups.
+    
+    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.
+    
+    This *might* fix a crash found when following large streams from the
+    Conversations dialog.
     
-    Change-Id: I480e2e7436f0334f0dfd99352bd49304765fcee3
-    Reviewed-on: https://code.wireshark.org/review/9021
+    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 8f390d4
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jun 20 12:22:22 2015 -0400
+commit 5b85613
+Author: Luca Melette <luca@srlabs.de>
+Date:   Fri Jul 10 22:55:27 2015 +0200
 
-    Refactor RTD stats.
+    GSM_MAP: adding dissector for sendParameters (MAPv1)
     
-    Very similar to the refactoring of SRT stats, it provides more commonality of the stats for all GUI interfaces.  Currently implemented for TShark and GTK.  Affected dissectors: MEGACO, MGCP, Radius
+    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: Icb73a7e603dc3502b39bf696227fcaae37d4ed21
-    Reviewed-on: https://code.wireshark.org/review/8998
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    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 8b230ea
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jun 22 16:52:20 2015 +0200
+commit b467f1c
+Author: Noel Power <noel.power@suse.com>
+Date:   Mon Jul 27 12:44:56 2015 +0100
 
-    Fix make distcheck buildbot
+    SMB2: only move ssi for request if request is really complete
     
-    packet-dnp.c:2735:28: error: variable 'al_filename' set but not used [-Werror=unused-but-set-variable]
-    packet-dnp.c:1843:32: error: variable 'al_filename_offs' set but not used [-Werror=unused-but-set-variable]
+    MS-SMB2 section '3.2.5.1.5 Handling Asynchronous Responses' states
     
-    Change-Id: Ia84b270aa8f56fb4104fb875339dc3d39c6105c6
-    Reviewed-on: https://code.wireshark.org/review/9020
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit c0f5b23
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Jun 21 23:07:33 2015 -0400
-
-    [pcep] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for certain multibyte fields.
+      "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"
     
-    Change-Id: Idc31728ce1b327ff86a58541ba01275107c7598b
-    Reviewed-on: https://code.wireshark.org/review/9019
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit cb7fd6f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Jun 21 22:41:56 2015 -0400
-
-    [rfid-pn532] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for several 3-byte fields.
+    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: If70a45d59fdce105b429d00fbbc4a8b2784262a2
-    Reviewed-on: https://code.wireshark.org/review/9018
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    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 ce40ea3
+commit 254dd6b
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jun 21 16:12:03 2015 +0200
+Date:   Mon Jul 27 16:06:32 2015 +0200
 
-    service_response_time_table.h: fix parameter 'gui_data' not found in the function declaration [-Wdocumentation]
+    MSWSP: Enhance dissector
     
-    Change-Id: Ie214d654aa91b91da2a1435dce63a822e404669a
-    Reviewed-on: https://code.wireshark.org/review/9010
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    * 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 c52dc98
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jun 22 09:44:51 2015 +0200
+commit 65a1f60
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jul 27 16:17:44 2015 -0700
 
-    Fix typo caused assertion
+    Add "Disable Protocol..." to the ProtoTree context menu.
     
-    Invalid character ')' in filter name 'gsm_abis_rsl.llsdu.sacch)'
-    **
-    ERROR:wireshark/epan/wmem/wmem_core.c:50:wmem_alloc: assertion failed: (allocator->in_scope)
-    Aborted
+    Assume that "I don't want to see this" counts as a preference and add it
+    under the "Protocol Preferences" submenu.
     
-    Change-Id: Ie22035cf9a9d1d29354a64cd5b085f1c2e18b1d3
-    Reviewed-on: https://code.wireshark.org/review/9017
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    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 eb2dffa
-Author: Vasil Velichckov <vvvelichkov@gmail.com>
-Date:   Fri Jun 19 19:24:53 2015 +0300
+commit 01bc31c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jul 27 15:28:50 2015 -0700
 
-    GSM MAP: Fix decoding of IPv6 addresses
+    Fixup packet list context menu behavior.
     
-    From 3GPP 23.003
+    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.
     
-    The GSN Address is composed of the following elements:
-    1) The Address Type, which is a fixed length code (of 2 bits) identifying the type of address that is used in the
-    Address field.
-    2) The Address Length, which is a fixed length code (of 6 bits) identifying the length of the Address field.
-    3) The Address, which is a variable length field which contains either an IPv4 address or an IPv6 address.
-    Address Type 0 and Address Length 4 are used when Address is an IPv4 address.
-    Address Type 1 and Address Length 16 are used when Address is an IPv6 address.
-    The IP v4 address structure is defined in RFC 791 [14].
-    The IP v6 address structure is defined in RFC 2373 [15].
+    Exit out of setMenusForSelectedTreeRow if the packet list has focus so
+    that we don't clobber the enabled states of various actions.
     
-    Currently the Wireshark decodes IPv6 addresses as IPv4
+    Take the "Apply As" and "Prepare A" context menu titles from their main
+    window counterparts. Remove actionApply_as_Filter and
+    actionPrepare_a_Filter.
     
-    This commit reverts parts of commit 1cdef1d98aac306932dc599d427a3e1191d48a44
+    Remove completed to-do items.
     
-    Change-Id: I4905d4cf559abcb42b9dfe3652667d2ff96dd444
-    Reviewed-on: https://code.wireshark.org/review/8984
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    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 e8a238f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jun 21 15:06:47 2015 -0400
+commit 2c79830
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Jul 26 22:29:58 2015 -0400
 
-    Eliminate proto_tree_add_text from some dissectors.
+    tcp: only reset dupACK counter when ACk# changes
     
-    Change-Id: I979990e9385182870ce4809a7e6fa16e598cb2be
-    Reviewed-on: https://code.wireshark.org/review/9016
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d729d80
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Jun 8 08:41:54 2015 -0400
-
-    Convert "macro checks" to use expert info in line with dissectors with comparable checks.
+    Otherwise things like window changes will reset the dup-ack counter incorrectly
+    and confusingly.
     
-    Change-Id: I30affba4941ba150c34541bfba67ff8da5b52a17
-    Reviewed-on: https://code.wireshark.org/review/9015
-    Reviewed-by: Anders Broman <a.broman58@gmail.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 1223ba5
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sun Jun 21 22:10:33 2015 -0400
+commit 1732017
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sun Jul 26 13:21:40 2015 -0700
 
-    [bmp] minor cleanup
+    Add an application-wide style sheet.
     
-    - Simplify some code;
-    - Remove unneeded initializers;
-    - Remove some unused code;
+    Use it to work around poorly drawn splitters on OS X.
     
-    Change-Id: I30b6a7751845670b732eae8ec143cd23e57fc54c
-    Reviewed-on: https://code.wireshark.org/review/9014
-    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 31f5459
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jun 21 07:46:55 2015 +0200
+commit 000ce64
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Sun Jul 26 21:54:12 2015 +1000
 
-    PKCS12: fix warning about unused parameter when don't build with LIBGCRYPT
+    nettrace3gpp324423: fix name consistency
     
-    Change-Id: I7cc47f811d6c090aa2be54d3d92361966d011ccd
-    Reviewed-on: https://code.wireshark.org/review/9002
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit ebc8ec8
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Jun 21 06:48:58 2015 -0400
-
-    Remove deprecated tvb_length from a bunch of dissectors
+    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: I5c777806cb1403062a9d85261149d722df57b239
-    Reviewed-on: https://code.wireshark.org/review/9005
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.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 a2e2c1f
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Jun 21 14:02:43 2015 +0000
+commit 8b316ff
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Jul 26 17:31:26 2015 -0400
 
-    Fix memory leak printing eui64s
-    
-    The scope that is passed in should only be used for the return value - other
-    temporary buffers we must alloc/free ourselves, since if the scope is NULL they
-    will not be managed automatically.
+    Tshark doesn't display column text as field in 2-pass mode
     
-    Bug: 11293
-    Change-Id: I27be856f1c5cdf47f78e766192a29523664a543e
-    Reviewed-on: https://code.wireshark.org/review/9007
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@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: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 27fc2b7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jun 21 15:49:49 2015 +0200
-
-    ERM (Aruba): Fix Assigned value is garbage or undefined found by Clang Analyzer
-    
-    Fix also trailing whitespace
-    
-    Change-Id: I9e9e09f6855f41609581ea1b7cd1bd16b15f85f4
-    Reviewed-on: https://code.wireshark.org/review/9006
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 56880d7
+commit 179da0f
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jun 21 08:09:36 2015 -0700
+Date:   Sun Jul 26 08:10:01 2015 -0700
 
-    [Automatic update for 2015-06-21]
+    [Automatic update for 2015-07-26]
     
     Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I266509d729803494666458651ab3ae88cac50a21
-    Reviewed-on: https://code.wireshark.org/review/9012
+    Change-Id: I3ddd31b2ebded50dcbe974ce99ef9b417b39aa2f
+    Reviewed-on: https://code.wireshark.org/review/9796
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 6c3f1f2
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Jun 21 13:17:33 2015 +0100
+commit 29f2f09
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jul 26 10:53:02 2015 +0200
 
-    editcap: split usage output so won't wrap in cmd.exe window
+    MSWSP: Remove usage of stdbool.h
     
-    Change-Id: I8a8ed3721e525ceb685f8e105147a0cc012fc912
-    Reviewed-on: https://code.wireshark.org/review/9001
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit 7d70d3e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jun 19 19:52:36 2015 -0400
-
-    Remove now unneeded tap-srt.h
+    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: Ic625f5a0f8e3c4d70dd04f5e3eb7100fb54027e5
-    Reviewed-on: https://code.wireshark.org/review/8997
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 649c484
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Sun Jun 21 12:44:24 2015 +0100
-
-    editcap: trivial changes while looking into the -L option
+    Replace bool -> gboolean
+    Replace true -> TRUE, false -> FALSE (for fix Wcompat error..)
     
-    Change-Id: I94dd83af160eebb9dc44c123b2b83674bc5866f6
-    Reviewed-on: https://code.wireshark.org/review/9000
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Ia3f39bfbbaf7cf35a916eb37edfc6745ea50ad36
+    Reviewed-on: https://code.wireshark.org/review/9793
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit 334087b
+commit cc134b1
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jun 21 07:35:27 2015 +0200
+Date:   Sun Jul 26 11:17:04 2015 +0200
 
-    srt_table: fix conversion shortens 64-bit value into a 32-bit value
+    MSWSP: Try to fix Mac OS X Buildbot
     
-    Change-Id: I62d04fc2c02c393fd15bccbdfe194c557665dc0e
-    Reviewed-on: https://code.wireshark.org/review/8999
+    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>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 6de6f7f
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jun 16 17:07:04 2015 -0400
+commit 0795931
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jul 26 10:32:41 2015 +0200
 
-    Further refactor SRT stats.
+    VoIP Call: fix Ubuntu Buildbot
     
-    Create "common" SRT tap data collection intended for all GUIs.   Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK.
+    Missing init of new sip_frame_num variable...
     
-    SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic.
-    CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone.
+    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: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc
-    Reviewed-on: https://code.wireshark.org/review/8894
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ib76dec02d03f66d365ef18926bc4507a6f70556d
+    Reviewed-on: https://code.wireshark.org/review/9792
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 2895d58
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 20 15:57:57 2015 -0700
+commit c711a63
+Author: Michal Pazdera <michal.pazdera@gmail.com>
+Date:   Fri Jul 3 10:21:04 2015 +0200
 
-    Call the "802.11 radio information" dissector for radio headers.
-    
-    Have dissectors of various forms of radio information headers in the
-    packets fill in a struct ieee_802_11_phdr with radio information as
-    appropriate, and call the "802.11 radio information" dissector rather
-    than the raw 802.11 dissector.
-    
-    This means that the radio information can be found in a
-    protocol-independent and encapsulation-independent form when you're
-    looking at the packet; that information can be presented in a form
-    somewhat easier to read than the raw metadata header format.
+    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.
     
-    It also enables having a single "radio information" tap that allows
-    statistics to handle all different sorts of radio information
-    encapsulation.
-    
-    In addition, it lets us clean up some of the arguments passed to the
-    common 802.11 dissector routine, by having it pull that information from
-    the struct ieee_802_11_phdr.
+    Change-Id: Ida30a7b115e60fa64d30cfc1f4b7c11be724f8ee
+    Reviewed-on: https://code.wireshark.org/review/9479
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 19578ba
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 24 09:53:09 2015 -0700
+
+    Minor Enabled Protocols tweaks.
     
-    Ensure that the right structure gets passed to that routine, and that
-    all the appropriate parts of that structure are filled in.
+    Try to keep long protocol names from widening the first column too much.
     
-    Rename the 802.11 radio protocol to "wlan_radio", rather than just
-    "radio", as it's 802.11-specific.  Give all its fields "wlan_radio."
-    names rather than "wlan." names.
+    Expand all tree items.
     
-    Change-Id: I78d79afece0ce0cf5fc17293c1e29596413b31c8
-    Reviewed-on: https://code.wireshark.org/review/8992
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 77ed038
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Jun 20 13:24:37 2015 +0200
+commit fe7a35a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jul 23 22:38:41 2015 +0200
 
-    (trivial) fix a spelling mistake in a comment
+    ISAKMP: Remove uneeded space before HF name and HF filter
     
-    Change-Id: I3f9feab57032c8c701c4ea487c0f5acca428d5d9
-    Reviewed-on: https://code.wireshark.org/review/8995
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I5669277b9a03cba17067d52e6a9f9df933c3eb5d
+    Reviewed-on: https://code.wireshark.org/review/9767
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 02537f8
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Jun 20 11:21:35 2015 +0200
+commit 3ea89e6
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jul 6 09:51:11 2015 +0200
 
-    [mifare] make the payload of the write command filterable
+    lemon (tools): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-    use an FT_BYTES variable instead of passing it to the data dissector
-    
-    Change-Id: Ia52cba24dedec13c9842109d45b3a277ee627f42
-    Reviewed-on: https://code.wireshark.org/review/8994
+    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 bc9e141
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Jun 20 08:27:10 2015 +0200
+commit 47c1753
+Author: Richard Sharpe <rsharpe@samba.org>
+Date:   Fri Jul 24 20:41:31 2015 -0700
 
-    [mifare] minor cleanup
+    Fix an error where we expect the tagged parameters field to be present even
+    though the spec (802.11ad-2012) says they are optional.
     
-    remove the if(tree) so that we fill the info column regardless of the tree
-    clear the info column first, then append our data
-    remove an unnecessary initializer
+    Communicated to me by the WiFi Alliance. I have captures. Not sure if I can
+    share them.
     
-    Change-Id: I0e9e9582f360dd929e422f994c3d4a644c602642
-    Reviewed-on: https://code.wireshark.org/review/8993
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    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 debb811
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 20 15:41:42 2015 -0700
+commit 92fa272
+Author: Andrei Cipu <acipu@ixiacom.com>
+Date:   Thu Jul 23 17:25:57 2015 +0300
 
-    Use "Present"/"Absent" for presence bits.
+    ISAKMP: Add 3GPP IMS Options for IKEv2
     
-    That's clearer than "True"/"False".
+    Bug:11392
     
-    Change-Id: I300c040f347eff8477a87f639bea8402772314b9
-    Reviewed-on: https://code.wireshark.org/review/8991
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 bffabc7
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jun 20 15:23:35 2015 -0700
+commit 2874334
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jul 23 22:31:09 2015 +0200
 
-    Support the "number of extension spatial streams" information.
+    ISAKMP: The modecfg attribute type INTERNAL_IP6_ADDRESS is not decoded correctly
     
-    Change-Id: If69088aac0848d6ec8d239e3a9acc140ad376d6f
-    Reviewed-on: https://code.wireshark.org/review/8990
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    According to RFC7296, section 3.15.1:
+    
+    "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]."
+    
+    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.
+    
+    Issue reported by Andrei Cipu
+    
+    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 5714ad5
+commit 38a2385
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sat Jun 20 07:51:54 2015 +0200
+Date:   Sat Jul 25 17:10:31 2015 +0200
 
-    ftypes: display BASE_HEX_DEC integers as hexadecimal
+    MAC LTE: fix dissection of Long DRX Command Control Element
     
-    Bug: 11292
-    Change-Id: I69a5591996bec77c2cb2bfcd04e9179784470edf
-    Reviewed-on: https://code.wireshark.org/review/8987
+    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 4c898c3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jun 20 14:07:55 2015 +0200
+commit 8c4b831
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Jul 25 16:30:55 2015 +0200
 
-    qt_ui_utils: fix  parameter 'glib_string' not found in the function declaration
-    
-    Only a small typo glib_string => glib_gstring
+    MAC LTE: fix dissection of CCCH SDU for Category 0 UE
     
-    Change-Id: Ia3ad0a8086f6c1a47065754dee33eff1e0ad770f
-    Reviewed-on: https://code.wireshark.org/review/8988
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I2d840ad2ba70cdf87b3cd12b9d4a433f05e0b1b2
+    Reviewed-on: https://code.wireshark.org/review/9787
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit a8ddf90
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Jun 19 14:51:23 2015 -0400
+commit 190e313
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Jul 25 09:24:48 2015 -0400
 
-    [rpcrdma] Do some minor bug-fixes and cleanup
+    DNS: move DNS name resolution pref to Name Resolution prefs
     
-    Change-Id: I9d440cba281945672767642967d955351fa67b90
-    Reviewed-on: https://code.wireshark.org/review/8985
-    Petri-Dish: Bill Meier <wmeier@newsguy.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: Bill Meier <wmeier@newsguy.com>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit d47a686
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Jun 19 15:29:19 2015 -0400
+commit 3fc4a83
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Fri Jul 24 14:51:37 2015 -0400
 
-    [rtse] Convert tabs to spaces to match editor modelines
+    Fix ptvcursor_add() so it can dissect the last bytes in a TVB again.
     
-    Change-Id: I03c7decacd4def0552f461c81c4e634a85380438
-    Reviewed-on: https://code.wireshark.org/review/8986
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    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.
+    
+    Problem introduced by Idfd258c734e7a946300b2564bebf6e4cb374c8d1 .
+    
+    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 4d3abcc
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Jun 17 15:36:00 2015 -0400
+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 23ca456
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Jul 25 00:08:52 2015 +0200
 
-    [thrift] fix a minor bug; Also: use col_clear()
+    MAC LTE: fix dump of last SDU
     
-    Change-Id: I07dc57583f2e78b6b841a7adb5470e57fa314786
-    Reviewed-on: https://code.wireshark.org/review/8969
-    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 aa8fcb3
-Author: Matthieu Coudron <mattator@gmail.com>
-Date:   Mon Jun 8 22:24:17 2015 +0200
+commit 7be155e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jul 24 10:24:15 2015 -0700
 
-    Improved dissection of some netlink attributes
+    Try deleting WiresharkDialog when we close it.
     
-    Added missing strings to netlink_route_ifla_attr_vals
-    Improved dissection of netlink.hdr_flags
-    Replaced deprecated use of tvb_length_remaining
+    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.
     
-    Change-Id: Ie16f7e602e1fb69a0a88a4d0657ec2d6da3c0d83
-    Reviewed-on: https://code.wireshark.org/review/8916
-    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 e43ff89
+commit d24614c
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jun 17 23:45:42 2015 +0200
+Date:   Fri Jul 24 19:50:29 2015 +0200
 
-    recent.c: accept an UTF-8 string in read_set_recent_pair_dynamic() function
-    
-    Previous code was checking that the string was ASCII, which does not work when
-    the recent capture files list contains non ASCII characters
+    MAC LTE: fix dissection when only header is captured but full PDU length is reported
     
-    Change-Id: I1ea96035cca4b2aa2ea5061e7a4f98e78ac88f20
-    Reviewed-on: https://code.wireshark.org/review/8965
+    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>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7ec7e43
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Jun 18 09:10:55 2015 +0200
+commit bb7e657
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 24 19:13:31 2015 +0200
 
-    Bluetooth: Coverity fixes
-    
-    Try to fix Coverity issues in Bluetooth HCI and androiddump.
+    RLC: fix dissection when only header is captured but full PDU length is reported
     
-    Change-Id: Id2ed35130eb4dbb0698b7a54afccdba56af62bfd
-    Reviewed-on: https://code.wireshark.org/review/8983
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I06e7bed71a42c6cbe500d7f1994a625b37d6586c
+    Reviewed-on: https://code.wireshark.org/review/9777
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 9e4b299
+commit b962fdd
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jun 18 23:30:50 2015 +0200
+Date:   Fri Jul 24 19:12:45 2015 +0200
 
-    Qt: remove some compilation warnings
+    RLC LTE: fix dissection when only header is captured but full PDU length is reported
     
-    Change-Id: If14d6b46cfb3d42798afdaa0721f9892af93fddc
-    Reviewed-on: https://code.wireshark.org/review/8981
+    Change-Id: I67654bb0ca30d9bb56c9a4b3be179161ecd0de3a
+    Reviewed-on: https://code.wireshark.org/review/9776
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit d9b36c4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jun 18 13:12:43 2015 -0700
+commit b9a4bab
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 24 19:10:30 2015 +0200
 
-    Pass the 802.11 pseudo-header as an argument.
+    PDCP LTE: fix dissection when only header is captured but full PDU length is reported
     
-    Rather than accessing it through pinfo->pseudo_header, have it passed as
-    an argument.
-    
-    This means we no longer tweak the pseudo-header filled in by libwiretap,
-    but instead construct our own pseudo-header, which is a bit cleaner.
+    Change-Id: I62c89a49f3cf2ed566e16a978b2ed237f09d466e
+    Reviewed-on: https://code.wireshark.org/review/9775
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit 1ea2565
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jul 24 18:32:26 2015 +0200
+
+    SIP: heuristic dissectors should use the captured length, not the reported one
     
-    It also opens up the possibility of other dissectors passing radio
-    information down to the 802.11 dissector, so it can display it in a
-    better-organized format than the raw metadata headers for
-    radiotap/PPI/Prism/AVS/etc., and having some of the options for 802.11
-    dissection (Atheros padding, Centrino stuff, etc.) also passed in
-    through that pseudo-header so we have fewer arguments to
-    dissect_ieee80211_common().
+    Otherwise it triggers a "packet size limited during capture" exception
+    preventing following heuristic dissectors to be called
     
-    Change-Id: I470300a0407ebf029c542f7ca5878593563a70a9
-    Reviewed-on: https://code.wireshark.org/review/8980
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ifc97e84b4e40a1c7dc0b0c63b7b9e015bd99d178
+    Reviewed-on: https://code.wireshark.org/review/9774
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit f00e6fb
+commit efefdbb
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jun 18 13:01:05 2015 -0700
+Date:   Fri Jul 24 12:04:27 2015 -0700
 
-    1.99.7 → 1.99.8
+    1.99.8 → 1.99.9.
     
-    Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17
-    Reviewed-on: https://code.wireshark.org/review/8979
+    Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552
+    Reviewed-on: https://code.wireshark.org/review/9780
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
author	Gerald Combs <gerald@wireshark.org>	2015-09-02 09:19:40 -0700
committer	Gerald Combs <gerald@wireshark.org>	2015-09-02 16:26:22 +0000
commit	52a4a785a867cfe0712f23b2c3bbb0fd33dcb9f2 (patch)
tree	6812e7c5fe667a69f938766385ea63320ce3353d /ChangeLog
parent	af6365a834830d5d2c8c8de6f456dd79e4f8e98f (diff)