Build 1.99.9.
authorGerald Combs <gerald@wireshark.org>
Wed, 2 Sep 2015 16:19:40 +0000 (09:19 -0700)
committerGerald Combs <gerald@wireshark.org>
Wed, 2 Sep 2015 16:26:22 +0000 (16:26 +0000)
Change-Id: I6892f8ae21e927a6ab9281d952b96a54da94781e
Reviewed-on: https://code.wireshark.org/review/10358
Reviewed-by: Gerald Combs <gerald@wireshark.org>
ChangeLog
NEWS
make-version.pl

index 928f397b298829b4ff278336e09ce04327c3ed49..b350578d4e66026a45a7bc794b9970bf6de47b5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
-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
-    
-    They run the buildbot out of memory, so just skip them, we don't want to remove
-    them from the menagerie entirely.
+    idl2wrs: fix clang analyzer Warning complains.
     
-    ("large" here is > 20000 KB, but that could change)
+    890:9: warning: Access to field 'str' results in a dereference of a null pointer (loaded from variable 'token_list')
+    3132:4: warning: Value stored to 'str' is never read
+    3155:4: warning: Value stored to 'str' is never read
+    3166:4: warning: Value stored to 'str' is never read
+    3183:4: warning: Value stored to 'str' is never read
+    3192:4: warning: Value stored to 'str' is never read
+    3203:4: warning: Value stored to 'str' is never read
+    3220:4: warning: Value stored to 'str' is never read
     
-    Change-Id: 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.
+    IPv4: Remove extraneous colon from format string
     
-    Or, "I can mathing" if you prefer meme-based commit messages.
-    
-    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.
+    Eliminate proto_tree_add_text from packet-per.c
     
-    Add decoding for MB2c specific AVPs according to 3GPP TS 29.468 Rel 12.1.0.
-    
-    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
-    
-     - 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)
+    Eliminate proto_tree_add_text from some dissectors.
     
-    Change-Id: Ide559c3e104b77818cef642b34e0076a7c5bd13d
-    Reviewed-on: https://code.wireshark.org/review/9735
-    Reviewed-by: Roland Knall <rknall@gmail.com>
+    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: 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 630f48f
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Sep 1 13:28:56 2015 -0400
 
-    epl: Fix epl write multiple parameter by index
+    Eliminate proto_tree_add_text from packet-rsvp.c
     
-     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.
-    
-    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>
+    Change-Id: I95edc1b40c07a4addf194df6a2056e7b61193e5a
+    Reviewed-on: https://code.wireshark.org/review/10348
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 1ddf1cf
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jun 1 19:48:17 2015 +0200
+commit 87f2bd4
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Fri Aug 14 12:02:38 2015 +0200
 
-    CheckAPI: Add a shadow variable check
+    idl2wrs: some code cleanups.
     
-    Check if there is index, time or strlen variable
+    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: I530a35d6e1cf13f0795b35579ce76ee373ed4b1a
-    Reviewed-on: https://code.wireshark.org/review/8724
-    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 8575e41
+commit aa1f556
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jul 23 14:53:54 2015 +0200
+Date:   Mon Aug 31 13:59:28 2015 +0200
 
-    NTP: fix DISSECTOR_ASSERT when decoding v6_flags
+    MSDP: fix will never be executed [-Wunreachable-code]
     
-    Issue include in g8d6324f75
+    Move tvbuff declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020
     
-    Change-Id: I49267b90a4a196409df76cb369d2dfacf42ba8d3
-    Ping-Bug:11361
-    Reviewed-on: https://code.wireshark.org/review/9754
-    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
-
-    Add decoding of following GSM A RR messages:
+    Found by Clang 3.7
     
-    - Talker indication
-    - Uplink release
-    - VGCS uplink grant
-    
-    Change-Id: I969ada857b71fb3d89efc44a18159c8aa39eef54
-    Reviewed-on: https://code.wireshark.org/review/9753
+    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 5b53445
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 15 23:10:16 2015 -0400
+commit 998dcc2
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Sep 1 19:50:52 2015 +0200
 
-    Add test_length to ptvcursor_add so it can do some bounds checking.
+    ANSI: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-    Ping-Bug: 11358
-    Change-Id: Idfd258c734e7a946300b2564bebf6e4cb374c8d1
-    Reviewed-on: https://code.wireshark.org/review/9655
+    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>
-    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 b7764fc
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 31 14:01:46 2015 +0200
 
-    Lua: add plugin version info
+    UMTS (mac): fix will never be executed [-Wunreachable-code]
     
-    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.
     
-    Bug: 11315
-    Change-Id: I8bc425ed1ed0dfdc1d05178754f44d44e0b209b5
-    Reviewed-on: https://code.wireshark.org/review/9593
-    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 2c534a9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jul 21 13:32:42 2015 -0400
-
-    Add Enabled Protocols dialog for Qt
+    Move tvbuff_t declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020
     
-    This dialog combines the "protocols" and heuristic dissectors (from GTK) into a single tree view where heuristic dissectors are children of their protocol.
     
-    Change-Id: I107656afd079c1d1c8a98161b736e4b4ad84f813
-    Reviewed-on: https://code.wireshark.org/review/9739
-    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>
+    Found by Clang 3.7
+    
+    Change-Id: Id26fd62273d6838774db161a8b3f6c7db94a2de1
+    Reviewed-on: https://code.wireshark.org/review/10328
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit bf3e117
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jul 15 14:16:00 2015 +0200
+commit c8f8784
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Sep 1 19:39:44 2015 +0200
 
-    HTTP2: Update to libnghttp2 1.1.2
+    ANSI A: fix dissection of numerous fields broken in g7298a31
     
-    Update also the documentation after last change
-    Change-Id: Ie93e669b07c7a0c2b8febabe92c8503296b36998
-    Reviewed-on: https://code.wireshark.org/review/9746
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    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: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 4d6ef27
+commit f0e4c49
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 22 20:20:29 2015 -0700
+Date:   Tue Sep 1 08:24:58 2015 -0700
 
-    Qt < 5.1 doesn't have devicePixelRatio().
+    Update the release notes.
     
-    Change-Id: I490617db6b645c0129c565eb4b6efceeece9d535
-    Reviewed-on: https://code.wireshark.org/review/9751
+    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 780c300
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jul 10 14:52:34 2015 +0200
+commit db2fdfd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Sep 1 07:37:45 2015 -0700
 
-    qt_ui_utils.h: fix empty paragraph passed to '@return' command [-Wdocumentation]
+    Fixup the main window tab order.
     
-    Try 2...
+    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: 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: If46e178365dbd59feb5985e9f8fa8b55d004d864
+    Reviewed-on: https://code.wireshark.org/review/10342
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1514fe0
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 22 10:28:04 2015 -0700
+commit a8682af
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Sep 1 09:53:38 2015 +0200
 
-    Show the current selection in the overlay scrollbar.
+    [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: Ie92b7ae170938eac71ede751d9067e1d47293092
-    Reviewed-on: https://code.wireshark.org/review/9750
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ia21e15ff6348f34bf8ae240f867f0ab2cade606a
+    Reviewed-on: https://code.wireshark.org/review/10340
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 093aef0
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Wed Jul 22 17:51:34 2015 -0400
+commit 7298a31
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 31 00:20:49 2015 -0400
 
-    RTSP: allow RTP heuristic dissection of RTSP interleaved channel data
+    Eliminate proto_tree_add_text from ANSI dissectors.
     
-    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.
-    
-    Change-Id: I7a6ea886e6744d51533aa916974572fff41eb144
-    Reviewed-on: https://code.wireshark.org/review/9749
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2c80810
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jul 22 22:53:59 2015 +0200
+commit 54d2ff1
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 31 16:06:33 2015 -0700
 
-    WCCP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Convert the WSP stats to generic stat API.
     
-    Dead Store include on g38c05061b
+    Add support for multiple tables to SimpleStatisticsDialog.
     
-    Change-Id: Ib29edea664ac6563c0eb9dc21dae168a8cfe6cd6
-    Reviewed-on: https://code.wireshark.org/review/9748
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I843d901db092d2f2856d3d1a16f29f85fb41374b
+    Reviewed-on: https://code.wireshark.org/review/10339
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 1701b99
+commit 377d215
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 22 10:28:20 2015 -0700
+Date:   Mon Aug 31 12:24:48 2015 -0700
 
-    Update the AUTHORS entry for David Eisner.
+    Convert the MTP3 stats to new "generic stat API".
     
-    Update David Eisner's email address at his request.
+    Convert both the MTP3 statistics and summary. As with the GSM stats this
+    is mostly untested.
     
-    Change-Id: I7886c68bd54790176b39613d876465e04d767059
-    Reviewed-on: https://code.wireshark.org/review/9747
+    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 3f0f49d
+commit e9614ad
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 21 23:59:18 2015 +0200
+Date:   Mon Aug 31 12:19:34 2015 +0200
 
-    Use pinfo pool and not packet pool for AT_STRINGZ addresses
+    Windows: update GeoIP library to 1.6.6
     
-    Change-Id: I474e6554b352147702eac32d5574f8ab4a1ab84d
-    Reviewed-on: https://code.wireshark.org/review/9745
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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 120ed14
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Jul 17 10:53:48 2015 -0400
+commit 1772416
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Aug 31 22:10:23 2015 +0200
 
-    Add documentation for new enable/disable protocol and heuristic dissector options.
+    tshark.pod: fix typo
     
-    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>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Iba5f12637e0f494805f2d9aab370fb42a32c1cb9
+    Reviewed-on: https://code.wireshark.org/review/10335
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 6452caa
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jul 17 17:01:27 2015 +0200
+commit 4e236e6
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 29 22:59:00 2015 +0200
 
-    Fix retrieval of data link type supported by remote interfaces with authentication
+    Qt/Lua: Call atclose when TextWindow closes
     
-    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()
+    The close callback was never called because the destructor was never called.
     
-    Bug: 11366
-    Change-Id: I4efea615084a82108e4a12a64e8c46817f30a5c6
-    Reviewed-on: https://code.wireshark.org/review/9690
-    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>
+    Change-Id: I9f6204858bc5d5e48d0aedc90b0e242ab70e161c
+    Reviewed-on: https://code.wireshark.org/review/10321
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 32d9a1d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 21 23:46:03 2015 +0200
+commit 7dd8349
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 12 20:58:52 2015 +0200
 
-    Ensure to copy the (un)resolved (source|destination) address columns before freeing epan memory
+    NGHTTP2: Update to 1.3.0
     
-    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>
+    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: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 83dc308
-Author: Luke Mewburn <luke@mewburn.net>
-Date:   Sun Jul 19 17:31:46 2015 +1000
+commit 026812c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 31 08:37:15 2015 -0700
 
-    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.
+    Redraw timestamps when time display settings change.
     
-    3. Optionally append CCCID to protocol item in tree
-       using preference "pcli.summary_in_tree".
+    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.
     
-    4. Obsolete preference "pcli.udp_port".
-    
-    Bug: 9266
-    Bug: 11220
-    
-    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: 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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 6e7f302
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jul 21 21:49:58 2015 +0200
+commit 75b8457
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 31 09:24:49 2015 -0700
 
-    Translation (Qt): fix typo
-    
-    Duplicate names and also typo about service (=> Services)
+    Add a Telephony→SCTP submenu.
     
-    Found by yfdyh000 via Transifex
+    Add the current SCTP actions to the telephony menu to match the GTK+ UI.
     
-    Change-Id: I011b98a25828b8fc55b395d7ed5677da51a30f43
-    Reviewed-on: https://code.wireshark.org/review/9741
-    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 e30a0ff
+commit 3bec655
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jul 21 09:51:12 2015 -0700
+Date:   Fri Aug 28 16:46:17 2015 -0700
 
-    Add manual name address resolution.
+    Redraw the packet list when name resolution changes.
     
-    Make it an editor frame instead of a dialog similar to the column editor
-    and prototocol preference editor.
+    Call columnsChanged (which invalidates cached column strings) when we
+    change our name resolution preferences from the View menu.
     
-    Change-Id: If1a0cdf02dcab0eca98e8d39c94a3c2fe236df5a
-    Reviewed-on: https://code.wireshark.org/review/9743
+    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 e8f24f3
-Author: Hauke Mehrtens <hauke@hauke-m.de>
-Date:   Tue Jul 14 23:43:06 2015 +0200
+commit a060183
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Aug 28 22:41:07 2015 -0400
 
-    coap: fix decoding of observe extension
-    
-    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.
+    Eliminate proto_tree_add_text from packet-rtps.c
     
-    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>
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit bd62adb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 21 13:42:43 2015 -0700
+commit 053f53c
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Mon Aug 31 06:00:28 2015 +0400
 
-    Update symbols.
+    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: I92fc9ff73278656c717434c23560127c9c59eb06
-    Reviewed-on: https://code.wireshark.org/review/9742
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I0a72a9a3e40cf8269856fbbcd97b270af422afa2
+    Reviewed-on: https://code.wireshark.org/review/10322
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 868cd67
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 21 12:37:11 2015 -0700
+commit f0b4e8e
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 30 20:31:35 2015 +0200
 
-    Do all the work of registering an ONC RPC-based protocol in rpc_init_prog().
+    dlsw: don't THROW() an exception from a dissector
     
-    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: I897202e7fb2987f608ca4f98aa1a1dc4b7dbd995
+    Reviewed-on: https://code.wireshark.org/review/10320
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit f38d976
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jul 21 08:49:39 2015 -0700
+commit 81c6ecd
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Aug 30 20:08:53 2015 +0200
 
-    Be more careful about variable scope and quoting.
+    dlsw: remove unnecessary if (tree) checks
     
-    Change-Id: Ica226178cb43b82a87441fe11e8c2093e01db8a5
-    Reviewed-on: https://code.wireshark.org/review/9738
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    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 573b33a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 21 17:05:53 2015 +0200
+commit 78007fa
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Aug 30 10:16:16 2015 -0400
 
-    LTE RRC: fix a typo
+    Add debug printing to tshark
     
-    Let's have consistent naming for dissectors
+    Add g_warning functions for tshark debug printing, disabled by default.
     
-    Change-Id: I03d14e208692f39a7ae5017bd539f38f14abaa1f
-    Reviewed-on: https://code.wireshark.org/review/9737
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: If1720b790b75bd1228afa62efac49dc04bc8addb
+    Reviewed-on: https://code.wireshark.org/review/10314
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 3e29fc5
-Author: Robert Beardsworth <rob_beardsworth@hotmail.com>
-Date:   Mon Jul 20 23:16:38 2015 +0200
+commit 00087b4
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 29 22:28:01 2015 +0200
 
-    MQ: fix dissection of Work Information Header Reserved field
+    Add Lua 5.2.3 built with MSVC2015
     
-    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>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I9b173f5136f858e4f95fb5b0688ef02c08a8d9e4
+    Reviewed-on: https://code.wireshark.org/review/10313
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 70d1c72
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 20 22:05:09 2015 -0700
+commit 99e16ce
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 30 08:10:04 2015 -0700
 
-    Don't make dummy RPC program entries.
+    [Automatic update for 2015-08-30]
     
-    Just hand the payload off to the data dissector.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I59a61ec6352ef0b0c51382d68ca23b00010eb723
-    Reviewed-on: https://code.wireshark.org/review/9733
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I37400bf1fac15fcd5f2946913b96184b1828f091
+    Reviewed-on: https://code.wireshark.org/review/10317
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 8e4ae94
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 20 15:40:35 2015 -0700
+commit faaa6f2
+Author: Pyeole <pyeole@ncsu.edu>
+Date:   Sat Aug 29 15:36:41 2015 -0400
 
-    show_timer_ isn't used on OS X with Qt < 5.0.0.
+    BGP: fixed incorrect NLRI decoding
     
-    Change-Id: I5b7a73dcc3bb0f11d24b6d1e9e9d2bcd1f333278
-    Reviewed-on: https://code.wireshark.org/review/9728
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Bug: 11308
+    Change-Id: I967b9596edad1e3656e139d0ca3a0e3c389d80ea
+    Reviewed-on: https://code.wireshark.org/review/10308
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 127a9bd
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jul 20 14:31:11 2015 -0700
+commit e0a87d8
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 27 18:01:27 2015 +0200
 
-    Add a ProgressFrame to the RTP analysis dialog.
-    
-    Use it to show save file progress.
+    stanag4607: add check for wtap max size.
     
-    Change-Id: Iff95b122825006352dc13cf4b7787e29b0d2c5f0
-    Reviewed-on: https://code.wireshark.org/review/9725
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    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: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e48ab48
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 20 15:19:50 2015 -0700
+commit 6c06578
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 29 22:54:54 2015 +0200
 
-    Allow EUI-64s to be specified as numbers or byte strings.
-    
-    They are, after all, really byte strings, just as MAC-48s/EUI-48s are.
+    CBOR: fix definition of cbor.type.tag64 field
     
-    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
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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>
 
-commit 1e48766
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Feb 18 13:30:06 2015 +0100
+commit 7791c6f
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 19:14:13 2015 -0400
 
-    Qt: Add option to back white line separator for packet list items
+    pcapng: drop count is unknown for ISB without isb_if_drop option
     
-    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.
+    Bug: 11489
+    Change-Id: I38bcc2570c2efc461e4eb0edbff8ac2a7371c725
+    Reviewed-on: https://code.wireshark.org/review/10311
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+
+commit 605f33c
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 14:16:52 2015 -0400
+
+    pcapng: handle NRB with options
     
-    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.
+    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.
     
-    Bug: 10954
-    Change-Id: Id8f58520d7224db4eb8181bcc04febd7416a8578
-    Reviewed-on: https://code.wireshark.org/review/7293
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.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: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 7e13cac
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jul 20 13:07:26 2015 -0700
+commit eacaa1a
+Author: Kevin Bracey <kevin.bracey@arm.com>
+Date:   Wed Jul 22 15:36:07 2015 +0300
 
-    Try to minimize sorting overhead.
+    6LoWPAN: IPv6 Fragment Headers don't have a Length field
     
-    Process application events as little as possible while sorting.
+    RFC 6282 specifies special handling of the "Length" field in compressed
+    IPv6 extension headers. However, the Fragment Header does not have a
+    Length field, so this special handling does not apply - the second octet
+    should be treated as opaque data, and the header length is always 8
+    octets.
     
-    Change-Id: I9d779aebf6edaafc1e6af3a99b4a0dac682ea6b6
-    Reviewed-on: https://code.wireshark.org/review/9722
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    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 63edb99
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jul 17 15:06:55 2015 -0700
+commit 8ddd480
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 10:30:15 2015 -0400
 
-    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.
+    pcapng: do not byte-swap NRB IPv4 address
     
-    Use toByteArray().constData instead of .data. I'm not sure if it matters
-    in our case but it's more correct.
+    Per the spec, it's always encoded in network order (4 separate bytes), and
+    thus should not be swapped on read.
     
-    Change-Id: Ibe35fee9b9dd3fabb5ff8ddcc21f6bf59dec4af6
-    Reviewed-on: https://code.wireshark.org/review/9720
-    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 eb1ccbd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 20 19:03:59 2015 +0200
+commit 9158176
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Aug 29 10:00:02 2015 -0400
 
-    Protect dissector_get_(default_)string_handle() against NULL input string
+    pcapng: make SPB cap_len the same as packet_len if IDB snaplen is 0
     
-    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>
-
-commit 54812f2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 20 20:03:30 2015 +0200
-
-    MAC LTE: indicate explicitly that UL LCID 11 is used for Category 0 devices
+    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: Ia9a046c8aebdefad0303bed995c19f5408e4460b
-    Reviewed-on: https://code.wireshark.org/review/9719
-    Reviewed-by: 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: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 170def9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 20 10:02:08 2015 -0700
+commit 0badc8c
+Author: Jim Young <jyoung@gsu.edu>
+Date:   Fri Jul 10 01:50:19 2015 -0400
 
-    Fix escaping of strings in UATs.
+    Insure Qt Capture preferences dialog displays default capture device (if any)
     
-    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).
+    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.
     
-    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
-    
-    Bug: 11372
-    Change-Id: I594840327fa41895130903c3c612ba97d6c29df3
-    Reviewed-on: https://code.wireshark.org/review/9716
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 10965
+    Change-Id: Ie93f84010a19e8144efa46ce889fb9064979e0e9
+    Reviewed-on: https://code.wireshark.org/review/9584
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 09ae055
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Jul 20 13:24:58 2015 +0200
+commit 51e77b6
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Aug 28 15:53:42 2015 +0200
 
-    GTPv2: always set direction before dissecting PCO IE
+    CBOR: fix no previous prototype for proto_reg*_cbor [-Wmissing-prototypes]
     
-    Otherwise some protocol/container ID payload are skipped as their decoding depends on the direction that is unknown
-    Bug: 11378
-    
-    Change-Id: Ic14aa67fe4f262a9f3056e8f70f58afd78c59043
-    Reviewed-on: https://code.wireshark.org/review/9710
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I20476046fc2338484ab85757cad7b19f4e41e4be
+    Reviewed-on: https://code.wireshark.org/review/10283
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 030da2a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Fri Jul 17 19:24:04 2015 +0200
+commit 4ebf5b8
+Author: Jeffrey Smith <whydoubt@gmail.com>
+Date:   Fri Aug 28 17:28:31 2015 -0500
 
-    coverity 1250812: fix a (very unlikely) integer overflow
+    bootp/dhcp: fix Alcatel suboption detection bug
     
-    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: I4a4222f3f30bf8e996770295756dd206b5ce101b
+    Reviewed-on: https://code.wireshark.org/review/10297
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 21b99e3
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Jul 19 19:50:39 2015 +0200
+commit e80bd2e
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 28 19:45:28 2015 +0200
 
-    Remove functions that got reintroduced by error in g21e5a95
+    Added Reload Lua plugins to the release notes.
     
-    Change-Id: I5e5956727641be3e377109dd032da76f6b21c481
-    Reviewed-on: https://code.wireshark.org/review/9707
-    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 19b2848
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Jul 19 13:06:37 2015 -0700
+commit e18e400
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 15:49:22 2015 -0700
 
-    Fixup make-usb.py
+    Fix a GHashTable assertion in DecodeAsDialog.
     
-    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.
+    Make sure we don't call g_hash_table_removed from g_hash_table_foreach,
+    which generates an assertion error.
     
-    Change-Id: Ia18bcd9c0eb365bd97b735795e9ad39cd85093a8
-    Reviewed-on: https://code.wireshark.org/review/9706
+    Bug: 11426
+    Change-Id: I00283c97b0fc63551b901c0fd526b60c0fb80ace
+    Reviewed-on: https://code.wireshark.org/review/10296
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 0809a4e
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sun Jul 19 21:57:20 2015 +0200
+commit 1663224
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 28 16:31:33 2015 -0700
 
-    Looks like automatic update 0907a6ebb824c1d9d0eaf34940627e0d4d940e7b
-    didn't work as expected for epan/dissectors/usb.c
-    Revert that file for now.
+    Block sizes are unsigned 32-bit quantities; don't stuff them into an int.
     
-    Change-Id: I7ebbc860e2e4a93f086fc3e53138f3272814d5f0
-    Reviewed-on: https://code.wireshark.org/review/9705
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    *Especially* don't stuff the amount of remaining data in a block into an
+    int that will then be passed to file_skip() as an amount to skip ahead,
+    as a Really Large Value will turn into a negative value and produce
+    various forms of bizarre and tricky-to-debug behavior.
+    
+    Change-Id: I4d0a6b36fe50df84925690ad688a3ab0433ceb17
+    Reviewed-on: https://code.wireshark.org/review/10299
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0907a6e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jul 19 08:09:55 2015 -0700
+commit 15c9923
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 28 23:30:30 2015 +0200
 
-    [Automatic update for 2015-07-19]
-    
-    Update manuf, services enterprise-numbers, translations, and other items.
+    Qt: Fix use-after-free pattern
     
-    Change-Id: I43c44e68e802ed2ab595714ecaf072d941c852ad
-    Reviewed-on: https://code.wireshark.org/review/9701
+    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 26c95e8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 18 23:24:53 2015 -0700
+commit 579365e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 14:03:34 2015 -0700
 
-    Get rid of trailing whitespace.
+    Disable most of the main window while we're tapping.
     
-    Change-Id: Ifd39e84284be5701c67173da09be12266ef93e25
-    Reviewed-on: https://code.wireshark.org/review/9700
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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.
+    
+    Note that we will probably want to disable more of the main window and
+    do so in other parts of the code.
+    
+    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 7e817ae
+commit 4d71ae7
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 18 23:23:32 2015 -0700
+Date:   Fri Aug 28 15:54:53 2015 -0700
 
-    Require dissectors for all ONC RPC calls and replies.
-    
-    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.
-    
-    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".
+    Have separate variables for read and write errors.
     
-    It also means that we distinguish between "it's void" and "it's
-    unknown", so that unknown values will get flagged as such.
+    That way, when we check for read errors, we don't run the risk of
+    thinking we have a read error after we get a write error.
     
-    Change-Id: I748580c1dca61d1f0972396db1a3b0885fc0a541
-    Reviewed-on: https://code.wireshark.org/review/9699
+    Change-Id: Idb79822d30989b2529433878798c577a76eacca7
+    Reviewed-on: https://code.wireshark.org/review/10295
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 75d4fa2
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sat Jul 18 14:45:50 2015 -0400
+commit aa100e0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 12:57:57 2015 -0700
 
-    Cleanup pcapng.c file
+    Don't show a progress frame if our file was closed.
     
-    Cleanup some pcapng.c comments, defines, etc.
-    
-    Change-Id: Id854c6ef033eb8cb99175ba62aa8733e21433463
-    Reviewed-on: https://code.wireshark.org/review/9698
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    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: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit eea54a0
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Sat Jul 18 07:54:16 2015 +0200
+commit c1c6132
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 12:28:24 2015 -0700
 
-    Enable decryption by default
+    Don't dissect twice from TapParameterDialog.
     
-    Change-Id: Ife299ec6b56e6a158ed76413d7f2a8e760824a01
-    Reviewed-on: https://code.wireshark.org/review/9696
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    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: 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 5b9d61f
+commit d767186
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 14:38:32 2015 -0700
+Date:   Fri Aug 28 12:49:18 2015 -0700
 
-    Remove the debugging output; it's now attached to the bug.
+    Get rid of trailing blanks.
     
-    Change-Id: I6a9252d2841fc44c6fdb6bd27517d60570afbae0
-    Reviewed-on: https://code.wireshark.org/review/9695
+    Change-Id: I0b705c924464dcc4987ed0e7c67b106b2b648dce
+    Reviewed-on: https://code.wireshark.org/review/10289
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ecd3017
+commit da266af
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 13:16:29 2015 -0700
+Date:   Fri Aug 28 12:46:11 2015 -0700
 
-    In the p < q test, first run tshark -V, to see the full dissection.
+    Don't check the radio information when testing for an HT Control header.
+    
+    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.
     
-    Change-Id: I7d82d34369d192e7da7d554f44f448e1613f850f
-    Reviewed-on: https://code.wireshark.org/review/9694
+    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 354f8e3
+commit 42570f9
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 11:40:42 2015 -0700
+Date:   Fri Aug 28 12:05:20 2015 -0700
 
-    Dump the output of tshark in the p < q decryption test.
+    Clean up scanning to guess the bitrate of an MPEG-2 Transport Stream file.
     
-    See what it prints on Windows.
+    Don't treat an EOF at the beginning of a frame as an error.
     
-    Change-Id: Id35d87595543eca3e5b5d80dbe9a7639e0a85994
-    Reviewed-on: https://code.wireshark.org/review/9693
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 5038efd
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Fri Jul 17 15:06:18 2015 +0200
-
-    ssl-utils: do not check for empty keylog filenames
+    Treat I/O errors as hard errors; treat short reads as an indication that
+    the file isn't an MPEG-2 Transport Stream file.
     
-    If ssl.keylog_file is not configured, an empty string is set. In that
-    case, do not attempt to open the keylog file.
+    Treat the PCR for a given PID not going forward as an indication that
+    the file isn't an MPEG-2 Transport Stream file.
     
-    Change-Id: I2ba4b9dbc7cfb5009d2623c49a129e98734df80f
-    Reviewed-on: https://code.wireshark.org/review/9688
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Bug: 11471
+    Change-Id: I42b5887049423f8265db9d121d7b5bd388e5b244
+    Reviewed-on: https://code.wireshark.org/review/10286
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 38c0506
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 15 16:02:51 2015 -0400
+commit c04d54f
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Aug 27 23:35:58 2015 +0200
 
-    WCCP - remove global variable used to store address information for computation later.
+    Preparation Host Flows: make ICMP(v6) code and type retrieval more robust
     
-    Change-Id: I06841ec77cf9f34914b9dfe10b8cd35824b32b71
-    Reviewed-on: https://code.wireshark.org/review/9647
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Do not retrieve type and code base on the info column content.
+    Instead store type and code in pinfo structure and retrieve them in sequence analysis tap.
+    
+    Change-Id: I71cd505d7faf713c2372731495d47b45928a41f8
+    Reviewed-on: https://code.wireshark.org/review/10280
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Pascal Artho <pascalartho@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 21e5a95
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Jul 12 20:40:31 2015 -0400
+commit 5179406
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 28 09:50:26 2015 -0700
 
-    Remove all preferences related to enabling/disabling heuristic dissectors.
-    
-    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.
-    
-    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.
+    Update the release notes.
     
-    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>
+    Change-Id: I7fb0d307355320a77f011b59c71d1d54066b7d08
+    Reviewed-on: https://code.wireshark.org/review/10284
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 5bd6c4a
+commit a7f22aa
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jul 15 14:33:56 2015 +0200
+Date:   Mon Jul 27 17:00:18 2015 +0200
 
-    STUN: Add missing error codes
+    ISAKMP: Add new CHACHA20/POLY1305 Transform Types Values (RFC7634)
     
-    Bug:11350
-    Change-Id: I8876f7b088229b7b60b2e5d81b70e2e762cad044
-    Reviewed-on: https://code.wireshark.org/review/9644
+    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 cbdd102
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jul 17 18:01:27 2015 +0200
+commit f19a173
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 17:14:39 2015 -0700
 
-    Pacify Windows buildbots
+    Speed up column sorting.
     
-    Change-Id: I6e1db78ca42d7995e0309dd5d43e2abaf1e3b55e
-    Reviewed-on: https://code.wireshark.org/review/9691
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 3faec79
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jun 8 19:38:48 2015 +0200
-
-    Qt/Bluetooth: Add HCI Summary dialogue
+    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.
     
-    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.
+    Don't colorize packets when sorting in the Qt UI unless it's necessary.
     
-    Change-Id: I6b6bd02533c4605a2dd2c1f5dfee46f72a0f3fdc
-    Reviewed-on: https://code.wireshark.org/review/9676
-    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
-
-    Add preference for disabling 'packet size limited during capture' message in Info column.
+    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.
     
-    Bug: 9827
-    Change-Id: I8fdba4827b164bd231981bfdd2e1bd0499f4f87c
-    Reviewed-on: https://code.wireshark.org/review/9669
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit b1eaf29
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 15 17:11:36 2015 -0400
-
-    WCCP - Only populate address table once and presume first address table type is the one that should populate it.
+    Use a pre-allocated and pre-compiled GRexex when we prime columns. Note
+    that we probably shouldn't parse a regular expression there.
     
-    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
+    Cache the last result of proto_registrar_get_byname.
     
-    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.
+    Note performance hot spots elsewhere in the code.
     
-    Change-Id: I9b8f960acf75298ebb098d9b667fca49dca52306
-    Reviewed-on: https://code.wireshark.org/review/9631
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    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: 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 01fb470
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 12:48:56 2015 -0700
 
-    Don't register in a non-existent dissector table.
+    More retapping fixups.
     
-    There's no "btrfcomm.channel" dissector table any more; there's a
-    "btrfcomm.dlci" table.
+    Disable the main file close and reload actions while we're retapping,
+    otherwise many of our dialogs will crash.
     
-    Change-Id: Ia7cdf45c04b6b116a67ef4b7dfdce509cdb15327
-    Reviewed-on: https://code.wireshark.org/review/9684
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Disable the TapParameterDialog filter entry while we're retapping. This
+    keeps us from enabling the "Apply" button when we shouldn't.
+    
+    Don't prematurely disconnect our signals in WiresharkDialog.
+    
+    Change-Id: Iaf507eb4503b9c296766f109f2b8c71343263982
+    Reviewed-on: https://code.wireshark.org/review/10274
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 477b49e
+commit 30c2f23
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 16 22:18:01 2015 -0400
+Date:   Tue Aug 25 20:58:09 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.
+    Eliminate proto_tree_add_text from some dissectors.
     
-    Bug: 10202
-    Change-Id: Ic550d75a853eca7abd162241b8426ab196ba0d12
-    Reviewed-on: https://code.wireshark.org/review/9671
+    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: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d1fcb7d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 02:01:22 2015 -0700
+commit 2ed634d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 15:00:39 2015 +0200
 
-    Report an error if we fail to open the keylog file.
+    Support BER files bigger than 256kB
     
-    That way, we don't just silently fail.
+    Also support APPLICATION as starting tag.
     
-    Change-Id: I924f4387f6efdc342f6b02ed29796802567c1884
-    Reviewed-on: https://code.wireshark.org/review/9683
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 5a9e438
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Jul 15 17:15:54 2015 +0200
+commit 6151946
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 14:51:50 2015 +0200
 
-    Bluetooth: RFCOMM: Replace Decode by Channel by DLCI
+    Qt: Fixed some memory leakages
     
-    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.
-    
-    Change-Id: I56a641cfd2d4495d119f08ded1aab5cead458e17
-    Reviewed-on: https://code.wireshark.org/review/9679
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I5bccf706001f9ff41197ed13b1be5a7404ca594f
+    Reviewed-on: https://code.wireshark.org/review/10251
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit dac7cf9
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Jul 13 19:01:48 2015 +0200
+commit efba977
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 15:18:51 2015 +0200
 
-    Bluetooth: Add generic UUID table for DecodeBy
+    Qt: Fixed some memory leakages
     
-    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".
-    
-    Change-Id: I473bc73d10939e8ed6dd55a6a92387c7a1ec125a
-    Reviewed-on: https://code.wireshark.org/review/9678
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: Ie8c9b7f8c9203acb5aec00d5553b911e0299f53c
+    Reviewed-on: https://code.wireshark.org/review/10253
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 5491fea
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Jul 15 15:24:50 2015 +0200
+commit 8384a5b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 20:18:46 2015 +0200
 
-    Qt: Fix DecodeAs for String tables
+    Qt: Fixed some memory leakages
     
-    It seems that string object die to early. Add space when it can live.
+    And changed strdup -> g_strdup
     
-    Change-Id: I4e776134ce6782bd6e854ab2bc3c188e80530839
-    Reviewed-on: https://code.wireshark.org/review/9677
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I62de106462259194738d633f16297eb1210f8ccf
+    Reviewed-on: https://code.wireshark.org/review/10259
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 5a51b8b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 00:57:09 2015 -0700
+commit 2e1fa63
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 26 10:32:52 2015 +0200
 
-    Don't discard the echo command's output.
+    Lemon grammar: fix indent (use tabs)
     
-    Change-Id: I957a0c1beeae4bbd8c32ed05f30525becaf37e95
-    Reviewed-on: https://code.wireshark.org/review/9682
-    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 520315f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 17 00:12:25 2015 -0700
+commit 0af048b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Aug 25 19:14:59 2015 -0400
 
-    OK, that didn't do it - print the command again.
+    Remove calls of tvb_ensure_length_remaining.
     
-    Too bad DEC used / as an option character and Bell Labs chose it as a
-    pathname separator.
+    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: Ie58ba79476e0f24e408fae55f6c5eaff3ffb11fa
-    Reviewed-on: https://code.wireshark.org/review/9680
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I1e77695251e055644bcbbb89f3c181c65d1671ca
+    Reviewed-on: https://code.wireshark.org/review/10268
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 57520af
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 16 21:41:50 2015 -0700
+commit 374439d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 11:24:29 2015 -0700
 
-    Generate key paths as UN*X paths and then run them through cygpath.
+    Don't emit app signals from dialogs.
     
-    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.
+    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.
     
-    Bug: 11372
-    Change-Id: I442a30c4c954540a05942ed70ec3687941428a96
-    Reviewed-on: https://code.wireshark.org/review/9675
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Fix the "Enabled Protocols" action name while we're here.
+    
+    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 f82df51
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 16 19:39:23 2015 -0700
+commit 8ad5611
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Aug 26 22:52:06 2015 +0200
 
-    Temporarily log the command that's failing.
+    sv: remove some unnecessary checks
     
-    Trying to debug the problem.
+    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
     
-    Change-Id: I26f78e49556cb1d40f0c8ddbfd58f058dceb0e77
-    Reviewed-on: https://code.wireshark.org/review/9674
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 eaf1aad
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jul 16 22:34:14 2015 -0400
+commit 7b35992
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 22:12:17 2015 +0200
 
-    wmem: don't remove tiny blocks from the recycler
+    Reload IO Graph Y fields when reload Lua plugins
     
-    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: 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 45812a5
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jul 16 23:16:19 2015 +0200
+commit bc4487a
+Author: Jeffrey Smith <whydoubt@gmail.com>
+Date:   Tue Aug 25 18:40:45 2015 -0500
 
-    test: fix RSA decryption test under Windows
+    bootp/dhcp: tighten check for Alcatel extensions
     
-    TEST_KEYS_DIR already contains a trailing slash. Windows does not like
-    forward slashes, so drop the additional slash to fix tests under
-    Windows.
+    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.
     
-    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>
-    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>
+    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: Ie4188ff900426c2d80a5694fbba5c88385625a61
+    Reviewed-on: https://code.wireshark.org/review/10267
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit b99f10b
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jul 16 23:06:36 2015 +0200
+commit e1c807c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 26 08:41:50 2015 -0700
 
-    ssl-utils: fix RSA keys with GnuTLS 2.12.23
-    
-    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.
+    Add missing callback support.
     
-    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: 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: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 255d53d
+commit e234ce8
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jun 11 15:53:51 2015 -0700
+Date:   Mon Aug 24 12:30:56 2015 -0700
 
-    Draw packet colors in the packet list scrollbar.
+    Rework tapping in Qt dialogs.
     
-    Inspired by (but not as fancy as) Packet Fence, an enhancement written
-    for Ethereal a loooong time ago by Martin Visser:
+    Add cf_cb_file_retap_started and cf_cb_file_retap_finished to file.[ch].
+    Add their associated signals to CaptureFile.
     
-    https://www.wireshark.org/lists/ethereal-dev/200011/msg00122.html
+    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.
     
-    Several text editors call this a "minimap".
+    Use beginRetapPackets and endRetapPackets in WiresharkDialog and
+    FollowStreamDialog. We will likely need to add them elsewhere.
     
-    Color each scrollbar raster line to match the color of up to 7 packets.
-    Note in the comments why this number was chosen.
+    Update comments.
     
-    If we have any flagged frames (marked, ignored, time ref) indicate them
-    on either side of the scrolbar.
+    Change-Id: I1788a6ade0817c31aa3419216df96be5e36b2178
+    Reviewed-on: https://code.wireshark.org/review/10261
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit f7e9a79
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 24 12:33:49 2015 -0700
+
+    Add per-dialog progress frames.
     
-    Handle HiDPI (retina) displays. This means that your window size depends
-    on the height of your scrollbar *and* your monitor resolution.
+    Add ProgressFame::addToButtonBox, which violates the UX guidelines on
+    every platform we support by inserting a ProgressFrame into a
+    QDialogButtonBox.
     
-    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.
+    Call addToButtonBox in the constructors of a bunch of dialogs.
     
-    Change-Id: Ia089d2d766ce37bab11e22d1a5721b4908935304
-    Reviewed-on: https://code.wireshark.org/review/8982
+    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: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Gerald Combs <gerald@wireshark.org>
 
-commit 3e059c9
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jul 16 23:16:00 2015 +0200
+commit 8b4ff24
+Author: tkc <chaitanya.mgit@gmail.com>
+Date:   Tue Aug 25 16:58:43 2015 +0530
 
-    SMB2: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    ieee80211: Qos Control bit4 handling: Make the default case as EOSP, to handle TDLS Packets.
     
-    Change-Id: Ic7d713e8593cd0841089f2c26d2c24f2f008cb31
-    Reviewed-on: https://code.wireshark.org/review/9667
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    When parsing TDLS direct link packets the ToDS: 0 and FromDS:0
+    so the wireshark treats the 4th bit in QoS Control as "bit4", but it
+    should be treated as EOSP.
+    
+    So changed the default case to EOSP and only when TODS is set
+    treat it as "bit4".
+    
+    Change-Id: Ie2a73320dc9921aed4547e32836e6cd7d89ef109
+    Reviewed-on: https://code.wireshark.org/review/10250
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 0d4f412
+commit 57b2b77
 Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Jul 16 22:58:32 2015 +0200
+Date:   Wed Aug 26 08:50:09 2015 +0400
 
-    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.
+    cmake: rework version.h handling to treat it like config.h
     
-    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.
+    It wasn't working on my system: I kept seeing the old git revision
+    in '...shark -v' even after deleting version.h
     
-    Change-Id: I22d6269a66d6ed558035aad3e6702c4a9c8af1fa
-    Reviewed-on: https://code.wireshark.org/review/9665
+    Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5
+    Reviewed-on: https://code.wireshark.org/review/10265
+    Petri-Dish: Jörg Mayer <jmayer@loplof.de>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit d23ff4f
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 16 22:03:29 2015 +0200
+commit c18d2f8
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 25 15:16:29 2015 +0200
 
-    Qt: remove unused parameters
+    Qt SCTP: Changed prohibited APIs
     
-    Change-Id: I45fcf87f99dc15eb49343119fa134fb5698b15cf
-    Reviewed-on: https://code.wireshark.org/review/9664
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 0b11d5d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 15 21:32:44 2015 +0200
-
-    Win32: fix generation of NSIS installer when compiling with Qt 5.5
+    strcpy -> g_strlcpy
+    sprintf ->g_snprintf
     
-    *.qm files are now in a translations subfolder
+    Also initialize some temp variables.
     
-    Change-Id: I233152cd2662aec7072769e27f7a278c6890d8ec
-    Reviewed-on: https://code.wireshark.org/review/9646
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    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: 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 bd21889
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 25 19:36:28 2015 +0200
 
-    Qt: Frame flag updates.
+    Camel: fix indent (use 2 spaces)
     
-    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.
+    Change-Id: I0e8047fca7f24e60e4db8ad77254bcff5f8d6651
+    Reviewed-on: https://code.wireshark.org/review/10257
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 6b41d2c
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 22 18:31:41 2015 +0100
+
+    Do not treat all unknown IP protocols as unknown IPv6 extension headers
     
-    Rename some variables named "index" since they shadow a function name.
+    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 5e45269
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 25 16:56:37 2015 -0700
+
+    Explain why the MSDU length field in an A-MSDU is big-endian.
     
-    Change-Id: I9a731a76e4e63e562b561c29d13915278d5a7dbb
-    Reviewed-on: https://code.wireshark.org/review/9663
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I4a1cfd09395860348d71e9f4c86b6343cfdcd02a
+    Reviewed-on: https://code.wireshark.org/review/10262
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b1e0f43
+commit 4fe661d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 16 11:48:06 2015 -0700
+Date:   Tue Aug 25 15:40:00 2015 -0700
 
-    One definition of the same typedef suffices.
+    Get subset TVBs correctly.
+    
+    If you know the actual data length, use tvb_new_subset_length(); it will
+    use that as the *reported* length, which is how it *should* be used, and
+    will calculate the *captured* length for you as appropriate.
     
-    Change-Id: Ic221bf911f6de9bc94278350e0642143d14f6e82
-    Reviewed-on: https://code.wireshark.org/review/9662
+    Change-Id: I86dde999f59fdfec58b118729b7b881737983033
+    Reviewed-on: https://code.wireshark.org/review/10260
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0801cd3
+commit 0e952e6
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 16 19:27:49 2015 +0200
+Date:   Tue Aug 25 19:55:56 2015 +0200
 
-    DTLS: fix compilation without libgcrypt or libgnutls
+    SIGCOMP: fix sigcomp.copying_bytes_literally field
     
-    Change-Id: I571f1ddaaa9579af65d558afc7162493a7393703
-    Reviewed-on: https://code.wireshark.org/review/9661
+    Change-Id: Ib1baa3437579a413899aaba5dd8d31982cda1b0d
+    Reviewed-on: https://code.wireshark.org/review/10258
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 6fcfb5e
-Author: Richard Sharpe <rsharpe@samba.org>
-Date:   Sat Jul 4 10:09:58 2015 -0700
+commit 8e55f68
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Mon Aug 24 04:34:06 2015 +0400
+
+    Remove gitversion.h
+    
+    Change-Id: Id3144ecaf9289dbe53cd2f5d3e3de57e8de955f6
+    Reviewed-on: https://code.wireshark.org/review/10256
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+
+commit 0c291f9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 24 22:30:46 2015 -0400
 
-    Add support to the SMB2 protocol for one of the proposals for POSIX Extensions
-    to the SMB2 protocol.
+    Eliminate proto_tree_add_text from packet-sigcomp.c
     
-    I am submitting this purely so that it is available for others to play with.
+    Some other cleanup noted by the check* scripts.
     
-    Change-Id: I379b9da90731cc61ce38a1fdf21dc7c09d0d114e
-    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/9496
+    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: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit da91443
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 16 17:08:31 2015 +0200
+commit 571f254
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 23 03:46:36 2015 +0100
 
-    LTE RRC: fix dissection of ETWS/CMAS warning messages
+    Replace "IPv6 header length" with the more correct "payload length"
     
-    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: I3e667ba2e3ac49ce99e7a2035d9ff604fd7cbcca
+    Reviewed-on: https://code.wireshark.org/review/10205
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6d33c12
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Thu Jul 16 09:14:07 2015 -0700
+commit cc15b11
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 24 10:29:18 2015 +0200
+
+    Multicast Stream: Fix Dereference of null pointer found by Clang analyzer
+    
+    Change-Id: I419f49132f8b0853c17b2fd1b4e9869ef3fafd13
+    Reviewed-on: https://code.wireshark.org/review/10224
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-    Add display_is_remote.
+commit 31bf40e
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 25 12:45:01 2015 +0200
+
+    [Camel] The tags used in EstablishTemporaryConnectionArg differs in V2 and
+    V3 versions of Camel.
+    Add ASN1 code for EstablishTemporaryConnectionArgV2
     
-    Add a display_is_remote function and use it instead of get_conn_cfilter
-    to check for remoteness.
+    Bug: 11466
     
-    Change-Id: Ia93d113afec36ede55daf7dc8394b2dc0d8c9abf
-    Reviewed-on: https://code.wireshark.org/review/9659
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I0dbb9c83e520c269dd567f3c3bc34c99c9aa5e15
+    Reviewed-on: https://code.wireshark.org/review/10249
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 78bc3dd
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 15 23:13:57 2015 +0200
+commit 2af5783
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 23 21:34:21 2015 +0100
 
-    GSM RLC/MAC: fix an infinite loop when analyzing (E)GPRS header
+    Add more validity checks to the IPv6 dissector
     
-    Change-Id: Ibba32a2860f80979ee9df3caeeaeda14fde7e7d0
-    Ping-Bug: 11358
-    Reviewed-on: https://code.wireshark.org/review/9649
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Check for IP version and header size
+    
+    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: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d2acb04
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Feb 2 09:01:29 2015 -0800
+commit d5049ea
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Aug 22 20:08:31 2015 +0200
 
-    Add the RTP Stream Analysis dialog.
+    win32: add detection of Npcap to Windows installer
     
-    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.
+    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
     
-    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.
+    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 e710f24
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Aug 24 11:21:29 2015 +0200
+
+    win32: update the list of NdisMedium and NdisPhysicalMedium defines used by GTK UI
     
-    "To do" items are listed at the top of rtp_analysis.cpp.
+    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: Id503977f069bebc46cc68bc749f0c9cbf4d37bf6
-    Reviewed-on: https://code.wireshark.org/review/9650
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    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: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2e215db
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 15 23:46:51 2015 +0000
+commit edeaae0
+Author: Richard Sharpe <rsharpe@samba.org>
+Date:   Mon Aug 24 07:39:44 2015 -0700
 
-    Revert "On OS X, add the Qt -Wl,-rpath hack in CMake, as we do with autotools."
-    
-    This reverts commit 4a39706272a59d43530e038f8b20436e2c3052ce.
+    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.
     
-    At least in one quick check, CMake 2.8.12.2 added that already with Qt 5.5.0.
+    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: Iabf0e4aa0aa34b380f981f7d039fb3d95847041e
-    Reviewed-on: https://code.wireshark.org/review/9654
+    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 5523726
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 15 18:04:02 2015 -0400
+commit 4ba5225
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Aug 24 18:46:56 2015 -0700
 
-    WaveAgent - Use tvb_get_guint8 instead of tvb_get_ptr to walk a packet and protect against a really big tag value
+    Point to GitHub for the pcapng specification.
     
-    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: I33faa41e8b0f36ee49d29fe391feafd94d0a7e80
+    Reviewed-on: https://code.wireshark.org/review/10245
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0744e67
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Jul 15 16:04:21 2015 -0700
+commit 662f4b2
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Aug 24 20:26:30 2015 -0400
 
-    Check for a valid pointer when ignoring a frame.
+    Use one variable that was set but not previously used and delete another.
     
-    Change-Id: I1a4a6b3f729c818a68bee1b6b8de3778130252a4
-    Reviewed-on: https://code.wireshark.org/review/9652
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I6bd7a16e3ea97659a0007edfd9f90dbd2060e443
+    Reviewed-on: https://code.wireshark.org/review/10244
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 4a39706
+commit b16cca4
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 15 16:04:57 2015 -0700
+Date:   Mon Aug 24 15:13:59 2015 -0700
 
-    On OS X, add the Qt -Wl,-rpath hack in CMake, as we do with autotools.
+    Some beamforming stuff from 802.11ac.
+    
+    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: I281e1bf790b7eefbbd43a3406622262cfe8b36df
-    Reviewed-on: https://code.wireshark.org/review/9651
+    Change-Id: I90ba04e145ffb2b164810320e3510a5bed847ed4
+    Ping-Bug: 11464
+    Reviewed-on: https://code.wireshark.org/review/10243
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 85f8a99
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jul 9 16:36:49 2015 +0200
+commit 1874793
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 22:59:21 2015 +0200
 
-    ssl-utils: fix failing decryption for some RSA keys
+    Remove unused signal
     
-    Reported at
-    https://ask.wireshark.org/questions/43788/struggling-to-decrypt-ssl
+    Change-Id: Ic2d4057ee95849bc1b026663dae1430432ad9707
+    Reviewed-on: https://code.wireshark.org/review/10241
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 99dab82
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 22:19:01 2015 +0200
+
+    Use signal to close packet dialogs
     
-    "u" requirement is documented at
-    https://www.gnupg.org/documentation/manuals/gcrypt/RSA-key-parameters.html#RSA-key-parameters
+    Change-Id: I312f8de8de933e576b60d2b158e4c4f2d1147ef1
+    Reviewed-on: https://code.wireshark.org/review/10238
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit fbadcdd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 24 10:56:04 2015 -0700
+
+    Add notes about using CMake + Qt Creator.
     
-    Add regression test (key is generated manually with p and q swapped and
-    qInv recalculated).
+    Change-Id: Ib10cc0a407721d62b39628af858f14e749c94d22
+    Reviewed-on: https://code.wireshark.org/review/10237
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 75d9167
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 24 10:21:55 2015 +0200
+
+    Multicast Statistics (Qt Dialog): Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    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: Ie2802293576bf9edb28bccf7d464b5e687185096
+    Reviewed-on: https://code.wireshark.org/review/10223
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 79be831
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jul 9 15:48:09 2015 +0200
+commit 7f60878
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 24 09:01:09 2015 -0700
 
-    ssl-utils: remove unused, broken libgcrypt code
+    Add FOP 2.0 to the search list.
     
-    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.
+    Change-Id: Ifc462a69e28b875f05770c453b06689c69008c52
+    Reviewed-on: https://code.wireshark.org/review/10235
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit d7e3076
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 24 12:16:06 2015 +0100
+
+    IPv6 RPL: "cmprI" should be "cumprE"
     
-    While at it, expand the SSL_PRIVATE_KEY macro and remove its definition.
+    Bug: 10560
+    Change-Id: I7cf9fb8ad39d128ed375abb8703937be8e3795b3
+    Reviewed-on: https://code.wireshark.org/review/10228
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit bc0d8d1
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 22 19:20:25 2015 +0100
+
+    Remove space from field description for consistency
     
-    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: I74b0be1724d0754b7d1b724e177d44c4894d0e6b
+    Reviewed-on: https://code.wireshark.org/review/10198
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c8c8eef
+commit a5b5c5a
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Jul 13 09:47:21 2015 +0200
+Date:   Sun Aug 23 18:44:31 2015 +0200
 
-    zvt: handle multi-byte tags
+    fc: 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
+    bring up an expert info and exit
     
-    Change-Id: If10ecf97cde59e2be9ff5e3163073f6d14e6c61e
-    Reviewed-on: https://code.wireshark.org/review/9636
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    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 a41e8e6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Jul 14 23:23:15 2015 +0200
+commit 517f4d4
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 20 23:06:44 2015 +0200
 
-    Qt: fix detection of WinPcap / AirPcap
+    cigi: don't THROW() an exception from a dissector
     
-    Libraries must be loaded before calling get_runtime_version_info()
+    stop the dissection instead and bring up an expert info in the main function
     
-    Change-Id: Ic95ccde4ce80338b058a22a653736b663c517b38
-    Reviewed-on: https://code.wireshark.org/review/9637
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    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: Pascal Quantin <pascal.quantin@gmail.com>
+    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 7c0b8bd
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Aug 24 12:41:04 2015 +0200
 
-    Simply code for export of PDUs coming from heuristic dissectors
+    [Q.2931] Don't use BASE_EXT_STRING for a value_string, fixes the test
+    suite
     
-    Let's use the newly introduced find_heur_dissector_by_unique_short_name() function
+    ** (process:10080): WARNING **: Invalid value_string_ext ptr for: q2931.atm_identifier
     
-    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: Id4ec745629af7774e480e91fba01ed8da5aac1bd
+    Reviewed-on: https://code.wireshark.org/review/10227
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 52e2908
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 15 12:17:00 2015 +0200
+commit 079dd03
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 24 11:52:29 2015 +0200
 
-    Filter UDP packets on port 3389 when capturing from a Remote Desktop session
+    Fixed typo in hfinfo_remove_from_gpa_name_map
     
-    As reported in https://www.wireshark.org/lists/wireshark-dev/201507/msg00069.html
+    Change-Id: Ic80fbe9397e50c41fa01ef9147319dd2ac0c0b91
+    Reviewed-on: https://code.wireshark.org/review/10226
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit a2d8514
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Aug 23 19:02:23 2015 +0200
+
+    ip: fix ip.hdr_len filter value when the header length is too small
     
-    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
+    Eliminate proto_tree_add_text from some dissectors
     
-    There seem to be multiple definitions of an "lsa_String" depending on the DCE/RPC dissector, so change was made just in EventLog.
-    
-    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
-    
-    Make TURN-based TFTP heuristic dissector check for valid opcode and error code
-    before matching TURN payload content.
+    CBOR: get rid of INFINITY and NAN defines
     
-    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.
+    This triggers an "overflow in constant arithmetic" warning with MSVC2013
     
-    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.
+    Lua: remove unneeded todo comments
     
-    Move the rtp_sample_t definition to tap-rtp-common.c. Rename it to
-    rtpdump_info_t. Make rtp_write_sample static.
-    
-    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>
-
-commit 3a78901
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jul 13 00:54:17 2015 -0700
-
-    Rpathify references to Qt frameworks separately from references to libraries.
-    
-    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>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
 
-commit eeccdf3
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 21:35:26 2015 -0700
+commit 3703b4e
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 22 19:56:34 2015 +0100
 
-    Copy over the entire framework and then clean it up.
+    Fix ip_try_dissect() boolean return
     
-    That's easier than trying to carefully copy the relevant bits.
+    If dissector_try_heuristic() succeeds return TRUE and vice-versa.
     
-    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.
-    
-    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).
+    Remove some svn $Author$ lines that escaped previous cleanups.
+    git does keep of this in a much better way anyway.
     
-    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.
-    
-    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.
-    
-    Add a sectionMoved slot to handle column reordering.
+    [GTK] Fix crash in comparestat.c
     
-    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.
+    Selecting a row in the statistics table causes a Glib assertion failure.
     
-    Try to keep the user from removing all of the columns in both the packet
-    list and column preferences.
+    GLib:ERROR:ghash.c:373:g_hash_table_lookup_node: assertion failed: (hash_table->ref_count > 0)
     
-    Left as an exercise for the reader: The GTK+ UI also fails when you
-    remove all of the columns via the preferences:
+    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.
     
-      packet_list.c:377:packet_list_sort_column: assertion failed: (col)
-    
-    Bug: 11324
-    Change-Id: Id58cf98e42cbda9aa2fc370ea06b8bcc6098c8ca
-    Reviewed-on: https://code.wireshark.org/review/9591
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    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: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 494457d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 19:12:05 2015 -0700
+commit 0d61321
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Aug 14 21:13:51 2015 -0400
 
-    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.
+    Correct logic for finding shadow variables.
     
-    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.
-    
-    Change-Id: I134c2b1a32e168e82de67f0b674d17167481d69a
-    Reviewed-on: https://code.wireshark.org/review/9612
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ide03c3b92f70d5dad8d0dceca179ea6f3b9e1fd6
+    Reviewed-on: https://code.wireshark.org/review/10037
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 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 e920868
-Author: Anders Broman <a.broman58@gmail.com>
-Date:   Sun Jul 12 20:04:14 2015 +0000
+commit b0a8fa5
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 21 12:43:55 2015 +0200
 
-    Revert "[MSVC2015] TRy to fix Warnings turned errors."
-    
-    This reverts commit 8d78077d0d931c6afee6d0e27b5df7c5477e21e5.
-    
-    Reverted as requested.
+    Initialize extcap for pipes
     
-    Change-Id: I99461820d28215a52cc6bae6792f2892018d28b8
-    Reviewed-on: https://code.wireshark.org/review/9609
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ia731f281ee9af171c759d7f6f7c614c350cbb4e7
+    Reviewed-on: https://code.wireshark.org/review/10178
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 39a2d94
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Jul 12 12:56:05 2015 -0700
+commit 532070b
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 16 18:41:53 2015 +0100
 
-    Fixup packet list selection.
+    Add support for IPv6 stats tree statistics
     
-    Be less aggressive about resetting the packet list model so that we
-    retain our selection when (un)coloring packets or rebuilding columns.
+    Also add support for alphabetizing stat tree items as the addition of IPv6 stats tree makes it more obvious its needed.
     
-    Correctly enable a colorization menu item while we're here.
+    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 953cdd4
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sat Aug 22 08:33:27 2015 +0400
+
+    Print two reserved elements as reserved instead of skipping them
     
-    Change-Id: I8d1c8f26dbb8a814b8344b609695b77632006e4b
-    Reviewed-on: https://code.wireshark.org/review/9608
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ic91e07df4881dfff0f0dd1c4809903cbdee8ef60
+    Reviewed-on: https://code.wireshark.org/review/10190
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit a17bb6c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 12 12:11:34 2015 -0700
+commit c4fe712
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sat Aug 22 08:11:45 2015 +0400
 
-    Update a comment.
+    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: I38e42ec1ea86a0678333093795be707d6e68ab62
-    Reviewed-on: https://code.wireshark.org/review/9607
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I516c2a2f0c27fcf101671527d4e4f018e17d3025
+    Reviewed-on: https://code.wireshark.org/review/10189
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 0f45a13
+commit ee80be6
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jul 12 08:11:22 2015 -0700
+Date:   Fri Aug 21 17:12:39 2015 -0700
 
-    [Automatic update for 2015-07-12]
+    Add the display filter macros dialog.
     
-    Update manuf, services enterprise-numbers, translations, and other items.
+    Add some missing functionality to UatDialog.
     
-    Change-Id: Icf621f6bcde5736653771c3789772b692d5cdd43
-    Reviewed-on: https://code.wireshark.org/review/9605
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Remove what appears to be unused dfilter macro code.
+    
+    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 71190bc
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Jul 12 12:27:08 2015 +0200
+commit 97014f6
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Sat Aug 22 05:43:46 2015 +0400
 
-    megaco: replace THROW() with an expert info + return
+    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: Ib876ad4b0c6d700da1eec8c8512225c123ad14da
-    Reviewed-on: https://code.wireshark.org/review/9604
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I9ef0cd486d200a768329cfb758b87e20e3456663
+    Reviewed-on: https://code.wireshark.org/review/10188
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 8c2fc91
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jul 10 14:26:10 2015 +0200
+commit 74177d9
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 21 15:02:20 2015 -0700
 
-    VXLAN: Remove a (flag) subtree level
+    Statistics dialog fixups.
     
-    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>
+    Fix the "retap on show" behavior in TapParameterDialog. It was filling
+    in the tree when it shouldn't have.
+    
+    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: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit be7d295
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 11 17:33:26 2015 -0400
+commit a66a95c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 21 08:46:43 2015 -0700
 
-    Add "user presentable" and "unique string ids" to heuristic table entries.
+    Add packet comments to the properties dialog.
     
-    This allows better presentation of heuristic dissectors to the end user.
+    This pulls in missing functionality from the comment summary dialog.
     
-    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: 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 0caf061
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Tue Jul 7 11:30:44 2015 -0400
+commit 95c8b01
+Author: Bill Parker <wp02855@gmail.com>
+Date:   Fri Aug 21 15:24:41 2015 +0200
 
-    Lua: split up wslua files into class-based files
+    [echld common] Call to fcntl() missing a test for a return value < 0,
+    indicating failure.
     
-    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.
+    Bug: 11056
     
-    Change-Id: Ib495ec5c2a4df90495c0a05504856288a0b09213
-    Reviewed-on: https://code.wireshark.org/review/9579
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: I87aef31d874224f38226df1725cc29d13ad16b54
+    Reviewed-on: https://code.wireshark.org/review/10182
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ec1e099
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 11 14:33:31 2015 -0700
+commit d32c3da
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Fri Aug 21 11:59:34 2015 -0400
 
-    Note the Qt bugs about the broken .pc files.
+    Lua: check sscanf return value
     
-    Change-Id: I050caef2a20b0c6c567f810465a3bcfe40b04a11
-    Reviewed-on: https://code.wireshark.org/review/9603
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Wslua's Int64.fromhex() and UInt64.fromhex() need to check the sscanf return
+    value. Found by coverity (CID 1191368 &1191369).
+    
+    Change-Id: I67fba027e18341d429787515f94c794573dc41c2
+    Reviewed-on: https://code.wireshark.org/review/10183
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 0bcbb2c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 11 14:12:28 2015 -0700
+commit dd2a2d4
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 21 09:45:48 2015 -0700
 
-    Update to Qt 5.5.0, to fix context menu issues.
+    Multicast and wireless lan statistics fixups.
     
-    This requires still *more* .pc file fixes.
+    Make sure "-z multicast,stat[,filter]" and "-z wlan,stat[,filter]" work.
     
-    Change-Id: I74a385e272063b3342a29122c87331bc8191f7f5
-    Ping-Bug: 11355
-    Reviewed-on: https://code.wireshark.org/review/9601
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a68518f
-Author: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date:   Sat Jul 11 18:06:22 2015 +0200
-
-    terminate readlink result
+    Add some missing "-z" items to the man page.
     
-    The readlink function does not guarantee to nul-terminate its result string.
-    Therefore, it should be done in wsutil/filesystem.c.
+    Try to fix some MSVC++ warnings.
     
-    Change-Id: Id96533e825a302a1922ce9ac7ee47d5525ac9c39
-    Reviewed-on: https://code.wireshark.org/review/9597
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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: Gerald Combs <gerald@wireshark.org>
 
-commit e478267
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sat Jul 11 13:13:27 2015 -0400
+commit 69ec4a5
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 08:45:49 2015 +0100
 
-    Lua: fix docs and default base for ProtoField.framenum()
+    Add "ip.version" field to bogus IP for filter matching
     
-    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.
-    
-    Change-Id: I0ec867069c66dbb58399ac2db4652469bfb39152
-    Reviewed-on: https://code.wireshark.org/review/9599
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    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 080c27f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jul 9 09:27:37 2015 +0200
+commit f8712ae
+Author: Bill Parker <wp02855@gmail.com>
+Date:   Fri Aug 21 15:13:16 2015 +0200
 
-    simple_statistics_dialog(.h): fix parameter 'rtd_table/user_table' not found in the function declaration [-Wdocumentation]
+    [Kerberos] Call to 'fseek()' without a check for a return value < 0,
+    indicating failure.
     
-    Change-Id: Ie82d8528953169f1a95f985b36848176a45f8187
-    Reviewed-on: https://code.wireshark.org/review/9571
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 11056
+    
+    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: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c7dbc5a
-Author: Gerald Combs <gerald@zing.org>
-Date:   Fri Jul 10 18:42:21 2015 -0700
+commit 856bab6
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Wed Aug 19 10:42:59 2015 +1000
 
-    Set the font.
+    LWM: fix compilation without libgcrypt
     
-    Change-Id: I97abd504727ef71bb29969f0a7555e17eaa70561
-    Reviewed-on: https://code.wireshark.org/review/9596
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Add HAVE_LIBGCRYPT compilation guards.
+    Move gcrypt-related variables into the scope they're used.
+    
+    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 d564ea9
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jul 10 16:15:55 2015 -0700
+commit b5ca69b
+Author: Dave Rigby <daver@couchbase.com>
+Date:   Thu Aug 20 16:05:57 2015 +0100
 
-    Qt: Add Colorize Conversation menu items.
+    Couchbase: dissect sub-document commands
     
-    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.
+    Add support for dissecting Couchbase sub-document commands (those
+    which operate on a subset of a whole document).
     
-    Add StockIcon::colorIcon and use it to create filled square icons.
+    Example pcap file:
+      https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=couchbase_subdoc_multi.pcap
     
-    Change-Id: I2af9e26d025cdaf97482422bbb9440e28e18d1ac
-    Reviewed-on: https://code.wireshark.org/review/9595
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    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: 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.
-    
-    Change-Id: I053096551a18242062766d966a2f28da047d5761
-    Reviewed-on: https://code.wireshark.org/review/9592
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a1a2d50
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 9 21:09:48 2015 -0700
+commit d097968
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Aug 21 03:10:10 2015 +0100
 
-    Make .o files, not .cpp and .h files, depend on the ui_*.h files.
+    Make IPv6 extension header protocol names uniform and consistent with RFC 2460
     
-    That's one of the mechanisms the autotools documentation suggests using
-    to handle generated header files.
+    Example from RFC 2460 (page 7):
     
-    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).
+      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)
     
-    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.
-    
-    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>
+    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>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a63f841
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jul 10 20:52:17 2015 +0100
+commit 30ce20d
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Aug 21 13:54:53 2015 +0200
 
-    Netflow: Fix sequence analysis to work for different protocol versions
+    [Expert] Enhance error output to identify the duplicated field.
     
-    Change-Id: Iaf7cb50e88e81578f79f92a2387c29c71e0e1d9d
-    Reviewed-on: https://code.wireshark.org/review/9574
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Change-Id: Ie38f51e2fa0f846dbcfd7a19f29eac1bd07cffbc
+    Reviewed-on: https://code.wireshark.org/review/10179
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit aa839b3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Jul 10 14:38:50 2015 +0200
+commit f73e1c2
+Author: Peter Lemenkov <lemenkov@gmail.com>
+Date:   Thu Aug 13 18:13:45 2015 +0300
 
-    wslua_tree: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Allow redefining all ports for RADIUS
     
-    Change-Id: I2bbc4c0a76935367692a5fd382013cbd074754e0
-    Reviewed-on: https://code.wireshark.org/review/9588
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    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:
+    
+    ...
+    listen {
+            type = auth
+            ipaddr = *
+            port = 13812
+    }
+    listen {
+            type = acct
+            ipaddr = *
+            port = 13813
+    }
+    ...
+    
+    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.
+    
+    It was requested at least once to lift this limitation:
+    
+    * https://ask.wireshark.org/questions/2189/decode-multiple-ports-as-radius
+    
+    So let's fix it!
+    
+    With this commit it's possible to set a port ranges for RADIUS dissector
+    to handle. An example (default) configuration looks like (see
+    ~/.wireshark/preferences):
+    
+    radius.ports: 1645,1646,1700,1812,1813,3799
+    
+    Old "alternate_port" preference is marked as obsolete. It won't be shown
+    to a user but it will still be used if exists (remained from a previous
+    installations).
+    
+    *Ver. 2*:
+    Old alternate_port value is copied to the ports range, thus making
+    transition even more smooth.
+    
+    Change-Id: Ibdd6f4f9fa1e0ac186147cec380bbfc62d509b17
+    Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/10015
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 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 \91filter\92 [-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.
+    
+    Fix whitespace and replace tvb_captured_length with tvb_reported_length
     
-    Change-Id: I3db6ee3e6c5cb79b9cc31068930c9fe9c9d8aa7a
-    Reviewed-on: https://code.wireshark.org/review/9581
+    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"
-    
-    This reverts commit 89c24ee8e8086dc88042d9f048479487b342702e.
+    Link setargv.obj for Windows in CMake so mergecap works
     
-    Further investigation of unused functions required ....
+    Try it again.
     
-    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.
+    pcapng: Fixed copying if_filter_bpf_bytes
     
-       As part of this change,  the order of certain fixed_field
-       functions was changed to fix any forward references.
-    
-    Also:
-       Spelling
-       Whitespace
+    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 8a71867
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Wed Aug 19 21:47:50 2015 +0100
+
+    UDP jumbogram expert info fix
     
-    Change-Id: I9bb7e239086f9b65044929f2cb7e7f9d9b9adaee
-    Reviewed-on: https://code.wireshark.org/review/9563
-    Reviewed-by: Bill Meier <wmeier@newsguy.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: Michael Mann <mmann78@netscape.net>
 
-commit ccdd4be
-Author: Jean Thomas <jeanthomas@sierrawireless.com>
-Date:   Wed Jul 8 18:31:00 2015 +0200
+commit bc8b94d
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:57:25 2015 +0200
 
-    GSM A RR: fix GSM H/L bits management
+    file-pcapng: differentiate captured length and reported length when calling next dissector and catch bound errors
+    
+    Otherwise dissection will fail when analyzing a capture with a snap length set
     
-    Bug: 11347
-    Change-Id: Iec48d52fd1f9c0669a7ef0cd95bf403025d477ae
-    Reviewed-on: https://code.wireshark.org/review/9562
+    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 e0deadc
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Thu Jul 2 11:48:12 2015 +0200
+commit ff78d0a
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:54:47 2015 +0200
 
-    opcua dissector: fix display of service type in packet column
+    file-pcap: 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>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@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 4eca268
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Jul 7 16:18:00 2015 -0700
+commit 2046368
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Aug 19 21:48:46 2015 +0200
 
-    Add SimpleStatisticsDialog.
+    file-pcapng: fix dissection of options in blocks
     
-    To do:
-    - Refactor dynamic menu item placement.
+    - fix the loop logic
+    - flags in EPB include link-layer-dependent errors
     
-    Change-Id: I087de9f2fa3c2ff7dc08e5d54bc9c1b984fdd7b1
-    Reviewed-on: https://code.wireshark.org/review/9561
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Iae0b4869b556abbf3c14f3b865d0f23cee182c84
+    Reviewed-on: https://code.wireshark.org/review/10132
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit d3f71f9
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Jul 8 12:57:12 2015 +0100
+commit bc777f9
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 10:29:03 2015 +0200
 
-    nb_rtpmux: Add a port preference
-    
-    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
+    Added a missing break
     
-    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: Ia04a112d8df195e271dc11565750a6e28bd7f0c9
+    Reviewed-on: https://code.wireshark.org/review/10146
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit bd64be6
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Wed Jul 8 14:47:45 2015 +0100
+commit 950f1dd
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Wed Aug 19 15:38:10 2015 +0200
 
-    RANAP: if bindingid looks like port number, extract and show
+    IO Graphs: Don't show unchecked graphs in legend
     
-    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: I0a9c4d967ee03a0a8dfc93f87dbe38e4e3a0404c
+    Reviewed-on: https://code.wireshark.org/review/10128
+    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 75f4ff7
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 10:09:13 2015 +0200
 
-    Fix CMake install of lua scripts
+    Make empty filter valid in checkFilter
     
-    The CMake generation of all-manifest.nsh is missing the 3
-    lua scripts, init.lua, console.lua and dtd_gen.lua.
+    Change-Id: Ia5293a228a7044a4cd01b3b2f62f1d7a8f7747e2
+    Reviewed-on: https://code.wireshark.org/review/10145
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 29cd036
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Thu Aug 20 10:06:48 2015 +0200
+
+    Clear display filter when filterPackets with empty filter
     
-    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: Ie3f763d53f5c250bbc58e32490eb83bb2e076a62
+    Reviewed-on: https://code.wireshark.org/review/10144
+    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 3b5a1f2
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Wed Aug 19 23:29:13 2015 -0400
 
-    Duplicate CheckCCompilerFlag for CXX.
-    Correctly detect that XCode7Beta1 does not support -fno-delete-null-pointer-checks
-      by adding a new regex.
+    Link setargv.obj for Windows in CMake so mergecap works
     
-    Change-Id: I76e0b6bb72094e6e75dae9be97bc7ee8e7051792
-    Reviewed-on: https://code.wireshark.org/review/9552
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit d7f0118
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jul 7 22:17:11 2015 -0700
-
-    Put back closing } accidentally removed in previous commit.
+    Mergecap needs setargv.obj in order to get wildcard support. This is linked
+    in nmake but not cmake.
     
-    Change-Id: Ic02b0c86e55751a27d5d0417f4f5314def69e794
-    Reviewed-on: https://code.wireshark.org/review/9550
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 FunnelTextDialog, which implements the text_window, ProgDlg, menu,
-    and other routines. Add FunnelStringDialog, which implements dlg_new.
+    Add more debug infor for windows buildbot test suite failure
     
-    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.
+    Down the rabbit hole we go...
     
-    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.
+    file-pcapng: remove useless hf_pcapng_timestamp_data entry
     
-    Fewer magic hex numbers, more readability.
-    
-    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.
-    
-    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.
+    btsnoop: Missing break in switch (CID 1316606)
     
-    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.
-    
-    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).
+    Use MAC address documentation range in filter examples
     
-    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.
+    https://www.iana.org/assignments/ethernet-numbers/ethernet-numbers.xhtml
     
-    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
-
-    Add some comments.
-    
-    OK, where's NSS for the presumably-one-and-only user hiding for 11ac?
-    
-    Change-Id: I53eb216c5d209dc5bb46c1d0aca7f8a200161e3e
-    Reviewed-on: https://code.wireshark.org/review/9512
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit a7ac6cf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 5 19:05:52 2015 -0700
-
-    Stub out the US public safety band.
-    
-    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>
-
-commit 94eb30a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 5 19:02:51 2015 -0700
+commit d64ad1d
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Aug 16 12:37:11 2015 -0400
 
-    Add a comment.
+    capinfos: add more info about file and interfaces
     
-    Why, oh why, are channel numbers used for 802.11?
+    Add more information about the capture file, and about the interface
+    descriptions in it. Also remove long-unused g_options code.
     
-    Change-Id: Ie26987dfeaad2ce0ead0eef72339f966aadeeecd
-    Reviewed-on: https://code.wireshark.org/review/9510
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3539988
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sun Jul 5 14:56:45 2015 -0400
-
-    prefs: fix memory leak reading capture columns
-    
-    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>
+    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: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ef1f0c1
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Jul 5 16:31:40 2015 -0700
+commit 3268023
+Author: Andrew Chernyh <andrew.chernyh@gmail.com>
+Date:   Mon Jul 6 10:29:48 2015 +0600
 
-    Use space indentation consistently.
+    Added TDMoP protocol dissector
     
-    Change-Id: I1af52157a8c7383981c514d9dddea3b7186dbe6d
-    Reviewed-on: https://code.wireshark.org/review/9509
-    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 fbd81bf
-Author: Tyson Key <tyson.key@gmail.com>
-Date:   Sun Jul 5 18:53:23 2015 +0000
+commit d5caba6
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 17 20:07:58 2015 +0100
 
-    Associate the file-mp4 dissector with the audio/mp4 MIME type
+    [IPv6] Make "ip.version" field pretty(er)
     
-    Bug:11338
-    Change-Id: Ied463ea5ef65bcc657e09c0d5f7983cb4dcd581a
-    Reviewed-on: https://code.wireshark.org/review/9503
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I1e32f666118e36f48edcc1678d75db3ca3f62776
+    Reviewed-on: https://code.wireshark.org/review/10075
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 1aecd88
+commit a22bb87
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Jul 5 22:39:01 2015 +0200
+Date:   Mon Aug 17 13:27:53 2015 +0200
 
-    rtd_table.h: fix parameter 'rtd_stat_table' not found in the function declaration [-Wdocumentation]
+    Update .mailmap
     
-    Change-Id: Ie31efc352b5f51808aa9f3d1e6b00734ccc38bfe
-    Reviewed-on: https://code.wireshark.org/review/9507
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ib61ed614c3cfb6885d81a61d82b0974beba786f5
+    Reviewed-on: https://code.wireshark.org/review/10068
+    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 c32c1f0
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Tue Aug 18 18:51:32 2015 +0100
 
-    RPC: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    IPv6 Jumbogram expert info cleanup
     
-    Change-Id: Iea6529d8fb43d1cea723c92b3b348029c39c0c8d
-    Reviewed-on: https://code.wireshark.org/review/9506
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ic06e50a30330758d6ed0b1b1d9ba0d7f74929a9a
+    Reviewed-on: https://code.wireshark.org/review/10111
+    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 8352ff1
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 16 21:02:35 2015 +0100
 
-    80211 utils: free nl messages after use
+    Add IPv6 examples to capture/display filters
     
-    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.
+    Also use TEST-NET-1 for IPv4 examples.
     
-    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>
+    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 c00e469
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Sun Jul 5 12:47:15 2015 +0100
+commit fc1b48f
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Wed Aug 19 10:47:57 2015 +1000
 
-    Fix Windows CMake generated installer to include snmp mibs
+    DVBCI: fix typo in comment
     
-    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
-    
-    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: I0f6e57b7f16526e7c1b96fb8bd69c003c89b7f42
+    Reviewed-on: https://code.wireshark.org/review/10119
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 9b180e5
+commit 0e8cc9a
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jul 5 08:09:54 2015 -0700
+Date:   Wed Aug 12 14:09:35 2015 -0700
 
-    [Automatic update for 2015-07-05]
+    UDP multicast stream dialog.
     
-    Update manuf, services enterprise-numbers, translations, and other items.
+    Add the UDP multicast stream dialog. Abuse TapParameterDialog a bit more
+    so that we can edit parameters.
     
-    Change-Id: I7c644cb36af2a5c81efc4c22f1355b1a5e599b49
-    Reviewed-on: https://code.wireshark.org/review/9500
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 845998d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Jul 4 13:14:56 2015 -0700
-
-    Mark another function as printf-like.
+    Remove some unused struct members and an unused function.
     
-    Change-Id: I2aa13265da1efbf7edfe693c9b434940462ca237
-    Reviewed-on: https://code.wireshark.org/review/9497
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 59017a2
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sat Jul 4 12:28:53 2015 -0400
+commit 9a3d4e6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Aug 18 10:36:04 2015 -0700
 
-    diameter: convert some GArrays to epan wmem_arrays
+    Move an include guard.
     
-    Fixes ~30KB of memory leak on startup and a handful of "reachable" memory as
-    well.
+    Move an include guard to match our conventions (and make it easier
+    to spot).
     
-    Change-Id: Ia1c633b65fa282c7bbe9d3772dae58643ef15c0e
-    Reviewed-on: https://code.wireshark.org/review/9495
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I4bad61a0194219f69217713d051e0ff53ff5a76a
+    Reviewed-on: https://code.wireshark.org/review/10110
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6e62ad5
-Author: Evan Huus <eapache@gmail.com>
-Date:   Sat Jul 4 12:08:08 2015 -0400
+commit 2eaaffe
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 18 21:56:52 2015 +0200
 
-    scsi-osd: initialize the entire extra_data struct
+    simple_statistics_dialog(.h): fix parameter 'st_table' not found in the function declaration [-Wdocumentation]
     
-    Bug: 11337
-    Change-Id: If240b581c73e1cfb2aae1e85855170387677eb32
-    Reviewed-on: https://code.wireshark.org/review/9494
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I69814a05fa6ad65315e36fa75ae60634e934be5c
+    Reviewed-on: https://code.wireshark.org/review/10117
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4e0002e
-Author: Richard Sharpe <rsharpe@samba.org>
-Date:   Thu Jul 2 21:23:10 2015 -0700
+commit 6ed3e08
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Aug 18 21:10:13 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.
+    pcapng(file): fix duplicate break
     
-    Change-Id: Iaa031f5e97e94778ea7fa00fab24b7c0dfadd4de
-    Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
-    Reviewed-on: https://code.wireshark.org/review/9477
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ife7170c050402ab94d368acc6c233714be764824
+    Reviewed-on: https://code.wireshark.org/review/10114
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 4a2fe58
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Jul 4 11:02:51 2015 -0400
+commit 857b144
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 18 21:15:27 2015 +0200
 
-    Add "custom" dissector table tab to Internals->Dissector Tables dialog
+    Qt: Syntax check display filter when fields changed
     
-    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: I7179d7918e7958373806fb9627a36554ab4b9ddc
+    Reviewed-on: https://code.wireshark.org/review/10115
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit c5ec50e
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Jul 5 10:55:49 2015 +0200
+commit 4abec47
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 18 12:14:07 2015 -0700
 
-    Add missing C++ header
-    
-    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);
+    Clean up handling of time stamps.
     
-    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>
-
-commit ebae0c9
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jul 3 21:14:53 2015 -0400
-
-    store tcp/udp port names in epan scope
+    Use common code for all time stamps, so it's handled the same for the
+    Packet Block, Enhanced Packet Block, and Interface Statistics Block.
     
-    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.
+    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.
     
-    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.
+    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: I187460b769e28da3c6629abac1d9196727ae7dde
-    Reviewed-on: https://code.wireshark.org/review/9483
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I19b2c3227a3ca1e93ec653f279136aa18687581f
+    Reviewed-on: https://code.wireshark.org/review/10116
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit dd8311d
-Author: Hadriel Kaplan <hadrielk@yahoo.com>
-Date:   Sat Jul 4 01:12:56 2015 -0400
+commit ea7cf08
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Aug 18 11:51:36 2015 -0700
 
-    Lua: split init/cleanup routines
-    
-    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.
+    Cast away 64 -> 32 narrowing complaints.
     
-    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.
+    "secs" in an nstime_t is a time_t; cast the calculated seconds portion
+    to time_t.
     
-    Change-Id: I51a4d8bc02630a4d2db5408c37f7eb8f6e0ce88c
-    Reviewed-on: https://code.wireshark.org/review/9491
-    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
-    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
-    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Change-Id: Ieaad4c18bb21384a5781f50eadd3a537b414a369
+    Reviewed-on: https://code.wireshark.org/review/10113
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c6f4112
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 3 19:38:54 2015 -0700
+commit 7a096c3
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Aug 18 15:58:34 2015 +0200
 
-    Do error checking on simple_error_message_box() calls and fix errors.
+    Init values set (found by American Fuzzy Lop).
     
-    It's a printf-like routine, so give it the right declaration.  Fix
-    errors that this finds.
-    
-    Change-Id: I7e8c100ff9e16ba89743ce744cbf548aae705b77
-    Reviewed-on: https://code.wireshark.org/review/9487
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iddd2b4a0ceb409db1afb1a412339134634de631c
+    Reviewed-on: https://code.wireshark.org/review/10104
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit b8d96a4
+commit f49eb37
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Jul 3 19:31:28 2015 -0700
+Date:   Tue Aug 18 10:32:16 2015 -0700
 
-    Squelch a compiler warning.
-    
-    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.)
+    Update comment.
     
-    Change-Id: I6193a93684c0684c83357def3d76e0dbd808e29b
-    Reviewed-on: https://code.wireshark.org/review/9485
+    Change-Id: I51e14a280ba898a321455168ac8ded1853f55e64
+    Reviewed-on: https://code.wireshark.org/review/10109
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c60b8ea
-Author: Evan Huus <eapache@gmail.com>
-Date:   Fri Jul 3 21:49:14 2015 -0400
+commit 97f3c1b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Aug 18 19:18:07 2015 +0200
 
-    ansi_map: fix float literals missing f suffix
+    Qt: Reload widgets using prefs when reloading Lua plugins
     
-    Should fix OSX buildbots
+    Widgets using prefs must be closed because the prefs may have
+    been free'd when reloading Lua plugins.
     
-    Change-Id: I466d4cdc0c4b52a15cadb9b5d429561ca68cc913
-    Reviewed-on: https://code.wireshark.org/review/9484
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I4b79b7aff18d7923c77a9eb05acadc29b156edbf
+    Reviewed-on: https://code.wireshark.org/review/10108
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 3243b6f
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Jun 27 15:33:42 2015 -0700
+commit 8fcdcb9
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Aug 16 12:37:11 2015 -0400
 
-    asn1: split off cleanup routines
+    Improve file merging for mergecap and wireshark
     
-    General approach:
+    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:
     
-     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.
+     * Removed the '-T' encap type option from mergecap, as it's illogical for
+       mergecap and would complicate common merge code.
     
-    Some templates were modified as follows:
+     * 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.
     
-     - 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.
+     * Added a '-I' IDB merge mode option for mergecap, to control how IDBs are merged.
     
-    Files in epan/ were regenerated using cmake && make asn1
+     * Changed Wireshark's drag-and-drop merging to use PCAPNG instead of PCAP.
     
-    Change-Id: Idac16ebf0ec304e0c8becaab5d32904e56eb69b9
-    Reviewed-on: https://code.wireshark.org/review/9136
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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 7b33634
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jun 30 01:11:10 2015 +0200
+commit a3c175a
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Aug 18 16:47:08 2015 +0200
 
-    plugins: add cleanup routines
+    Add casts to passify buildboot.
     
-    Destroy the reassembly tables on exit, fix memleak in profinet
-    dissector.
-    
-    Change-Id: Id34dbfde42fe715513997452f87cd4fdc328e294
-    Reviewed-on: https://code.wireshark.org/review/9229
-    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I8aa4695f1f8dfdfc5bfcd4fb4f36e1b332581d5a
+    Reviewed-on: https://code.wireshark.org/review/10106
+    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 db87e62
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Aug 18 16:29:19 2015 +0200
 
-    ssl,dtls: split init/cleanup routines
+    pcap: add init value.
     
-    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.
+    Found compiling with gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04).
     
-    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: I21bd3a5ab3365f0065c919aba7d6bd00b878d041
+    Reviewed-on: https://code.wireshark.org/review/10105
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit ba9aa30
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 15:15:07 2015 +0200
+commit da6f48d
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Tue Aug 18 15:34:53 2015 +0200
 
-    Split more init routines into init/cleanup functions
+    Fix typo in makefile
     
-    This patch is partially automatically generated, but are modified
-    manually. In particular, assignments and function calls have been
-    audited.
+    Typo:
+    file.pcapng.c -> file-pcapng.c
     
-    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.
-    
-    The isakmp dissector is modified to use g_hash_table_new_full for
-    destruction of its keys and values.
-    
-    Fix a memleak in ipsec dissector when libgcrypt is not enabled.
+    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 22364bd
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Feb 15 19:05:44 2014 +0100
+
+    File-format: BTSNOOP: Add option to dissect next layers
     
-    Generated using
-    https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=3c6128ee266024d164650955f93c7740484abd68
-    (with AUDIT = True).
+    Show next layers of each packet.
     
-    Change-Id: I3fd910bdee663842ac0196334fe0189b67e251b0
-    Reviewed-on: https://code.wireshark.org/review/9225
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-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>
+    Change-Id: I8c56eab969fef9a0a712b479dc2cdef6cc1578ae
+    Reviewed-on: https://code.wireshark.org/review/221
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7ce77c6
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 07:35:00 2015 -0700
+commit dd57c6b
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Fri Jun 26 15:40:22 2015 +0200
 
-    Split four more init routines into init/cleanup
+    File-format: Add PCAP and PCAPNG dissectors
     
-    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.
+    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: I61f5e215c9fa72a6785fb48eaa2d50c1975d7483
-    Reviewed-on: https://code.wireshark.org/review/9227
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I833b2464d11864f170923dc989a1925d3d217943
+    Reviewed-on: https://code.wireshark.org/review/10089
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f5340b2
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 16:10:51 2015 -0700
+commit c05df99
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 17 20:34:47 2015 -0400
 
-    Split init routine into init/cleanup for more dissectors
+    Add udp_dissect_pdus.
     
-    This patch converts some dissectors using g_hash_table_foreach_remove.
+    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.
     
-     - 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.
+    Used DNP3 as a guinea pig since "multiple PDU support" over UDP was just added.
     
-    Change-Id: I455e7f0ad4e47e70dae05af7233fdcdebf583f9f
-    Reviewed-on: https://code.wireshark.org/review/9224
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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 126e02c
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 16:02:45 2015 -0700
+commit db5b786
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Jun 6 19:37:20 2015 +0200
 
-    Call reassembly_table_destroy and move g_hash_table_destroy
+    Bluetooth: Update Assign Numbers
     
-    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.
+    +18 ATT attributes to be implemented (IPS 1.0 - 19 May 2015, etc.)
     
-    If reassembly_table_init is found, a reassembly_table_destroy call is
-    prepended to the cleanup function as well.
+    Change-Id: Ib30ea20fe9b32a4be842f01ad5b8e8ee081a14ff
+    Reviewed-on: https://code.wireshark.org/review/10095
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit a50a49e
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Thu Jan 22 08:27:40 2015 +0100
+
+    Bluetooth: ATT: Add some remaining attributes
     
-    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).
+    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).
     
-    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.
-    
-    Other files that needed special attention due to the use of
-    register_postseq_cleanup_routine:
-    
-     - 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.
-    
-    Change-Id: I95a72b3df2978b2c13fefff6bd6821442193d0ed
-    Reviewed-on: https://code.wireshark.org/review/9223
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Iee5cde4673b62f93084923a592b11824c0683605
+    Reviewed-on: https://code.wireshark.org/review/10094
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 80f7ee0
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 13:06:31 2015 +0200
+commit df17ff3
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 17 13:18:30 2015 +0200
 
-    Call reassembly_table_destroy for some dissectors
+    Qt: Fix use-after-free pattern
     
-    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).
+    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.
     
-    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).
-    
-    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: I64aedf7189877247282b30b0e0f83757be6199e7
-    Reviewed-on: https://code.wireshark.org/review/9222
-    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 750babc
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jul 2 17:46:27 2015 -0400
+commit 9e72779
+Author: Pascal Artho <pascalartho@gmail.com>
+Date:   Tue Aug 18 08:43:06 2015 +0200
 
-    rpc: use direct hashing rather than malloced ints
+    Preparation Host Flows: Dissector Packet ICMP and ICMPv6
     
-    Equivalent but saves some allocations and is slightly simpler.
+    see https://code.wireshark.org/review/#/c/9976/
     
-    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: Ic301db4deea1a02b9e08c123b3e21e70817a2c85
+    Reviewed-on: https://code.wireshark.org/review/10097
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d52837d
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Wed Jun 24 01:54:19 2015 +0200
+commit 318c3a5
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Jul 22 17:38:51 2015 +0200
 
-    packet: add cleanup routines support
+    Qt: Add another C++ missing header: <algorithm> for std::sort()
     
-    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.
+    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);
     
-    After this change, "init" routines are not called anymore when
-    closing files. Further changes should split init routines to
-    cleanup routines as needed.
-    
-    Change-Id: Ib0b2cef6dd9c16905259063ac2c2fdfb7e066be6
-    Reviewed-on: https://code.wireshark.org/review/9135
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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 fdb8502
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Jun 5 13:17:13 2015 -0700
+commit 0375244
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Jul 18 18:25:36 2015 +0200
 
-    Add ServiceResponseTimeDialog.
-    
-    Add ServiceResponseTimeDialog as a subclass of TapParameterDialog,
-    similar to StatsTreeDialog. Add initial plumbing for statistics menu
-    items and command line invocation.
+    Qt/Minimap: Fix for Qt < 4.8
     
-    Don't append "..." to menu item names. Don't add menu icons. In each
-    case this avoids repetitive UI clutter.
+    I hope it is quite right solution.
     
-    Change-Id: I463b95c93090160bb81d2e80b16aad389dc0bd6c
-    Reviewed-on: https://code.wireshark.org/review/8864
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-    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 7fdc534
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jun 24 20:46:42 2015 -0400
+commit e25562b
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Jul 20 11:09:06 2015 -0400
 
-    Convert BOOTP/DHCP tap stats to new "generic stat API".
+    Pcapng: clean up Section Header Block handling
     
-    Change-Id: I0edc3909516452e6497a050b4617f9aafcea2688
-    Reviewed-on: https://code.wireshark.org/review/9112
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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 a8ff1e2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Tue Jun 23 08:53:17 2015 -0400
+commit 4048ca0
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 13 23:00:29 2015 +0200
 
-    Create very basic "generic" stat tap API to create a "GUI" independent table.
+    rewrite the H1 dissector
     
-    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.
+    * 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
     
-    Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt)
-    
-    Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab
-    Reviewed-on: https://code.wireshark.org/review/9110
+    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 09ea473
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jul 3 22:16:51 2015 +0100
+commit acc0c14
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Aug 17 23:06:21 2015 -0400
 
-    bootp: try to fix OSX builtbot
+    Eliminate proto_tree_add_text from XMPP dissectors.
     
-    Change-Id: I0204b6c947e302a6f38b43593e19c6b816a180a4
-    Reviewed-on: https://code.wireshark.org/review/9482
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    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 ecc29ee
-Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
-Date:   Fri Jul 3 18:28:22 2015 +0100
+commit 8fd7197
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Aug 17 23:06:50 2015 -0400
 
-    DHCP: Lookup OUI for TR111 suboption.  Also add Ubiquisys OUI to oui_vals.
+    Lua: add FT_PROTOCOL as a ProtoField type
     
-    Change-Id: I49b833ee4df01d37cfabb11fd177c00f34f41eb4
-    Reviewed-on: https://code.wireshark.org/review/9481
-    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    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: Martin Mathieson <martin.r.mathieson@googlemail.com>
-
-commit bd6065f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Fri Jul 3 10:53:51 2015 -0400
-
-    [smb2] Update some comments
-    
-    Change-Id: I95dc8743b6db579eb197bd64ab2f26cf43ebc308
-    Reviewed-on: https://code.wireshark.org/review/9480
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 363511c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 19:51:22 2015 -0700
+commit 300bb98
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Aug 17 16:50:39 2015 -0400
 
-    Move some frame control field #defines to a header and use them elsewhere.
+    Install GTK3 too.
     
-    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.
+    It was in the list of packages but not in the final command line.
     
-    Change-Id: I893cc50e546af67c910755357cefd86c39a1c783
-    Reviewed-on: https://code.wireshark.org/review/9476
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I361e660cc4ac91121314a3f8a7388b48fb2c61b7
+    Reviewed-on: https://code.wireshark.org/review/10081
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit df5a315
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 16:17:20 2015 -0700
+commit c57f585
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Aug 17 10:47:46 2015 -0700
 
-    Fix address resolution for columns.
+    Fixup tap listener registration.
     
-    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.
+    Make sure we run make-tap-reg.py on files that register tap
+    listeners.  Make sure Qt-specific registration routines start with
+    register_tap_listener_qt_.
     
-    Change-Id: Id09bc412adf5d2752155650a14a77c5378af2e42
-    Reviewed-on: https://code.wireshark.org/review/9475
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    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 ed21afa
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 2 22:57:34 2015 +0200
+commit 41cb3bd
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 13 22:44:29 2015 +0200
 
-    LLDP: fix dissection of Power Class field
+    h1: remove if (tree) checks, indent according to the modelines
     
-    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>
-    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 bcf7533
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Apr 3 09:56:18 2015 -0400
+commit c78d7c8
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Thu Aug 13 22:32:43 2015 +0200
 
-    Add proper "Decode As" mechanism for NFS file handles instead of preference.
+    h1: don't THROW() an exception from a dissector
     
-    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>
+    leaving the parsing loop should be enough in this case...
+    
+    Change-Id: Ic250961aeb4d3cfcd74ee8caacb59657c32444de
+    Reviewed-on: https://code.wireshark.org/review/10078
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 7151029
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 2 19:57:52 2015 +0200
+commit ec1d25d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 17 22:00:57 2015 +0200
 
-    PEEKREMOTE: ensure to initialize mandatory fields in info_11ac structure
+    Qt: Avoid double call to toUtf8()
     
-    Bug: 11326
-    Change-Id: I5a438bda7448f6b6b9959bdc03b0252b3cf22697
-    Reviewed-on: https://code.wireshark.org/review/9469
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I4d31063b4aa37e4b0a68b5dbc17be22ef2cd151a
+    Reviewed-on: https://code.wireshark.org/review/10077
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit ccd552a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 12:03:42 2015 -0700
+commit 68c5172
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Aug 17 21:39:41 2015 +0200
 
-    Remove more unnecessary null checks.
+    Qt: Always rebuild columns when fields changed
     
-    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.
+    The columns must be recreated even if no capture file is loaded
+    because custom columns may have reference to deregistered fields.
     
-    Should fix CIDs 1306908 and 1306911.
-    
-    Change-Id: Ie25de02f36bda9a9ae25ced034e758fc7f745681
-    Reviewed-on: https://code.wireshark.org/review/9472
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I4ed7345b3200e5af211695f1a6511ee229d5f13c
+    Reviewed-on: https://code.wireshark.org/review/10076
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 7e461a9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 11:56:19 2015 -0700
+commit 0368b82
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 12 15:11:39 2015 -0700
 
-    Remove check for null bluetooth_data.
-    
-    It's guaranteed to be non-null at that point. as noted by Coverity.
-    
-    Should fix CID 1306904.
+    Improve multicast address checking.
     
-    Fix indentation while we're at it.
+    Check for IPv4 and IPv6 multicast addresses. We might have captured on
+    an "any" interface, or on a PPP link, or used some other method that
+    doesn't result in dl_dst.type == AT_ETHER.
     
-    Change-Id: I414844e9b6f9f01e215f42ba087a56b0544d289a
-    Reviewed-on: https://code.wireshark.org/review/9471
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I18b0597fd432e4cec8c388a3c7d2d18ac4da0fad
+    Reviewed-on: https://code.wireshark.org/review/10009
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 90af3de
-Author: anilkumar911 <anilkumar911@gmail.com>
-Date:   Mon Jun 29 16:26:56 2015 +0530
+commit 821ea20
+Author: Selvamegala <sselvamegala@gmail.com>
+Date:   Sat Aug 8 20:35:30 2015 -0400
 
-    Interpret reserved fields netscaler header.
+    Add Decryption support for Lwmesh
     
-    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>
+    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 622be70
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Jul 2 11:25:59 2015 -0700
-
-    Zero out the nss array when we don't have the 802.11ac information we need.
-    
-    Change-Id: I576be8c1a1badf6befe90a226f83e8d03f8326a7
-    Reviewed-on: https://code.wireshark.org/review/9470
-    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 b660fd4
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Mon Aug 17 11:12:12 2015 -0400
 
-    ixveriwave: fix what seems to be a copy/paste error
+    Pcapng: set interface description's tsprecision when reading file
     
-    Change-Id: I79fc9b11fcdd54e0644d01b34a7f37644c85ad0f
-    Reviewed-on: https://code.wireshark.org/review/9468
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 11447
+    Change-Id: I5fe14616ed6e86e0bfe02c58cc9fb31e43bc23ef
+    Reviewed-on: https://code.wireshark.org/review/10071
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit cc12a6a
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 2 19:02:11 2015 +0200
+commit 2eec7fe
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Aug 17 13:35:40 2015 +0200
 
-    RPC: do not add a protocol without dissection function to the dissector table
+    BPDU: Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
     
-    This seems to be a typo
-    
-    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>
+    Change-Id: I91cc96f92ae2e6b07144120d70f8db5b7ad45fce
+    Reviewed-on: https://code.wireshark.org/review/10070
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9421af3
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jul 2 12:19:02 2015 +0200
+commit 77193ef
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Mon Aug 17 06:00:27 2015 +0100
 
-    Try to fix: warning C6244: Local declaration of 'airpcap_if_list' hides
-    previous declaration.
+    dissect_ip_heur(): Remove TODO (done)
     
-    Change-Id: Id0c3b74ac52c427d9c1efdf749dc410bc5bb450f
-    Reviewed-on: https://code.wireshark.org/review/9460
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I0c36179b63f5d60037de80badfea352c903c2525
+    Reviewed-on: https://code.wireshark.org/review/10065
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 523ce15
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jul 2 10:48:58 2015 +0200
+commit 9a6e36d
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Aug 16 20:06:50 2015 -0400
 
-    Do not try to display a value_string for FT_FRAMENUM type
+    Remove proto_tree_add_text from packet-xml.c
     
-    The hfinfo->strings pointer is used to store a ft_framenum_type_t
+    Required introducing packet_info* to xml_frame_t structure.
     
-    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>
+    Change-Id: Ie777fe3bc8c7ea052d3441dd31e0631ce47324cb
+    Reviewed-on: https://code.wireshark.org/review/10063
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit dcd7368
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 2 07:32:52 2015 -0400
+commit af62264
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 13 16:08:18 2015 +0200
 
-    Update Debian symbols for recent packet API additions.
+    DNP3: add support for udp multi frame packets.
     
-    Change-Id: Ib6e5a48fa0b0802c920e68d3dc7d62362818d36b
-    Reviewed-on: https://code.wireshark.org/review/9465
+    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 8b7f5f7
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jul 2 13:19:07 2015 +0200
+commit 2ba0ea3
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Aug 16 12:33:31 2015 -0700
 
-    Update libwireshark0.symbols
+    Fix the conversion of milliseconds to seconds and nanoseconds.
     
-    Change-Id: I04cdba9633d3fc131ecd9dc218bc6dd458378a35
-    Reviewed-on: https://code.wireshark.org/review/9464
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 88302f2
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Jul 2 13:02:12 2015 +0200
-
-    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
+    1 millisecond = 1000000 nanoseconds, not 1000 nanoseconds, and
+    nstime->nsecs is nanoseconds, not microseconds.
     
-    Change-Id: Ief1b64009891de6885c2c9a6cb0e290752de889f
-    Reviewed-on: https://code.wireshark.org/review/9463
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I6925ff80f6443015f83ca00bad2a347d10eadd7c
+    Reviewed-on: https://code.wireshark.org/review/10060
+    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 8b8d378
+Author: Petr Gotthard <petr.gotthard@honeywell.com>
+Date:   Sun Aug 16 16:50:52 2015 +0200
 
-    opcua dissector: Add DefaultXml encoding IDs
+    AMQP 1.0: Fix OSX build errors
     
-    Currently only DefaultBinary encoding IDs can be displayed, this commit adds the DefaultXml encoding IDs
+    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: I19f3693d3aa03451655058770383222c3828b570
-    Reviewed-on: https://code.wireshark.org/review/9442
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ic1c19edf10432dccb5fc4f3ea07defd45b9eef17
+    Reviewed-on: https://code.wireshark.org/review/10054
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 7d1a86d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jul 2 00:02:16 2015 -0400
+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
 
-    Have RPC dissector use real dissector tables for its subdissectors instead of a "homegrown" method.
+    Fix IP Destinations stats tree
     
-    Change-Id: I06d7d4e9747ed8593cf40506cae3a09ae237846b
-    Reviewed-on: https://code.wireshark.org/review/9456
+    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>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit cc7dc03
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 1 23:56:54 2015 -0400
+commit c643cbf
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sat Aug 15 17:05:17 2015 -0700
 
-    Add support for a "custom" dissector table.  This allows for a "custom" (not UINT or string) key to register dissector handles.
+    Run abicheck commands at compile time.
     
-    This was designed for RPC dissectors, but probably has use elsewhere.
-    
-    Change-Id: I1bca6b50ba312129a0c4fad5cc3c18cd9297c217
-    Reviewed-on: https://code.wireshark.org/review/9455
-    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
-
-    Have RPC program hash table use native gtk hash functions.
+    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: Ie3c6daf69a1ac155ac09794a5ec87c89bbf0607d
-    Reviewed-on: https://code.wireshark.org/review/9454
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I6e4d691e24c73ea05d638a0f897f570541c84e38
+    Reviewed-on: https://code.wireshark.org/review/10052
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit b68a0ed
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Jul 1 07:33:02 2015 -0400
+commit 8d1a549
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Aug 16 08:10:40 2015 -0700
 
-    Replace RPC "dissect_function_t" function signature with "new style" dissector function signature.
+    [Automatic update for 2015-08-16]
     
-    This paves the way for using dissector tables.
+    Update manuf, services enterprise-numbers, translations, and other items.
     
-    Change-Id: I88ac165ef9aa5bf5c05e1115f7321e18e734d683
-    Reviewed-on: https://code.wireshark.org/review/9453
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Idb8a2cff075a1ffe5e3cd1d6f4d3fb1b6c357cdb
+    Reviewed-on: https://code.wireshark.org/review/10055
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 9d8b810
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Jun 1 07:56:17 2015 +0200
+commit b1d33db
+Author: Petr Gotthard <petr.gotthard@honeywell.com>
+Date:   Sat Jul 4 01:19:02 2015 +0200
 
-    Lemon: Update lemon tools
+    AMQP 1.0: Refactor to fix parsing of timestamps
     
-    Update from SQLite trunk (19 April 2015)
+    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()
     
-    Add include <config.h>
+    (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.
     
-    Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_)
+    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.
     
-    Fix implicit conversion loses integer precision
+    (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
     
-    Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]
+    I propose to make this mechanism less table-driven (more explicit and more
+    flexible) and allow all alternates permitted by the standard.
     
-    Fix function declaration isn’t a prototype [-Wstrict-prototypes]
+    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
     
-    Fix warning: old-style function definition [-Wold-style-definition]
+    Change-Id: Id5e13df24409267c405cdd05479610a8ba898289
+    Reviewed-on: https://code.wireshark.org/review/10047
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 2e2129a
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Aug 15 09:39:05 2015 -0400
+
+    Conversion of random proto_tree_add_text calls.
     
-    Fix trailing whitespace
+    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 8b45727
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 11:34:46 2015 -0700
+
+    Un-reference actions after adding them to an action group.
     
-    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
+    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.
     
-    Fix -Wmissing-prototypes Remove unused function (acttab_free)
+    Also, rename "menu_item" to "menu_action", to indicate that it's an action.
     
-    Add basename the filename with only filename (no path...)
+    Change-Id: I54543dcc2e6c3b341a9f584fe1b6099a134771b3
+    Reviewed-on: https://code.wireshark.org/review/10049
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 1b46738
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 11:20:36 2015 -0700
+
+    Do the "plugin" menu stuff in one pass.
     
-    Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value
+    Also, use g_strconcat() in other places where we prepend / to action
+    names.
     
-    Add "new" version of lempar.c (3 November 2009).
+    Hopefully, this will make it easier to find common code between all the
+    N different places where we add menus and menu items.
     
-    LEMPAR: fix trailing whitespace
+    Change-Id: Iee876866730cada64428df17f1f3c4552cc3ac93
+    Reviewed-on: https://code.wireshark.org/review/10048
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit c222719
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 10:49:51 2015 -0700
+
+    Fix creation of menu actions in ws_menubar_create_action_group().
     
-    LEMPAR: fix -Wunused-parameter
+    Action names are expected to begin with /, so prepend a /.
     
-    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>
+    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: Ic45412399078796359649cc876d2c8bfc9a790c6
+    Reviewed-on: https://code.wireshark.org/review/10046
+    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 88f334b
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 15 19:31:51 2015 +0200
 
-    opcua dissector: Fix display of status code in error message
-    
-    Instead of just displaying the hex representation, use parseStatusCode which adds the textual representation of the status code
+    Fixed a comment in cleanup_dissection
     
-    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: I445e09803023d1a22a663ba0501c013f113b5bfe
+    Reviewed-on: https://code.wireshark.org/review/10045
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit b6c63e2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Jul 2 04:42:06 2015 +0000
+commit 5f13933
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Sat Aug 15 19:25:13 2015 +0200
 
-    Revert "SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error."
+    Lua: Free true_false_string values at reload
     
-    This reverts commit b591f07273f4e055a286ca36b6fda5da99952b5d.
+    Change-Id: I8ab194bf094e82f08ddafb0a1451aec42989b93d
+    Reviewed-on: https://code.wireshark.org/review/10044
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 0a16350
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 15 17:55:27 2015 +0100
+
+    Add a newline for readability
     
-    Change-Id: I73e7b6a8ea37b1d5869e785633b74c89d7476b54
-    Reviewed-on: https://code.wireshark.org/review/9457
+    Change-Id: I7dbfa8f82454bd93ca5a66f22c29982923803918
+    Reviewed-on: https://code.wireshark.org/review/10043
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit b591f07
-Author: cturney <cturney@charter.net>
-Date:   Wed Jul 1 16:07:29 2015 -0400
+commit 2bc6f01
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Aug 15 09:26:45 2015 -0700
 
-    SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error.
+    *More* issues.
     
-    In value string table "smb2_ioctl_vals[]" of packet-smb2.c
-    
-    {0x0011C017, "FSCTL_PIPE_TRANSCEIVE" } was placed before
-    {0x00110018, "FSCTL_PIPE_WAIT"}
+    Change-Id: Ib415582f4bf2529c412bed329b3ee7daccde29b0
+    Reviewed-on: https://code.wireshark.org/review/10042
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 7f38b65
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Aug 9 08:03:21 2015 -0400
+
+    Don't clear the tcp_analysis if a conversation is not provided to get_tcp_conversation_data().
     
-    which causes "Extended value string 'smb2_ioctl_vals[]' forced to fall back
-    to linear search: entry , value 0x00110018 < previous entry, value
-    0x0011C017"
+    Callers may need to know information like retransmissions, etc which will be lost.
     
-    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: I3f8b6b0aeb308701eb34ae6f6f735af6995ed441
+    Reviewed-on: https://code.wireshark.org/review/9940
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a66714b
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Thu Jul 2 05:51:20 2015 +0200
+commit 85e2018
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sat Aug 15 08:29:51 2015 +0100
 
-    Fix Buffer overrun while writing to 'airpcap_dir_utf16':  the writable
-    size is '520' bytes, but '1042' bytes might be written.
+    udp: fix minimum jumbo length
     
-    Change-Id: Ic88bc977011eff9ae3c2a4a5ba717e78dbb1171c
-    Reviewed-on: https://code.wireshark.org/review/9452
-    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 ae5172f
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Thu Jul 2 05:41:45 2015 +0200
+commit 85d2eef
+Author: Evan Huus <eapache@gmail.com>
+Date:   Tue Aug 11 18:35:45 2015 -0400
 
-    Try to fix warning C6340: Mismatch on sign: 'short' passed as _Param_(2) when some
-    unsigned type is required in call to 'printf'.
+    btatt: guard against incomplete reassembly
     
-    Change-Id: I3076454502e1c98ac225d33d520be5bbe5172c2a
-    Reviewed-on: https://code.wireshark.org/review/9451
+    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.
+    
+    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 fa6fb76
-Author: Patrick <patrick.servello@gmail.com>
-Date:   Wed Jul 1 23:30:21 2015 +0100
+commit 677d4d6
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Sun Aug 9 23:13:06 2015 +0100
 
-    fixed spelling errors in Omron FINS packet dissector
+    Add IPv6 Jumbogram support (RFC 2675)
     
-    
-    Change-Id: I7cce1769d3e3c2c70d18e247b1e1040b05715c20
-    Reviewed-on: https://code.wireshark.org/review/9448
+    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 4a8f0e1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 1 23:48:29 2015 +0200
+commit 8282540
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Wed Aug 12 09:01:45 2015 -0400
 
-    PMPROXY: avoid doing an invalid memory access when no token was found
+    Eliminate proto_tree_add_text from GSM dissectors.
     
-    Bug: 11320
-    Change-Id: Ie1fd3f1060e13cf742923aadebe375da4389422a
-    Reviewed-on: https://code.wireshark.org/review/9447
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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 c445570
+commit 8368f3b
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 1 13:11:20 2015 -0700
+Date:   Fri Aug 14 20:54:22 2015 -0700
 
-    Give instructions for installin Chcocolatey's Win flex-bison.
+    Update the previously-added comment.
+    
+    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 a typo ("and and") while we're at it.
+    I'm not sure whether the right thing happens on Windows.
     
-    Change-Id: Ib68bbdf0b358f56b36cf53906f105c5ee6493ec4
-    Reviewed-on: https://code.wireshark.org/review/9446
+    Change-Id: I1e4c0d510f31f68d574c4d4cf20524666382930f
+    Reviewed-on: https://code.wireshark.org/review/10039
     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
+commit 463caf8
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 14 18:49:17 2015 -0700
 
-    NAS EPS: upgrade dissector to v12.9.0
+    Discuss alternatives to polling all the recent files every 2 seconds.
     
-    Change-Id: Ic1fa22dee21b71b523ba5fcfc1ea1bf4c8029e6f
-    Reviewed-on: https://code.wireshark.org/review/9445
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Somebody asked about repeated SMB traffic when running the Qt Wireshark:
+    
+    https://ask.wireshark.org/questions/45036/permanent-smb2-traffic-with-1997
+    
+    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: I3a1d0110fedcdb442ed09c16dab4bf0cb06ca331
+    Reviewed-on: https://code.wireshark.org/review/10038
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5d8cb03
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jul 1 21:14:59 2015 +0200
+commit 6137197
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 14 17:19:37 2015 -0700
 
-    3GPP NAS: upgrade dissector to v12.10.0
+    Fix for the current wireshark.desktop.
     
-    Change-Id: Ia89e49d098f86450245c73c4d06a4359a25e3d53
-    Reviewed-on: https://code.wireshark.org/review/9444
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    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: I4e59026b5c4f26d02e4a96686e339f8d54bdcd1e
+    Reviewed-on: https://code.wireshark.org/review/10035
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b475b0e
+commit 0ddae1b
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Jul 1 11:12:36 2015 -0700
+Date:   Fri Aug 14 16:19:13 2015 -0700
 
-    Sort smb2_ioctl_vals[] numerically.
+    Put it in the Qt category, not the GTK category.
     
-    Change-Id: I2d5fd1c640d3ac6fa60d84f2b8080eb7866b2641
-    Reviewed-on: https://code.wireshark.org/review/9443
+    The default binary, "wireshark", is now a Qt binary; "wireshark-gtk" is
+    the GTK+ one.
+    
+    Change-Id: Ibfec5d796a9796c2588c4305b18dc4506a435228
+    Reviewed-on: https://code.wireshark.org/review/10034
     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 4c6da64
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Fri Aug 14 10:44:11 2015 -0400
 
-    add WERR_INVALID_STATE & WERR_TIMEOUT
+    Ident the merge.c/h files by 4 spaces
     
-    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>
+    Using 2 spaces for indent is way past its prime.
+    
+    Change-Id: I80caf89f15e576f9aeb25754576a9f18215ccb3c
+    Reviewed-on: https://code.wireshark.org/review/10032
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit fa2c41f
-Author: Gregor Beck <gbeck@sernet.de>
-Date:   Tue Oct 2 10:22:49 2012 +0200
+commit 46d6e8c
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 14:48:49 2015 +0200
 
-    add function guid_cmp() to compare guids
+    Added some missing breaks
     
-    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: I3b2f25832ca878ec3e7f9e4dcce258dc870fc5ad
+    Reviewed-on: https://code.wireshark.org/review/10031
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 7ee967c
-Author: Gregor Beck <gbeck@sernet.de>
-Date:   Thu Sep 13 17:27:51 2012 +0200
+commit 7833b93
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 13:46:01 2015 +0200
 
-    smb2: dissect FSCTL_PIPE_WAIT
+    Free all hfi->strings in free_deregister_field
     
-    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: I6fe78266a2e881fa80e1e3a3423b685d3c1764de
+    Reviewed-on: https://code.wireshark.org/review/10029
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 9c7acde
-Author: Gerhard Gappmeier <gerhard.gappmeier@ascolab.com>
-Date:   Thu Jun 25 14:53:14 2015 +0200
+commit 12ff69d
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 11:02:10 2015 +0200
 
-    opcua dissector: Fix parsing of 7 byte numeric service NodeIds.
+    Qt: Fixed funnel text dialog append and prepend
     
-    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.
+    Append to end and prepend to start, not the opposite.
     
-    Change-Id: I8654d969604e18bce8415931e455632e72d578ef
-    Reviewed-on: https://code.wireshark.org/review/9435
-    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 fbf0c34
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Jul 1 10:18:47 2015 +0200
+commit 28b5206
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 09:26:50 2015 +0200
 
-    Try to fix some warnings from Visual Studio Code Analysis.
+    Free protocol in proto_free_deregistered_fields
     
-    Change-Id: Ibbbb89af23d0e37ea57a1079e311d8205d254ddd
-    Reviewed-on: https://code.wireshark.org/review/9434
-    Reviewed-by: Anders Broman <a.broman58@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 8e87fad
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 30 20:46:05 2015 +0200
+commit 8426225
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 14 07:54:51 2015 +0200
 
-    proto.c : fix indent
+    Qt: Avoid redissect twice when changing fields
     
-    Change-Id: I74461666bcfc6e85a92409819e2c63811284e8f8
-    Reviewed-on: https://code.wireshark.org/review/9433
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Changing fields in http, imf or ldap used to trigger redissect twice
+    because of UAT_AFFECTS_FIELDS and UAT_AFFECTS_DISSECTION.
+    Also changed from redrawVisiblePackets() to columnsChanged() because
+    fields in a custom column may have changed.
+    
+    This also fixes reloading Lua plugins with Lua fields in custom columns.
+    
+    Change-Id: I805a765690decbe7434dbf1c33ebd1113e23d16d
+    Reviewed-on: https://code.wireshark.org/review/10025
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit b107e93
+commit 6cc1c8d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 30 21:37:34 2015 -0700
+Date:   Thu Aug 13 20:05:43 2015 -0700
 
-    Don't assume the source directory's path has no spaces in it.
+    Clean up heuristic checks.
     
-    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.
+    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.
     
-    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>
-
-commit b0b027d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Aug 13 11:21:58 2014 -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.
+    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.
     
-    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>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    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 986e347
-Author: Peter Hatina <phatina@redhat.com>
-Date:   Fri Jun 26 13:25:54 2015 +0200
+commit 3c5fd58
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Aug 13 16:36:03 2015 -0700
 
-    Disable overlay scrolling
-    
-    Overlay scrolling causes problems when selecting eg. the last packet in Packet List. The last packet gets covered by the scollbar.
+    Get rid of trailing whitespace.
     
-    Change-Id: If23152721a457c7834d6727fc342ee0501a07302
-    Reviewed-on: https://code.wireshark.org/review/9169
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Change-Id: I035fad79dd8d01aa3121732f2a9b07d20cc4384f
+    Reviewed-on: https://code.wireshark.org/review/10023
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 98a7b1e
+commit 814f617
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Jun 30 12:58:44 2015 -0700
+Date:   Thu Aug 13 16:30:51 2015 -0700
 
-    Put quotes into xcopy command and note that it might need privileges.
+    Update to reflect reality.
     
-    The pathnames have spaces, so they must be quoted.
+    The Ixia trailer is a variable-length sequence of TLVs followed by some
+    fixed-length fields.  Describe it as such.
     
-    At least on my VM, I had to run it as Administrator.
+    Realign some #defines while we're at it.
     
-    Change-Id: I7600edbdbe3205c7f766cc651bd6b86340efa0ff
-    Reviewed-on: https://code.wireshark.org/review/9429
+    Change-Id: I5fc45a1d44978f1dc1f13e7098c3f797838db7b3
+    Reviewed-on: https://code.wireshark.org/review/10022
     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
+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
 
-    Set the PHY value when providing our own metadata structure.
+    [config.nmake] Add minor comment about /Zo option for MSVC-2015
     
-    Bug: 11319
-    Change-Id: I8b746f7238729173b2ca23734e9f7fdbbe4f5110
-    Reviewed-on: https://code.wireshark.org/review/9232
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ia4ffc543965160aaf6c39dc19764e62e9e82faa8
+    Reviewed-on: https://code.wireshark.org/review/10020
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 2325550
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jun 29 22:20:53 2015 -0500
+commit cd76cf6
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 13 17:27:10 2015 +0200
 
-    Fix setting widget visibility when changing the layout.
+    ieee802.11: changed blurb to stop checkAPI complains.
     
-    Fixes a bug exposed by g5265bc3.
+    Change-Id: I9ec74a7af229a1af3ca946acc5af94ede1913c29
+    Reviewed-on: https://code.wireshark.org/review/10016
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 7661bb2
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Aug 13 17:38:09 2015 +0200
+
+    Qt: fix copy of newer files when building with qmake
     
-    Change-Id: Ia0775aa068f5e9e1eeb66384bac97fe57f3c957c
-    Reviewed-on: https://code.wireshark.org/review/9231
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I8ea5e2770a0c5be3d981d986fa96fe30445db167
+    Reviewed-on: https://code.wireshark.org/review/10018
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 63a78d4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Jun 29 18:04:59 2015 -0700
+commit 2d5f2ae
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Aug 13 16:16:03 2015 +0200
 
-    Use ws_fstat64() to determine the size of an open file.
+    GVCP: fix dissection of Stream Channel Packet Size register
     
-    fseek() to the end, followed by ftell(), is a bit of an odd way to get
-    the file size.  Use ws_fstat64() instead.
+    Bug: 11442
+    Change-Id: I1c187bdf7ffd14b2a4f66d29883a4b112486bd35
+    Reviewed-on: https://code.wireshark.org/review/10014
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit 738cf42
+Author: Anders <anders.broman@ericsson.com>
+Date:   Fri May 29 10:33:58 2015 +0200
+
+    Make building with MSVC2015 work
+    TODO:
     
-    Check that the file is a regular file, while we're at it.  This means we
-    don't have to check before opening.
+    - 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
     
-    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: 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 1e511d8
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Mon Jun 29 13:13:55 2015 +0200
+commit 6087f2a
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Aug 13 10:13:52 2015 +0200
 
-    ssl: test for file type before reading key file
+    fuzz-test.sh: added missing option in help.
     
-    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: I7651e18ec6e8338cddc82be90257c5f183804c7c
+    Reviewed-on: https://code.wireshark.org/review/10011
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit beb5c0b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Aug 11 19:50:43 2015 -0400
+
+    Eliminate proto_tree_add_text from some dissectors.
     
-    By the way, this is the only user of ftell that is affected.
+    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 61d1ea4
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 12 15:19:25 2015 -0700
+
+    Initialize another variable.
     
-    Bug: 11268
-    Change-Id: Iaecd42c9b60da9e7945703a794601773749f2d97
-    Reviewed-on: https://code.wireshark.org/review/9213
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Change-Id: Ie53a16dc482a9c38538077f6d6a2717cfaddbaa4
+    Reviewed-on: https://code.wireshark.org/review/10010
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit a36db75
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Jun 30 00:38:45 2015 +0200
+commit 0b7d161
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Aug 11 23:58:54 2015 +0200
 
-    plugins/mate: fix some memleaks
+    editcap: add change offset.
     
-    Fixes about 5kB leaks in 500+ allocations.
+    This option skips some bytes when fuzzing, that prevents some headers from being changed. This focuses fuzzer to a smaller part of the packet.
     
-    There are still some other remaining (and not fixed in this patch
-    because it is hard to track them):
+    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 99e3244
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Aug 12 14:12:24 2015 -0700
+
+    Initialize a couple of variables.
     
-     - 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).
+    Change-Id: I10471b770356ad46a10740198156055e1480eeb3
+    Reviewed-on: https://code.wireshark.org/review/10008
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit db2692c
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 12 20:58:14 2015 +0200
+
+    Qt (main_window) fix no previous prototype for '...' [-Wmissing-prototypes]
     
-    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
     
-    Change-Id: I4c06f948136fc30dfcdb56f7ac8a32a2326ae30d
-    Reviewed-on: https://code.wireshark.org/review/9221
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    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 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>
+commit 2449c7a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 12 21:06:08 2015 +0200
 
-commit b1ab36a
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Jun 28 00:33:57 2015 +0200
+    GTP: fix indent (use 4 spaces)
+    
+    Change-Id: I2f0645adee2aff32122a8ccb60843e1bfd0897e1
+    Reviewed-on: https://code.wireshark.org/review/10004
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 451dd05
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Aug 12 16:47:36 2015 -0400
 
-    tools/asn2wrs.py: fix isdn-sup generation with Py3
+    [lwres] Fix (32 bit ?) MSVC-2015 warning: "conversion from 'size_t' to 'guint16', possible loss of data"
     
-    Python 3 has removed the cmp function for sort functions, relying on a
-    key function instead.
+    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'
     
-    Tested with Python 2.7.10 and 3.4.3.
+    Essentially: Do the version checks at compile time using
+                 #if statements (even though the compiler
+                 probably optimized out the run time checks).
     
-    Change-Id: Id571b836304528ecc3b23a0f8a2843c4538c3e1b
-    Reviewed-on: https://code.wireshark.org/review/9212
-    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 a6f9cf5
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Jun 29 13:13:36 2015 -0500
+commit 6ae8df4
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Aug 12 16:15:05 2015 -0400
 
-    Don't free col_item->col_data.
+    [pdc] [msvc-2015] Change a variable type to prevent 32-bit MSVC-2015 "internal error"
     
-    It either points to col_item->col_buf (which we explicitly free) or to
-    a static string.
+    [...]\packet-pdc.c(205) : fatal error C1001: An internal error has occurred in the compiler.
     
-    Change-Id: I4d6db3fa16e69a4321be9d01076026c024df9a00
-    Reviewed-on: https://code.wireshark.org/review/9219
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    (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
+    
+    INTERNAL COMPILER ERROR in 'C:\Program Files\Microsoft Visual Studio 14.0\VC\BIN\cl.EXE'
+        Please choose the Technical Support command on the Visual C++
+        Help menu, or open the Technical Support help file for more information
+    
+    Change-Id: I505898d0c76244a56d75af1a1c5bf30554dd9a2b
+    Reviewed-on: https://code.wireshark.org/review/10005
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 0b0100b
+commit 5c80f08
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Jun 28 11:18:26 2015 -0700
+Date:   Tue Aug 11 11:48:07 2015 -0700
 
-    Fixup the packet list navigation action behavior.
+    Add DCE-RPC and ONC-RPC service response time dialogs.
+    
+    Add RpcServiceResponseTimeDialog, which handles DCE-RPC and ONC-RPC
+    service response time statistics. Try to make it as lightweight as
+    possible, since we might want to pull this into the RPC dissectors
+    similar to the other SRT statistics.
     
-    Change-Id: I124fe3c3755556e81c65443b8b9744a89394dc70
-    Reviewed-on: https://code.wireshark.org/review/9218
+    Allow program names on the command line in place of numbers or UUIDs. Make
+    matches case-insensitive. E.g. the following are equivalent:
+    
+        -z rpc,srt,100003,3
+        -z rpc,srt,nfs,3
+        -z rpc,srt,NFS,3
+    
+    as are the following:
+    
+        -z dcerpc,srt,f5cc5a18-4264-101a-8c59-08002b2f8426,56
+        -z dcerpc,srt,nspi,56
+        -z dcerpc,srt,NSPI,56
+    
+    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.
+    Some further questions, asked in comments.
     
-    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.
-    
-    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.
+    Clean up the file header description.
     
-    Mark it as generated, while we're at it, as it's not a value from the
-    radiotap header, and make it a guint.
-    
-    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.
-    
-    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.
+    Update comments.
     
-    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.
+    Document Colasoft Capsa file support.
     
-    Found by Pascal Quantin.
-    
-    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.
+    Lua: Remove unneeded call in wslua_cleanup
     
-    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.
-    
-    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.
+    [GIOP] A GIOP message can have size = 0 (CloseConnection)
     
-    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.
-    
-    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
-    
-    Plain 'wireshark' is now the Qt version, and 'wireshark-gtk' is the GTK version.
+    g_slist_free_full () does not exist until GLIB 2.28
     
-    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.
+    Eliminate proto_tree_add_text from packet-wbxml.c
     
-    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.
-    
-    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>
+    this length is used for allocating a buffer and for crypto calculations
+    we should use the bytes that were actually captured, not the reported
+    length
+    
+    the capture in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11389
+    has one packet with a stupidly large reported length and a reasonable
+    capture length (and one completely bogus packet) - this fix ensures that
+    the decryption does not break for the former packet
+    
+    also, tvb_reported_length_remaining() does not return values < 0 any
+    more, remove the check for this
+    
+    Bug: 11389
+    Change-Id: I42cb4526483160416b51e3cb72442148b5fac4f3
+    Reviewed-on: https://code.wireshark.org/review/9950
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 29aecdf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jun 26 08:48:44 2015 -0700
+commit aafc7ff
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:55:15 2015 +0200
 
-    RRC: remove non ASCII characters from ASN.1 description
+    H225: fix no previous prototype for 'h225_stat_init' [-Wmissing-prototypes]
     
-    Change-Id: I7edb23651caa5ccf8e9989069803a8800e358670
-    Reviewed-on: https://code.wireshark.org/review/9172
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I945bbbb3b10258f22c60b04b19cf55671fc6ed94
+    Reviewed-on: https://code.wireshark.org/review/9933
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit caf06fe
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Jun 26 08:39:04 2015 -0700
+commit a051961
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Aug 9 14:55:27 2015 -0400
 
-    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.
+    [wiretap/nettrace_3gpp_32_423] Add editor modelines
     
-    Change-Id: Iea5b5c88b02ff4799c255f795be2469a091161fe
-    Reviewed-on: https://code.wireshark.org/review/9171
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ie2b9da2b3a08d18fc913a00cf076aa881a583552
+    Reviewed-on: https://code.wireshark.org/review/9949
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit a7a7c68
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Thu Jun 25 14:25:42 2015 +0200
+commit a29f513
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Aug 9 14:16:22 2015 -0400
 
-    epl: Set Payload to remaining bytes
+    [skinny] Add missing change to source (.in); Also do minor cleanup.
     
-     The payload dissection now only includes the remaining bytes,
-     even if the actual number of payload bytes should be bigger.
+    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.
     
-     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
+    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: Iefef78e7c7aed7f87e40875f345ff5debf364f3a
-    Reviewed-on: https://code.wireshark.org/review/9124
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    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
+    packet-skinny.c regenerated using 'cog'
     
-    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>
+    Change-Id: Ib3510c257e0b98bb7da8fae9aa010e134ec381cb
+    Reviewed-on: https://code.wireshark.org/review/9948
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 8f40e2c
+commit 2ef3cda
 Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 23:48:48 2015 -0700
+Date:   Sun Aug 9 10:36:18 2015 -0400
 
-    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.
+    t124: kill evil global variables
     
-    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
+    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 4975c06
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Fri Jun 26 08:49:05 2015 +0200
-
-    Disabling GTK by default in the official source was not intentional
-    (but maybe it should be).
-    
-    Change-Id: I9dba032951265204e1ced517ad7eb331ec71a6a2
-    Reviewed-on: https://code.wireshark.org/review/9167
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-
-commit 40649e3
+commit b3207c0
 Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 13:24:45 2015 -0700
+Date:   Sun Aug 9 18:33:04 2015 +0200
 
-    ctdb: exit instead of throwing an exception
-    
-    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.
-    
-    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.
-    
-    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
-    
-    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>
-
-commit d81ba67
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 15:23:29 2015 -0700
-
-    wmem: bubble up key type change another function
-    
-    Follow-up to gb679e2a.
-    
-    Change-Id: I6cc168c3f3a6e1c8ce7bfa9344255acd3c8a7d20
-    Reviewed-on: https://code.wireshark.org/review/9164
-    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.
+    zigbee: remove a numer of unnecessary if (tree) checks
     
-    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
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 14:32:30 2015 -0700
-
-    Qt: when a capture file is closed, go back to the welcome screen only
-    if we're not capturing to multiple files
-    
-    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.
     
-    Change-Id: I638e4362bbc24e5a0a990dc7339e285e2ac55839
-    Reviewed-on: https://code.wireshark.org/review/9158
+    [There were no actual indentation changes since since none of the files
+     contained tabs].
+    
+    Change-Id: I92ff551e70274f459c466e1c1d449905e0e7dc92
+    Reviewed-on: https://code.wireshark.org/review/9945
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 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
-    
-    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.
+    GSM (a_common): fix no previous prototype for 'gsm_a_*_init' [-Wmissing-prototypes]
     
-    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
-
-    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.
-    
-    Remove the CopyHere code. Search for 7z and 7za in various places and
-    download the standalone 7za if needed.
-    
-    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>
-
-commit 78e71f6
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 11:55:32 2015 -0700
-
-    Remove the other g_hash_table_contains
-    
-    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>
-
-commit cb0ee64
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Thu Jun 25 20:18:10 2015 +0200
+commit c60c1b9
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:37:58 2015 +0200
 
-    cmake/add_lemon_files: depend on lemon and lempar
+    IEEE802.11: Fix typo
     
-    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.
+    Pseduo -> Pseudo
     
-    In addition, clean up the generated .h and .out files.
-    
-    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: I34700b3392bfd7e47e79cb2cad0f65a1046a26a2
+    Reviewed-on: https://code.wireshark.org/review/9925
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 8b6c4c3
+commit 454f08d
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jun 25 14:41:53 2015 -0400
+Date:   Sat Aug 8 09:57:14 2015 -0400
 
-    Limit the text displayed for the Filter label in the SRT dialog so it doesn't push the table off of dialog.
-    
-    Add tooltip that displays entire filter string
+    If SOCKS server doesnt't require authentication, then client should be ready for commands.
     
-    Bug: 6399
-    Change-Id: I094f3785eb15daf6e05485748f01c36a9a98e163
-    Reviewed-on: https://code.wireshark.org/review/9142
+    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 7f57175
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Jun 25 14:33:28 2015 -0400
+commit 9a16a69
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 16:10:48 2015 +0200
 
-    Bugfix parsing filters out of SRT tables with parameters.
+    NCP2222.py : fix generate indent (use 4 spaces)
     
-    Change-Id: I5f9315b144333be789f8555f4128371994d4245b
-    Reviewed-on: https://code.wireshark.org/review/9141
+    Change-Id: Ibe55260e837f0a839649675c08e1bf66d8bcdb52
+    Reviewed-on: https://code.wireshark.org/review/9924
     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
-
-    File: Add BTSNOOP File Format support
-    
-    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>
-
-commit b679e2a
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 11:09:28 2015 -0700
+commit 39ad1bf
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 13:20:52 2015 +0200
 
-    wmem: convert tree key to void*
-    
-    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.
+    NCP2222(.inc): fix indent (use 4 spaces)
     
-    Change-Id: Ibb15400f74761ae295948507df8d2e022f2ebb05
-    Reviewed-on: https://code.wireshark.org/review/9138
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I8161423ae270f685c28003eac36adf15be83c5fd
+    Reviewed-on: https://code.wireshark.org/review/9922
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 131f8f0
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 10:45:25 2015 -0700
+commit b703f47
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Aug 8 13:08:57 2015 +0200
 
-    Remove g_hash_table_contains from plugin_if
+    GTPv2: fix indent (use 4 spaces)
     
-    The OSX 10.5 build doesn't seem to like it.
-    
-    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>
+    Change-Id: I7836360ae4fe67098776911a496ecc969d3e093d
+    Reviewed-on: https://code.wireshark.org/review/9921
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e4f88dd
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 10:34:25 2015 -0700
+commit 5cf66db
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 15:38:34 2015 -0700
 
-    Fix a memory leak registering prefs
+    Add a missing dependency.
     
-    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.
-    
-    Change-Id: Ib418b14296391dd198a8b49b0c99c5f697d8050f
-    Reviewed-on: https://code.wireshark.org/review/9132
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I2c9814419882f9bee30e70697d6f284393f275a9
+    Reviewed-on: https://code.wireshark.org/review/9919
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 9dd21d9
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 09:44:58 2015 -0700
+commit 7cb2b11
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 15:08:22 2015 -0700
 
-    Qt, cmake: put the build dir before the source dir in the include path
+    Rework CMake dependendencies in the docbook directory.
     
-    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)
+    Create dependencies explicitly using add_dependencies. Otherwise MSBuild
+    only builds one output per run.
     
-    Change-Id: I2406c31bc0638eb13ed4b539ddc607512051033d
-    Reviewed-on: https://code.wireshark.org/review/9130
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: If42605d7e7df499cf4d4b70336d97ac6d37e8ba6
+    Reviewed-on: https://code.wireshark.org/review/9918
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 534d1d5
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Jun 25 09:17:03 2015 -0700
+commit a001ed6
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Aug 7 15:27:11 2015 -0700
 
-    Qt: use <> for including the generated ui_*.h files
+    Avoid (unlikely) NRB record size overflows.
     
-    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)
+    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: Ie3de4cdd85a2865e203118a42ab10f443372f03b
-    Reviewed-on: https://code.wireshark.org/review/9129
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    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
-
-    diameter: fix a memory leak on startup
+    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).
     
-    If we can't read the dictionary containing all our definitions, free necessary
-    memory before returning.
+    Clean up some comments.
     
-    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.
+    Remove a _U_ that's applied to a variable that *is* used.
     
-    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: I153d5aa885105149c62a5e5d2b78b54cf6ed7b4e
+    Reviewed-on: https://code.wireshark.org/review/9917
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit acc5810
-Author: Roland Knall <roland.knall@br-automation.com>
-Date:   Fri Jun 5 11:19:37 2015 +0200
+commit 817d9bd
+Author: Timothy Geiser <slimshady007@inbox.lv>
+Date:   Wed Aug 5 15:19:48 2015 -0400
 
-    Plugin Interface: Add GUI callbacks
-    
-     Rename ext_menubar to a more appropriate plugin_if.
-    
-     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.
-    
-     This patch implements a first functionality, by which a
-     plugin implemented using ext_menubar can apply a display
-     filter to the main view.
+    Add SHA2 algos to certificate dissection in SSL
     
-     For now the implementation supports filtering, as well as
-     saving a preference.
-    
-    Change-Id: Iffe4caa954bbeb8ce356352de4dae348a50efba9
-    Reviewed-on: https://code.wireshark.org/review/8773
-    Reviewed-by: Roland Knall <rknall@gmail.com>
+    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 d4aa1a1
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Jun 25 18:11:42 2015 +0200
+commit 240105e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 12:37:33 2015 -0700
 
-    Qt: mark unused parameters as such
+    Fixup the Qt splash overlay progress calculations.
     
-    Change-Id: Ib53d6da0d6660cf2c6a3283ff6123a2f18a8abda
-    Reviewed-on: https://code.wireshark.org/review/9128
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit e963cbf
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Jun 24 16:58:25 2015 -0700
-
-    editcap: keep timestamp resolution when converting a nseclibpcap file to pcapng
+    Fix a couple of issues in the way we calculate the splash overlay
+    progress.
     
-    As reported on https://ask.wireshark.org/questions/43483/why-does-editcap-write-out-nseclibpcap-correctly-with-nanosecond-timestamps-but-not-with-pcapng
+    Avoid unnecessary repaints.
     
-    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: I1f4800b2c2836b67ca9ff3d6d24af150f4379ba9
+    Reviewed-on: https://code.wireshark.org/review/9916
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit cb84022
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Wed Jun 24 15:41:22 2015 -0700
+commit 0a1d1bd
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 10:19:22 2015 -0700
 
-    Qt: fix crashes when Wireshark is closed while running a capture
-    
-    if we haven't captured any packets yet, don't display a warning about
-    unsaved changes
+    More casting issues with older versions of GLib.
     
-    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
+    Try to fix
     
-    cf_has_unsaved_data() should return false if we have a temporary file
-    that contains no packets
+    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
     
-    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>
-
-commit 1810112
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Feb 11 16:34:08 2015 -0500
-
-    Add minimize and maximize buttons to the TCP stream dialogs.
+    packet-btrfcomm.c: In function 'btrfcomm_directed_channel_value':
+    packet-btrfcomm.c:287: warning: cast to pointer from integer of different size
     
-    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.
+    packet-btobex.c: In function 'btobex_profile_value':
+    packet-btobex.c:1134: warning: cast to pointer from integer of different size
     
-    Call QDialog(NULL) in the about box.
+    on the 32-bit OS X builder.
     
-    Change-Id: I4f229ab579d0912cb03ba8f8d0300d933d0ba914
-    Reviewed-on: https://code.wireshark.org/review/7072
+    Change-Id: Ieb2fe6c31fdad0cf776c24bada7a6a83e8aa91ec
+    Reviewed-on: https://code.wireshark.org/review/9915
     Reviewed-by: Gerald Combs <gerald@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>
-
-commit 7e62a03
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Jun 6 15:07:53 2015 +0200
-
-    fix the 'then' statement is equivalent to the 'else' statement found by PVS Studio (V523)
-    
-    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>
-    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 147ab19
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 08:39:09 2015 -0700
 
-    Stop using atof/strtod (fixes column sorting of float types)
+    Switch the floats in stat_tap table items to doubles.
     
-    atof is locale-dependent. In locales such as Swedish, German and Dutch,
-    the dot is a thousand separator, resulting in wrong conversions for
-    floats.
+    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.
     
-    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.
+    This reverts commit 5bbb6ff5e43511ddc57b0b771f3d60da1eb82c02.
     
-    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>
+    Change-Id: I113b44fb944a883cde016b7a8961597658be4c0a
+    Reviewed-on: https://code.wireshark.org/review/9912
     Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    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
-
-    afp: replace all calls to THROW() and do proper error handling
-    
-    Change-Id: Ie471a67a978aeb54727d03f93b98e3e422441a58
-    Reviewed-on: https://code.wireshark.org/review/9119
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-
-commit 47abcfc
-Author: Evan Huus <eapache@gmail.com>
-Date:   Thu Jun 25 08:17:23 2015 -0700
-
-    Vagrant setup fixes
-    
-    - 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
-    
-    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
-    
-    Change-Id: I2b01bc6dfe24e28454101da59720d2c74603b88f
-    Reviewed-on: https://code.wireshark.org/review/9120
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit c37b05d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Jun 24 19:07:16 2015 +0200
+commit c90fcba
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Fri Aug 7 14:55:50 2015 +0200
 
-    ARUBA (ERM): Add type 5
+    Lua: Count Lua plugins in splash screen
     
-    it using PeekRemote-Ng (with Header version = 2)
+    This will avoid slow startup when having many Lua plugins.
     
-    Change-Id: I601cb7ecfaf01e51ec696502d10918f869486d01
-    Reviewed-on: https://code.wireshark.org/review/9126
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@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: 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: Stig Bjørlykke <stig@bjorlykke.org>
 
-commit 0a28aa4
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Thu Jun 25 09:37:28 2015 +0200
+commit c8ca0ae
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Aug 7 09:10:39 2015 -0700
 
-    Revert commit cc8ed845ed53ed60fa776728f1d7f2659dd311a3
-    Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-    Date:   Wed Nov 12 13:39:07 2014 +0100
-    
-        Invoke asn2wrs.py using a custom command
+    Try to fix casting issues with older versions of GLib.
     
-    Fixes  bugid 11304
+    Try to fix
     
-    Once there is&