5 files changed, 8 insertions, 777 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d0d24f2e0..e6c242dc71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ project(${_project_name} C CXX)
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 3)
 set(PROJECT_MINOR_VERSION 1)
-set(PROJECT_PATCH_VERSION 1)
+set(PROJECT_PATCH_VERSION 2)
 set(PROJECT_BUILD_VERSION ${GIT_REVISION})
 set(PROJECT_VERSION_EXTENSION "")
 
diff --git a/ChangeLog b/ChangeLog
index dc698a67b7..e69de29bb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,774 +0,0 @@
-c7a09d7359 Build 3.1.1.
-93e0b01988 SIP: Handle "Authorization:" Header without data.
-0468ead898 macos-setup.sh: Sparkle setup fixes
-00fd41b619 print: fix ek output with -j option.
-85ede9a503 ssh: add direction generated field.
-726eea0348 ssh: indentation fixes.
-aa2145982f Qt: Fix dangling delete for sequence diagramm
-c8b0968c77 Qt: Drag and drop label text changed
-8633ca6a88 Qt: Correct drag and drop with column header
-a51c58fa1b Qt: Cleanup space inside parentheses
-1ddd30856d ReleaseNotes: Multi-selection of packets
-b3f240dbf8 Qt: Multiselection in PacketList
-7d2e3fa8f5 [Automatic update for 2019-11-17]
-285cb7507a ICMP: fix parameter problem parsing
-7af41845a5 Add cirrus-ci config file.
-356814ae9a caputils: remove unneeded check.
-81b97d04a9 About Dialog: Add a copy to clipboard button for the version info
-669613f41d WSDG: Remove duplicate paragraph
-674533ef2f QUIC: Add DATAGRAM frame type
-d6e836f3cd QUIC: Add max_datagram_frame_size
-6a8963b57f Software update: Make our architecture detection more strict.
-7cc5f4c45f CMake: Work correctly without Sparkle.
-e624545b95 tools: fix echo in bsd-setup.
-5cd561829e Software update: Fix a copy+paste error.
-1cc5b68ac9 macOS: Application bundle fixes.
-7590d08db1 GTPv2: small fixes
-02057200fd macOS: Add support for automatic updates using Sparkle.
-fd4bb1e392 GTPv2: fix wrong offset in FWRDRELREQ if Target Type is gNB ID
-5b661c586f tools: fix typos in generate-dissector.
-5f8ed1126a Qt: Fix various LGTM.com reported issues
-725200d650 GTP: improve LTE/NR PDCP container configuration
-40d822ed61 tools: add automatic C skeleton dissector generator.
-9dbf684c71 Qt: Show custom column fields in context menu
-7da6109f3b Qt: Fix column alignment check in context menu
-90e4da60bc ZigBee: Add APS conversations and extended counter
-a924de1e3e test/suite_decryption: Add WPA3 SuiteB-192 bit test
-c6dff594b9 dot11decrypt: Fix MIC calc for HMAC-SHA384
-b07dada4c9 dot11decrypt: Fix KDF for larger PTK derivation
-5915613879 dot11decrypt: Support 384 bit long PMK
-7638ea013d dot11decrypt: Dynamic sized TK, KEK, KCK, PTK
-96971a33a3 dot11decrypt: Support dynamic MIC lengths
-ccc591dd98 [RFC]ieee80211: Fix function to determine mic length
-820e1c9bee dot11decrypt: Export Dot11DecryptDecryptKeyData function
-4222603a50 dot11decrypt: Introduce Dot11DecryptGroupHandshake function
-3fdabc62d4 dot11decrypt: Let dissector parse eapol frames
-c938841469 travis: add arch name to linux builds.
-12969c22ba travis: change linux distribution to bionic.
-06a34129c2 travis: add ppc64le builds.
-e948c1a9f3 bluecom: fix compilation under ppc64le.
-83fa374002 travis: add s390x builds.
-8ae0cfe60a Babel: fix regression introduced in gdd15b203c7
-c58f86ff6b SMB2: When we add the timestamp to a previous version also save it.
-14690c8315 Qt: Fix statusbar messages
-c91bb19da2 Qt: Fix displayfilteredit pop
-d20f13bbcd travis: fix clang version name in xcode builds.
-0bc213b559 smb2: namepsace => namespace typo
-2ff91faf89 TCP: increment nextseq for FIN and SYN packets
-766f231da6 Release notes: Add an item about following HTTP/2 and QUIC.
-3c8c392b9d Qt: Cleanup push/pop Infos
-ba62446a6a cppcheck: Re-ignore asn1.
-6615d8dfff wsutil: add netinet/in.h to socket.h.
-7a1a45c523 Qt: Signal empty display filter bar
-75a4be6cf2 Reassemble: Fix typo
-ccc88bad93 Revert "ieee80211: fix dissection of HE Phy Capabilities Information"
-d88d88a8b6 SMB2: Add @timestamp to the info column if we see a timewarp ECP.
-99398c533e Fix display of pino protocols in display filter dropdown
-a13d168916 Fix name of the "remove Wireshark from PATH" package.
-12e79f037d test: add ek + raw test to outputformats.
-560f2e54ba Don't report EPIPE errors writing out packet information.
-7cbe0b2e15 Include <string.h>.
-5d18c9b4df dumpcap: Add support for TCP@IPv6 socket captures
-d7d1686a95 SNMP: fix out of bounds access to snmp_PDUs_vals array
-ca114508d1 Documentation: update (long) cmd line options.
-c4e41e356a Qt: Make clearing display filter behave more logical
-bb2bf1c577 BMP: Add support of draft-ietf-grow-bmp-local-rib-06
-4fe4405bef Protobuf: Enhancements about error message during loading .proto files
-f874c5dea4 knxip: Fix Dead Store
-ca1d07000f nvme: Dissect NVMe Identify Namespace list (CNS 0x2) data response
-fa535b3fcd nvme: Dissect NVMe Identify Namespace (CNS 0x0) data response
-ddff1ab4fa MPLS Echo: update dissector with RFC6829 3.1
-a2f44527cb Update ieee multicast addresses
-4ad8ff785c [Automatic update for 2019-11-10]
-fd35374226 lsd: Add cookie field (optional)
-059e02b704 ieee80211: avoid duplicate wlan keys for managements frames with parameters
-6a29a299c7 lldp: add mandatory items chassis and port to info column
-ebb33f3e96 Clean up description of the "DNS Servers" preference.
-8b6f316f30 cemi: Fix Dead Store
-2d47c2060b CID: Fix 1455321 null-reference
-1b11115ca7 mptcp: add support for sha256 hashing.
-71996e8d93 CMake+docbook: Fixup our .chm titles.
-bf5d699cf0 travis: bump xcode versions.
-f9c24510fa Kerberos: rework dissecting for PA-PW-SALT
-e023908952 SNMP: do not modify the ASN.1 source for request/response tracking
-04e400d7f7 Fix problems regarding SRT calculation in SNMP dissector
-16bb08de02 Qt: Fix loading of FilterExpression Dialog
-59b5bff2d1 lldp: Add aggregation status bits to LACP TLV
-2ff32787c5 epan: Make proto_tree_add_oid* usable from DLLs.
-59ab98a894 mptcp: correctly parse v1 MP_CAPABLE handshake
-9ea3b66bad ek: fix raw hex prints.
-14d398fe67 Implement service response time calculation for SNMP
-63e437c020 Qt: Move Signal/Slots to DisplayFilterEdit
-4349961972 Qt: Move Signals/Slots to subclass
-1b151d820d Qt: Fix order of contextmenu for DisplayFilter
-abfa0d6218 Qt: Keep extcap control channels when capturing to multiple files
-f75f128462 CoAP: add a separator between messages in info column
-54e4ead9b2 BMP: fix typo on bitmask PEER Flag AS_PATH
-4a2b2f8cc5 BMP: Add support of RFC8671
-c0ae7c1c97 RTCP: MCPTT add more dissection.
-b56b6f6a8f travis: Add Linux arm64 builds
-e87eec451f DIAMETER: Add User-Equipment-Info dissector
-69b41e4d1e Qt: Ensure only valid input for DisplayFilter
-8bfe73e6c6 SMB2: Use defines for dialect values
-99effcada2 Windows: upgrade Npcap to 0.9984
-dd9af8018d gitlab-ci: fix wrong job name.
-1625ed7afe cmake: be verbose when building RPMs.
-9f622cddd4 SMB2: add string value for dialect
-88306c251a Qt: fix compilation with older versions.
-1178c59c05 BGP EVPN: Adding Type 10 route support
-9fd44de604 Qt: Better align DisplayFilterEdit buttons
-c231c8df3d RTCP: Fix dead store (Dead assignement/Dead increment)
-69356f1b60 Document long command line options.
-ca2316069e rtcp: Fix Dead Store
-1675e0fe72 extcap: Fix memory leak in extcap_get_extcap_paths
-3361109b15 QT/CLI: Remove limit for object export files
-152e0114c1 Qt: Fix CPU usage for DisplayFilterEdit
-d8715d2e7f RTCP: Dissect more MCPTT elements.
-8afd7a751f funnel: Free callback data
-5db18c604e CoAP: fixes for TCP transport
-0e64e9f3ca extcap: Allow loading of extcap files from personal directory
-a802000a2e Qt: Allow action buttons to be left-aligned
-a218460e22 Qt: IOGraph display filter graph added
-499d912f4b funnel: Free callback data
-b01f0febe2 Fix find_conversation_pinfo() description in documentation
-b921cd32dd Some IP: Fix Warn heuristic_protos' line 3
-3ccb01666b TLS: report encrypted TLS alerts as such
-2ce3ec5055 PROFINET: Padding in SRLData block is corrected.
-6500d8071e Qt: Use g_new0 to allocate fmt_data
-c0cec58564 RTP: rtp_audio_stream.cpp: fixed excess silence in visualisation on waveform
-6fd51d5b25 print: some indentation fixes.
-2ae8451121 OER: Handle negatived constraints in dissect_oer_constrained_integer.
-ce0b559534 BMP: Enhance dissection of Stats type
-d793c8d70e PROFINET: Manufacturer Data ranges are modified.
-f70c14af07 QUIC: Add draft-24
-ee61df4bbf TLS: Add facebook TLS 1.3 draft number
-e1dc9f82a6 Qt: Load filenames properly
-c39bb02fbc Qt: Fix memory leaks in FilterListModel::reload()
-22ab2b970a nvme: Dissect NVMe Identify Ctrl (CNS 0x1) data response
-2ecb2828a8 dot11decrypt: Let dissector feed engine with EAPOL key message type
-0ec8bd50c7 dot11decrypt: Separate key extraction step from decryption step
-23850a3342 CMS: reset object_identifier_id after dissecting ContentInfo
-5c10ad1e29 Qt: Remove some extraneous qDebug()s.
-2dc1b77827 elastic: print times the right way.
-2336547a5f Show correct format of --display command line parameter
-e0ddc7ad9c Qt: Move CaptureEdit to FilterListModel
-04bb48bf2c Qt: Fix various issues with the bookmark menu
-1628bff78d Get rid of proto_tree_add_debug_text() calls
-3c3e88986f json: add application/merge-patch+json to the media types handled.
-5acf14d5c0 macOS: Remove an exit code check.
-8cfe3f5aeb gitlab-ci: bump opensuse image version to 15.1.
-89890097bd macOS: Properly sign our extra packages.
-b9c7bab05d bthci_evt: Use specific expert infos
-d21078309d Qt: Hide Searchbar if the icon is activated again
-a8052b9f38 Qt: Coloringrules Mime is encoded as JSON
-6fbb1d5c66 BTATT: avoid crashing when called directly through user DLT
-013e87a8fd Qt: Remove DisplayFilterMimeData
-05e37a386e Lustre: Fix conflict
-b6c31d5db7 RTCP: fix an infinite loop (CID 1455251)
-a673a50ad8 epan: Rename dissector_filters.c to conversation_filter.c
-a596d269e8 TLS: workaround broken TLS reassembly with multiple TLS records
-c02b39baa0 gsm_a_bssmap: Fix Dead Store
-de7760d490 BMP: Update to RFC (7854)
-c537828d60 Wi-Fi NAN: fix infinite loop when parsing NDP extension attribute
-ddb86b9237 IEEE 802.11: avoid a "Null pointer passed to bytes_to_str()" error
-c4bd5222f5 lustre: fix typo (wrong hf)
-89c9d90980 snort: rename snort-config to packet-snort-config
-8087bcbf6d HTTP2: fix build without nghttp2
-8541d686e9 Wi-Fi NAN: initialize ieee80211_tagged_field_data_t structure
-f2036f0fbd Qt: Print qDebug messages by default.
-26504a0024 snort: fix alert rule parsing
-e60b8d1eb1 dot11decrypt: Shorten the debug macros
-eeb179edee snort: fix non-static 'g_file_separator' variable
-59e669e288 Qt: Fix Filter drag and drop
-0b0bbb8060 HTTP2/gRPC: Support streaming mode reassembly
-accd563aaf Qt: Consolidate mimedata usage
-d1128e58c4 rtp_analysis_dialog.cpp: Correct src/dst info for two independent streams
-7dfe906176 BGP: IPv6 Linkstate Prefix Reachability info
-e1572a6709 ax25: Fix addresses with non-zero SSIDs
-530c30e8a8 Docs: Try to make our "drag and drop" usage more consistent.
-148120160f Qt: Filter list model filter selection (CID 1455165)
-0f35832fce rtp_analysis_dialog: save as au: fix for streams with multiple codecs
-14fde2fcf4 [Automatic update for 2019-11-03]
-dc0445c292 s7comm: Add read record function
-9fce1ba5e6 filter_list_model (Qt): Fix Dead Store
-a00d02c9b3 profinet (pn-rt): Fix Dead Store
-1dd367b648 cfdp: Fix Dead Store
-e4692c5226 amp: Fix Dead Store
-86b0fe361c validate-clang-check (PD): Display also warning
-e7acb32a5a ieee80211: Extended Key ID support
-35615574e5 Correct JPEG file saving for french language
-4759eb7a7a RTCP:Improve dissection of Mission Critical Push To Talk (MCPTT)
-5459104358 Fix the temporary file string buffer expansion.
-79239431c7 SDP: Handle MCPTT fmtp parameter.
-14c87d8935 RTCP: Remove unused hf.
-d4a8659320 ITS: Fix dissection of ItsPduHeader
-7704a5a4b9 RTCP:Improve dissection of Mission Critical Push To Talk (MCPTT)
-3968903b58 Qt: Fix override for FilterModel
-6d2791485d Qt: Allow drag/drop of filter buttons in dialog
-dafa87a0b6 Diameter: Update AVP and flag dissection.
-b6752680ab lustre: fix rmfid dissection
-4d8692fca0 ZigBee: add new manufacturer codes
-ddb943bf0e Qt: Filter enabled/disabled protocols
-7df84598a9 Qt: Fix macos buildbot
-8d62cc3aea Qt: Speed up filtering in VoIP dialog
-541afedfbc wslua: Fix memleak of unregistered ProtoExpert
-e8265fbfe3 NAS 5GS: fix dissection of routing indicator
-da45dde13b RLC: Show reassembled data as a field
-2cccb26bc4 Qt: Implement FilterListModel
-f577d5b3ea Qt: Add Shortcut methods for active profile
-551745998e wslua: Fix memleak of unregistered ProtoField strings
-5fb897077e NAS 5GS: fix dissection of ngKSI in Registration Request message
-c77471437f NAS 5GS: fix dissection of PLMN in a few IEs
-5e8b6f3012 NAS 5GS: Rejected NSSAI. use correct offsets.
-3a0b512b11 HomePlug AV: Fix dissection of MMTYPE and FMI
-c9c33affd9 Add more checks, fail for negative byte block lengths.
-7995b45e03 Qt: Respect saved extcap multiselect configuration
-b1e9de7eb8 extcap: Do not append disabled boolflags
-73ac329193 Fix val_to_str() call.
-4c67990296 [Automatic update for 2019-10-27]
-97617b8106 IPv6: New Hop by Hop Path MTU Option
-829d2c3752 synphasor: fix compilation with gcc-5/6.
-04e660d082 nfs: fix guint64 format in proto_item_append_text.
-254502d765 Add config 3 frame support synphasor
-fab358df16 NFS: add dissector for FATTR4_MDSTHRESHOLD
-11d7765a6c lustre: MDS opcode cleanup
-44870fb1c2 wslua: Fix two memory leaks in the lua tests
-dc3cdf87a5 Release notes: We're building with VS 2019 on Windows.
-dd71c18594 nas-5gs:Dissect 9.11.3.46 Rejected NSSAI.
-a3e3a73a82 Qt: Move Filterbuttons to display filter
-ca64fb62c0 Qt: Simplify displayfilter handling
-eb454caf0b FilterFiles: Remove GTK+-only filter lists
-a4401d5e68 nas-5gs:Fix dissection of NAS key set identifier
-6ac12b4e84 snort:  Show top-level config errors using popup window
-1fc558b82b NFS: Fixing again stateid display of other_hash
-dda619fb70 nas-5gs: NAS-5GS 5GS network feature support incorrectly dissected
-b71ae7471b lte-rrc: Register dissector for UEPagingCoverageInformation and -NB
-67ebeee251 wiretap: no "drop_count" in pcapng format
-eb4e83d589 asn2wrs.py: fix parsing of integer unions with extension
-e50fd8b608 NAS 5GS: small fixes for PDU session establishment request message
-4308ae3d47 tools: Add update-appdata.py
-54fac1e309 SNMP: handle Net-SNMP Engine Id of 12 octets
-3f105cae4d Qt: Move reset to contextmenu
-21fa4a427a Protobuf: for UDP frames, show top-level summary in columns.
-f8ec872017 Qt: Reset all changes in the column preferences
-7e2aada266 Qt: Connect destroyed() signal to flushAppSignals()
-bc44c7e0cd TVB(LZ77+Huffman): return proper value on error (CID1451652)
-15a18f385f Qt: Make enum truly anonymous (CID1452175)
-1c21bcaeed Qt: Make enums anonymous
-366bd1947d Qt: ColumnPreferences hide hidden columns
-6820e3515a Qt: Fix Column Preferences
-df1c73d68f Opcua: Fix display of GUIDs
-07358f7012 [Automatic update for 2019-10-20]
-9d6551f3fd WSUG: fix <= escaping
-c810782192 Netflow: Niagara Networks decode for SSL SHA-1 IPFIX IE.
-da8b79d3a4 RLC: mark depended frames
-74f4c78d7c AgentX: Register dissector so find_dissector() can find it
-a5b3fb8f43 ieee1905: Move to the latest version of the Multi-AP spec.
-d809297ebf NFS: add dissect_nfs4_bitmap function
-2c5f89ae29 CMake: Add abillity to add custom taps.
-7c7d0fa1c2 SRT: Fixed misnamed field srt.bufavail
-36fdc570f5 RRC: Add System Information Block type to info column
-42683fbd94 WSUG: Update enabled protocols image
-eab718e8d0 BTMesh: Add support for manufacturer-specific opcodes
-7c49d99aca Kafka: Fix a length check.
-c869b567df Increase maximum USBPcap packet size to 128 MiB
-fd56ad3326 Wi-Fi NAN: Fix rval_to_channel_set reading past end of op_class_ch...
-32d1d96721 androiddump: Fix tcpdump encap type signed/unsigned conversion error
-0371994223 wslua: Improve parameter check in ProtoField.new()
-3a9933c52f wslua: Add ProtoField.char()
-efe1b0b1b2 Lua: Use space for indent
-f3ea3af71d Add in a comment explaining the huge hack being done.
-8e3ed86de7 Lua: Support FT_CHAR in Field
-179901c269 AT: Add ZUSIM command
-aade37ba62 Wi-Fi NAN: Fix NULL g_str_has_suffix errors in NAN beacon type detect
-58099c2d66 GTPv2: 8.38 MM Context check end of IE.
-50dc37d795 NAS-5GS: EPS bearer identity only uses bit 8 - 5.
-7e12cb1537 mqtt: fix conflict
-5dd3c2b8ef Wi-Fi NAN: Fix defererence NULL in 802.11 channel set lookup
-26354037a3 Protobuf: Support leading dot for the message/enum type of field
-62101950f3 Protobuf: Add show_details preferences. Fix two bugs.
-c797e94b33 Qt: Fix export dissection dialog
-572cd14ecc [Automatic update for 2019-10-13]
-9f374047ad We don't compile Qt, we just install a binary.
-9dc1b31272 NAS 5GS: fix null_decipher preference text
-926d5504f7 CMake: Remove some header defines.
-97cb389a35 Revert "CMake: Don't install HTML manuals twice"
-51fbc7198e NAS-5GS: In IE Service area list, present num elements(+1).
-6d450f7d8c Register NetFlow dissector for NetFlow protocol
-f1285fcf06 CMake: Don't install HTML manuals twice
-931a80492d QUIC: Remove some field of Preferred Address TP before draft-18
-21cfde4c6d QUIC: Add support of GREASE Transport Parameter
-dbfe1b2221 LoraWan: fixed downlink decryption
-3805cb6f2f mqtt: Dissect connect last will message as bytes
-09d16a64ab Get rid of some unnecessary string operations
-3d7cd2ed6b amp: remove duplicate copyright
-e76f518913 Release notes: Remove an item.
-88d5ccbe3f Update some ACI field names
-0cadd7e4ed Update qt 5.12.1 -> 5.12.4 and update a comment (twice)
-723433f750 Update ASCIIDOCTOR to current version(s)
-232677678b Wi-Fi NAN: Add support for Wi-Fi NAN protocol
-c1ed77a36f Qt: Simplify Wireshark Dialog class
-b6f78f45b5 GTPv2: Add basic dissection for Monitoring Event Extension Information
-dbf3cdcc3f protobuf: Fix typo in error message
-930aa328dd WSUG: Clean up opening sentences
-67d5c58bd2 WSDG: Fix duplicate 'the the'
-cb7dafbcf6 WSUG: Clean up duplicated words
-cb352105b8 Qt: Reduce use of CaptureFile
-5750c4981c protobuf: add support for Protocol Buffers Language (*.proto) files
-0d8bebc327 SMB: fix dissection of Directory Information field in Search (0x81) response
-2cac9d47af dumpcap: fix capture library version display on Windows
-e4d4c75584 FTDI FT: Register OpenVizsla USB VID/PID
-9a977d1f22 [Automatic update for 2019-10-06]
-9ffe5f61e9 GPRS RLC/MAC: clarify defcription of hf_global_tfi
-a1b16a4f8e GSM RLC/MAC: distinguish TA Index / TS number for Uplink and Downlink
-a758e31b90 CMake: Include glib dlls in Windows installer
-efb6fa1e03 AMP: Remove a self-assignment.
-e7f5ba6aa7 Qt: Do not redissect packets before sorting
-9e686f1e43 PFCP: Change of framed-route and framed-ipv6-route formating.
-13a9a98f95 dtn: Updates to TCPCL and AMP parsers and dtn payload ids.
-ba88d0a7cf F1AP: upgrade dissector to v15.7.0
-591e8e55a7 XnAP: upgrade dissector to v15.5.0
-0b3397604a NAS 5GS: fix a typo
-eccca820bb NGAP: upgrade dissector to v15.5.0
-c3afba7f28 PROFINET: Adding text to Normal (non-DFP) RTC3 frames
-e78430f059 GSMTAP: implement dissecting of PTCCH/D messages
-157dc2fb22 GSM RLC/MAC: fix: account MAC header as a part of rlcmac_tree
-307b296149 SMB2: improved dissector of QUERY_INFO/SET_INFO - AdditionalInformation field
-d2a660d805 QUIC: Add Follow QUIC Stream support to Qt and tshark
-750ffac7b6 Win32: Fix a return value check.
-db68ece980 X2AP: upgrade dissector to v15.7.0
-56bb121cb9 S1AP: upgrade dissector to v15.7.0
-c2c2324ac7 Updated MMS ASN.1 file for IEC61850 Ed.2
-610c7566f2 ieee802154: handle IEEE 802.15.4e LE WUF
-c9e897aeb9 CMake: Set wireshark as Visual Studio startup project
-6a7d3150ee ieee802154: support multipurpose frames
-b5091d8cd8 ieee802154: handle IEEE 802.15.4e PAN ID compression
-79c8b446b6 TLS: fix heuristics to match a TCP segment with just a TLS record header
-b5d6c9922b sharkd_shell.py: add interactive debug shell for sharkd
-1a48b22686 travis: fix compatibility with CMake 3.15
-79fc1f164d iso14443: fix conflict/typo
-d4c5dc218b homeplug_av: fix conflict/typo
-a83ee43846 Qt: Do not use exec() in RTP dialogs
-4108b54bc1 btl2cap: Improve CoC request/response matching
-1b7261727a GSM MAP: Update to V15.5.0 (2019-06)
-ba35c23205 test: add support for pytest 5.2.0
-e21bb9f7ed CMake: Make FindWSLibrary compatible with older CMake
-145c8c6065 BSS MAP: Dissect 3.2.2.126 Selected PLMN ID
-e4ea96e80d ieee80211: Always start with hf_ieee80211 for hf field
-d1e39253ed Qt: fix unused parameter warning in ColorPreference
-149521d3de Qt: Do not call exec() when editing color preferences
-49e259f04f HNBAP: decode IMSI IE
-f67eccedd9 Qt: Do not spin unnecessary additional event loops
-ef76d65fc6 Fix checks for "do we have an ERSPAN header?"
-ef671dd085 NR RRC: upgrade dissector to v15.7.0
-770db76439 LTE RRC: upgrade dissector to v15.7.0
-459b9ad293 BSS MAP: Dissect Source Cell ID IE.
-eeff5df724 LPP: upgrade dissector to v15.5.0
-f4deb5f94b IS-IS: add missing TLV 138 dissection for l1 LSP
-e768e13479 Qt: Fix Follow Stream regression in Conversations dialog
-486c6fd07c Fix interpretation of BSO field in Type III headers.
-3367cbab17 Improve the handling of the FT (Frame Type) field in Type III headers.
-c60708d978 Fix build on Fedora 30 (minizip)
-cbcf0dfa89 QUIC: display Stream ID as decimal again
-074e1d4b2b [Automatic update for 2019-09-29]
-5db3ef90de BGP: Add dissector for BGPsec Updates.
-343adfc60e BGP: Fix indentation
-990e409273 CMake: Use glib debug dlls in Windows debug builds
-ae750dc141 macOS: Remove more obsolete documentation
-297e1e6b70 CMake: Set policy CMP0074
-c565710231 CMake: Warn if dumpcap cannot be built
-071ca80d98 CMake: Fix sdjournal.html install destination
-0b571c9ab7 Remove trigcap.c
-44963f62bd TLS: export ALPN for other dissectors
-5d0aaa7fea QUIC: display fin, offset and length for STREAM frames
-2dca23f836 macOS: Remove no-longer-relevant documentation.
-160f525e2c Docbook: Update macOS packaging.
-af793b19d0 macOS: Sign our .dmg.
-2cb18634d8 someip: Fix uint64 printf format
-3aeaf5c6fc SOMEIP: Adding support for the SOME/IP protocol.
-75dc0933c6 macOS: Sign our extra packages.
-60c9297069 macOS: Increase our .dmg compression level.
-aa3718cfb7 shellcheck: We no longer have osx-dmg.sh.in.
-b789895c1b macOS: Use dmgbuild to build our .dmg.
-96feb2a525 Fix opening manual from staging directory
-b1416fda0a macOS: Disable arrange_dmg.applescript.
-ac4f3c0f4d macOS: Make Wireshark.app drag-installable.
-1f779bf9c9  NAS EPS: unify spare bits filters
-ef81b3215c NAS-5GS: Correct dissection of Route selection descriptor contents.
-bcbc594cb0 Diameter: Add AVPs from TS32.299 V16.1.0
-e3f2c7dd1c NAS-EPS: Add dissection of 9.9.3.57 N1 UE network capability.
-0b0bc1441a Qt: Fix NULL pointer dereference on mouse click
-3c245f2f46 randpktdump: Remove misleading tooltip
-66ad175c47 wsutil: Use file descriptor in file_needs_reopen()
-7d36ae9e74 NAS 5GS: fix dissection of Mapped EPS bearer contexts IE
-d2229b368e S1AP: use SRVCC HO Indication IE to decode Source to Target Transparent Cont IE
-55f9cba667 Diameter: Extend an enum.
-0dcbe1d1f0 Diameter 3GPP: Add a comment about a bitfield.
-b08b333502 diameter: Fix file permissions
-abc6e0aa06 LCS-AP: Update to V15.3.0 (2019-09)
-41cf95c4eb win-setup: Use an environment variable to chose not to use 7zip.
-10edd0749a RRC: Partial SIB dissection in BCCH-BCH messages
-1f01322dc0 Add RADIUS dictionary for Aptilo Access Controllers
-e57aa1b0c6 NAS 5GS: Dissect more UE policy management info.
-02213cd510 Diameter: Update 3gpp AVP RAT-Type and IP-CAN-Type.
-ceb2ee2e44 rpm: use python3 to fix CentOS 7 builds
-e52f33f66c extcap: Multiple extcap instance support on Windows
-bd439c9090 Win32: Do not reload TLS keylog file on each packet
-001de56561 http2: show a clear warning when Wireshark lacks nghttp2
-983d7c3a00 QUIC: move Short Header fields under a new tree
-b43177e1f0 Qt: Fix invalid pointer for model
-7d874e2d3c RRC: do not use a freed wmem_strbuf structure
-5ba46c239c [Automatic update for 2019-09-22]
-9fff62e2a8 Qt, http2: Add Follow HTTP/2 Stream functionality
-893a2d9c62 MSVC: Warn about unused formal parameters
-29be7f9d9a Qt, docs, ieee1905: fix some spelling errors
-42b72e149a README.dissector: fix proto_tree_add_bitmask_len signature
-cf12ef2748 gitignore: Remove leftover cruft.
-e37a3b9ebf Vagrant: Fix provisioning script
-a544570546 Fix build with non-standard install prefix
-a97c157d0d macos-setup: Add minizip.
-f88dba216a Qt: QCustomplot fix warnings
-6cb9f32cf2 ieee80211: Fix nameclash in RM Report
-8428d8f899 macos-setup: Rename libtool* at configure time.
-cfb2d7eb80 macOS: Don't clobber Wireshark.app during installation.
-74bccadff2 dot11crypt: Fix crash on failure finding GTK in decrypted frame
-828ff6ddb0 Qt: Fix issues found by clang.
-3d8fe9a705 extcap: Fix type in example
-ef500e800a Update to qcustomplot 2.0.1
-6d150bdf62 RRC: Reconstruct MCC-MNC pairs in PLMN-IdentityWithOptionalMCC element
-2e174bcae0 appdata: rename updatecontact to update_contact to be more compliant
-faea600d13 appdata: added 3.0.4 release
-0958466ba1 appdata: Added releases to appdata file
-134cb9bc27 appdata: added name and summary
-655f7442ae WSDG: Add an "or".
-72eb4e5b26 WSUG: Packet list and detail context menu updates.
-c8ce89111d WSDG: Visual Studio fixes.
-fb5a029e47 Docbook: Fixup our table delimiters.
-9159c060bc Couchbase: Handle extras in mutation responses
-ac5d7af0ca pfcp: update of UP Function Features IE
-b9840149a4 ieee80211: the last bit of QoS INFO is now More Data Ack
-390c92dcb5 ieee80211: Add missing value string for HE Phy Capabilites
-f95d3a69f0 QUIC: Update to draft-23
-93a9de717d Give more complete path name of the header file in question.
-2e70fecd4e Match style of other routines in the file.
-2afc025745 Qt: Add a comment to Apply+Prepare submenus
-cacccb57db CMake: Reverse CheckPIESupported version check logic
-c556f307c9 Add support for "custom" DNS servers to be used in address resolution
-6d6376e81f Move the last of the routines from capture_info.c into ui/capture.c.
-1f2d36aa0b wsutil: Respect working directory on Windows
-88bc8ef73a [Automatic update for 2019-09-15]
-0c06fbe43d BACnet: Added missing decoding event-notification access-event (13)
-e90b2401be Add new filters for Ethernet src and dst OUI's as well as their resolved OUI's
-4853fb93b2 randpktdump: Initialize print error handler
-c0224eeeb8 Qt: Prevent crash in main window layout.
-43c053e2be BACnet: Wrong dissection device identifier
-841c27c5a0 802.11 radiotap: Fix wrong data structure in the dissector for HE TRIGGER frames
-608dbda8ee SNMP: handle Net-SNMP Engine Id of 12 octets
-b609096e43 ieee80211: remove no needed nbytes on display filter
-5c29464b7d ieee80211: Update b78 and b79 of HE PHY Capabilities Information
-b9be965b27 Qt: Store recently used find packet settings
-99ce98fe02 gsm_a_rr: Support for APDU ID ETWS
-fd492ac4c4 ISAKMP: Added support for Notify AUTH_LIFETIME Payload
-13c7adcc02 ieee80211: Update last bit (47,46,47) of HE MAC Capabilities Information
-6d6a5262aa E1AP: Add .h file needed for private IE dissection.
-3bff8f372e WSDG: Updates for Visual Studio 2019.
-ef212d0063 Netflow: Niagara Networks decodes for RADIUS IPFIX information elements.
-27ebed0a5c macos-setup: Update to libssh 0.9.0
-8ad0915c4f DLT: Fix gint64 printf format
-ed4c62e3f7 CMake: Fix extcap symlinks on macOS.
-0eecdf653e FC-dNS: add missing fields registration
-a4da8e22c9 Qt: Fix PacketTree copy Value
-7e2a24a594 DLT: Fix uint64 printf format
-d963b312d0 DLT: Adding support for the DLT protocol
-3af946e886 TDS: Improve handling of scale for TDS numeric and decimal fields.
-39bbb90e78 ieee80211: fix dissection of HE Phy Capabilities Information
-4eae6be17e DIS: Support for the EntityStateUpdate PDU
-09a8d1aa68 rsl: Add support for non-standard RSL_MSG_TYPE_OSMO_ETWS_CMD
-6cf3878a4f Kafka: Fix Dead Store
-b66b3c63a9 nvme-tcp: Add C2H/H2C TermReq dissection
-3ebf2e2d51 Kafka: Fix Dead Store
-de4efb6af7 BACNET: Update vendor ID list
-530afbf06e QUIC: fix connection tracking with empty Initial SCID
-39aba1a891 [Automatic update for 2019-09-08]
-bc1c3dc9a0 Qt UI: Warn about not saving non-PCM encoded audio
-a585a65a60 Qt UI: remove empty jitter buffer label tooltip
-241967f46e erf: Use g_get_real_time() to get real time
-aa3c5087d9 wsjson.c: do not leak memory when checking input buffer in json_validate()
-31abf81250 Windows: upgrade Npcap to 0.9983
-48bc82035e NAS 5GS: enhance dissection of QoS rules IE
-168ee5003f kafka: Cleanup to use "native" APIs.
-05e39afb3f Put the year field of the timestamp out in little-endian byte order.
-d58f8f57c1 Wiretap: Write commview files with valid headers
-f45ed90a4f WSUG: Update docs on working with captured packets
-98cda1bf46 Load environment vars to globals for efficency.
-f2162a1005 Qt: fix compilation for enabled_protocols_model.
-f0c0e1c821 Qt: Fix override declarations for PacketList
-6b74b3f82d Update tooltip text for applying display filter
-d56ad090fb Qt: in EnabledProtocolsDialog handle protocol type
-c2a7214845 Qt: Make first column moveable
-993733dda8 NAS 5GS: fix dissection of Session-AMBR/GFBR/MFBR unit
-debdd82678 OSC: Set UDP heuristic default off as this is a niche protocol.
-31756275cb ETSI Card Application Toolkit Transport: Set heuristics default off.
-fd425b195c Also don't treat an empty buffer as JSON.
-6b28772660 Strengthen the JSON validator.
-66b868d8d1 Strengthen the PacketLogger heuristics.
-45eadc049e What we're testing for is byte-swappedness, not raw endianness.
-6d15429a84 If we get a short read on the first packet in the open, don't check any more.
-cdb942944a Strengthen the I4B heuristics.
-fc2260c0b0 NAS 5GS: fix dissection of QoS flow description IE
-802cef9f05 NAS 5GS: display protocol identifier string in QoS Rule IE
-f402b4cdaa Qt: PacketList call DecodeAsDialog directly
-15a91a6d4a couchbase: update command identifiers
-c07e31c71d tshark: Add "ip" as alias for "ipv4" in -z hosts option.
-f959f203a1 Add number of comments in capture file to status bar
-8131a4cfa9 TCP: Provide display filters for "raw" SEQ/ACK.
-bd049b9cf3 IEEE802.11: Minor cleanup
-286369a758 Clean up some formatting.
-9ae6abdec9 Fix the section on Boolean fields to match reality.
-a53ec79ebc SMTP: Consider bytes seen as "data" until a command is seen
-a94a860c06 net_dm: Add dissector for drop monitor netlink packets
-743f8598cd Qt: Rework Resolved Addresses dialog
-b28952afd4 gryphon: General cleanup/improvements of dissector
-e86880bede [Automatic update for 2019-09-01]
-fc1c7155c4 IEEE 802.11: RSN Information tag, more fields optional.
-86e7a0273a isakmp: Fix Dead Store
-d81fe4d884 ieee1722: Fix Dead Store
-0318a0addb NAS 5GS: update 5GSM capability IE dissection
-bc78e78b4e NAS 5GS: fix PDU session identity dissection
-f6534b8a97 Qt: ProtoTree combine menus
-a53545c0c8 Qt: Add macro for g_list_next for C++
-b43ff70444 NAS 5GS: update 5GSM cause table
-96b4e7e571 NAS 5GS: small cleanup
-98bdb27ebb NAS 5GS: fix dissection of 5GSM capability IE
-eda16ed625 NAS 5GS: add dissection of Maximum number of supported packet filters IE
-2be248658b ASTERIX: addition of CAT021 v0.23 and v0.26 decoding
-4ee007bdd8 genl: Always call subdissector
-f753bca0de mpeg(dsmcc): Fixed default switch condition
-627917faff Gryphon: Prevent endless loop
-01d7793976 Add proto_tree_add_item_ret_time_string
-862e2acdd9 Qt: Extend filterbutton context menu
-6e240e6727 Qt: Apply Invert/Enable/Disable only to selected list
-cd8f720251 Qt: Move Apply/Prepare to general QMenu handler
-92ac2f5099 cmake: fix issue when zstd is missing.
-8806701215 DOCSIS: FDX: Added decoding for SW-RBA
-c6686fe32e eCPRI: Update value string.
-5f5a934bca Use g_hash_table_replace() when key depends on data
-05b6a9ad0b Kafka: fixed OffsetForLeaderEpoch dissection
-a1532e7b16 cmake: check minimum zstd library version.
-b3f67fa1fa kafka: remove unused hf/ei entries.
-bb7b359635 Add tooltip for clearing display filter
-698126581e SMTP: Add support for multiline responses
-c9f2b9b3ed DCERPC: workaround that pidl always emits dissect_deferred_pointers()
-df3141cb77 DCERPC: update mdssvc DCERPC dissector from upstream Samba
-b84a8e29e8 Qt: Create Apply/Prepare in Packetlist
-9bd2eef45e Qt: Add Apply/Prepare to Packet Dialog
-c9361120f0 Qt: Remove unnecessary code for context menus
-3870e6c036 Qt: Make Apply/Prepare filter independent
-a7838d9403 coap: Distinguish observe option for request and response
-d966c0dd5e coap: Improve request/response tracking
-8103070fd8 Qt: Fix memory leak in ProfileModel constructor
-2729a89353 Qt: Fix copy from default profile
-141e3e0155 SCTP: Use proto_tree_add_bitmask_list() for data chunk flags.
-dd7b09e49c Qt (zip_helper): Fix Dead Store
-6d2ea2f4bb log3gpp: fix no previous prototype for function
-18913341fa ISAKMP: Correct typos in new GDOI fields
-e55e059e9f ISAKMP: added support for GDOI
-a9fc3681f6 Qt: Move CopyFrom from menu to button
-efe2926a66 NFS: Fix hash table key memory corruption
-35056a6033 SIP: Ensure session-id is not empty
-d7a908c25c show interface name in frame line caption if set
-55dc9c0428 usb-audio: fix conflict
-ef014f76d5 tshark: Complement manual page synopsis
-b38283b3b4 [Automatic update for 2019-08-25]
-5d12f7d597 tshark: Warn on overwriting protocol filter
-976da8e7fc ELF: do not create lots of tree items for Entry Size 1
-8e925238b0 Modbus: Unit and Transaction Id for request/response identification
-3f22907e8b mpeg(dsmcc): Fixed range values
-6bd541f969 ELF: update e_machine table, update links
-e9daf6ce51 WSUG: Clean up some menu item descriptions.
-845bbb9d9f BLIP: Fix issues with message decompression
-a6eb73aacc Pegasus LSC: Added Status Codes
-6937bb521e mpeg(dsmcc): Fix Dead Store
-7519c077d0 WSUG: Update Control Protocol dissection chapter
-0f84923884 Updated EVS packet description for Compact format with bitrate.
-22fd28940a packet-ieee1722: Added TSCF and NTSCF control frames support
-a503b80080 GSM A DTAP: Try to ensure that global variable sccp_assoc is cleared.
-02006c9678 RTCP: fix reference time type
-97a19960a1 Qt: Allow deletion of personal system-profile
-ad94c4d459 Kafka: include zstd compression in Kafka message batches
-8b8ce52abc SCTP: Make association amalysis a prference defaulting to FALSE.
-6cf81c5633 Kafka: fix the name shadowing
-d4ddf3d8bb Qt: Fix null pointer dereference
-eabd1b0abb Kafka: add support for Kafka 2.3+ dissection
-d148bbec5f ZigBee OTA: Fix GetProfileResponse end time decoding
-303f6f1b39 Boost the maximum packet size for LINKTYPE_USBPCAP in pcap/pcapng.
-4278234a1d USBLL: Use custom address dissector instead of usb one
-d8385b42e2 MB-34017: Add HCS to SnapshotMarker
-437025e7c3 Qt: Initialize PacketListHeader member variables
-0fc5bf30a2 Qt: Fix PacketListHeader dereferences before null check
-22b5495485 Qt: Fix CredentialsModel::clear()
-97a9c7a12e NAS 5GS: decode LPP payload
-2d2f2df006 tds: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-b6e42f40d3 EAP: use new tls_set_appdata_dissector API to set the dissector
-9ad4f907e8 TLS: add mechanism to set the TLS appdata protocol
-e5a052fb39 obd-ii: Add support for decoding 29bit query and responses
-a1b1194024 mswsp: check pipe name in case insensitive manner
-9c760ab2ad [Automatic update for 2019-08-18]
-f002ca9949 ZigBee: Replace AT_STRINGZ with a dedicated address type
-b709c7ccc7 MAC-NR: replace the SFN/SF timestamp by SFN/Slot
-83220acb48 Revert "TLS: allow dissectors to set the appdata protocol via the data param"
-41b8c22e74 Windows: add nghttp2.pdb file to our PDB .zip
-a3c81d328f cppcheck: Make sure it's installed.
-3eea735cc1 Windows: upgrade Npcap to 0.9982, USBPcap to 1.5.3.0 and nghttp2 to 1.39.2
-32102247ce DNS: fix bytes highlight for name length and labels count
-137993eceb tvbuff.h: Fix doxygen comment of base64_to_tvb()
-646ff56fae doc+docbook: Add .guisubmenu.
-25d34da7d7 Pegasus LSC: LSC_DONE updated to send Status Code field
-a537edfdff Diameter: Add MS-CHAP/MS-CHAPv2 AVP support for EAP-TLS
-4a795a457a EAP: add support for EAP-PEAP
-f05efc5663 EAP, Diameter: add EAP-TTLS and EAP-Message dissection support
-ede7be3440 TLS: allow dissectors to set the appdata protocol via the data param
-05dc3bf2ce EAP: show expert info for bad EAP lengths
-b48b1c0e80 macos-setup: Update nghttp2 to 1.39.2.
-c4b68b4935 Wiretap: Fix temporary filename memory corruption
-81d2de9252 Try to fix Wpointer-sign warnings.
-0062c0d613 MPEG DSM-CC: Added U-N Session Messages
-17a2d94452 f5ethtrailer: fix type descripter in dissector table registration
-b04f675c06 EAP: rename some identity field
-b1412ab11d Add dissector for OsmoTRX protocol
-44fe92559b GTPv2:Add dissection of new bit in IE 8.12 Indication.
-981071806d Move parsing of specific tokens to separate functions
-fb42c24a2c User Guide: document dfilter_macros file
-6193c3a5b4 cppcheck: Fix our target selection.
-9784b1dda1 Qt: Fix importProfilesFromDir() semantics
-83bdc68c96 json: add application/problem+json to the media types handled.
-2c330b69f9 3GPP Diameter: Add nev values to AVP 21 3GPP-RAT-Type
-bc2b1a9a72 Qt: Remove unnecessary const_cast's
-2cf962b8a3 tvb: Improve documentation of base64_to_tvb.
-2a32808e50 Qt: Import zips with illegal names
-9ac61952ec Qt: Correctly identify the active profile
-4b00898a2a Qt: Prevent loop in renames of profiles
-7daf939ebc Qt: Fix translations for profiles
-1aaf590fac EAP: ignore retransmissions to avoid breaking EAP-TTLS reassembly
-1d40491b96 Diameter 3GPP: Dissect new ULR and DSR Flags.
-478b39e824 ZigBee OTA: Fix field-control dissection in OTA commands
-6ab745cdd3 nfs: Add the third version of the Hammerspace NFSv4 file handle dissector
-48ac902807 DNS: Add few DNS type full names
-f5aaea0da9 doc+docbook: More CSS tweaks.
-86a35ac6a2 cmake: allow VCSVERSION to be overridden with VCSVERSION_OVERRIDE
-b22030f712 Thread: Fix URI token passing to CoAP dissector
-1239e1fd34 ZigBee: Update ZigBee Manufacturer Codes
-7af296d9fd doc+docbook: Add .guimenuitem.
-29febdc4f3 doc+docbook: Add .guibutton and .keycap rules.
-d6a34592e1 Qt: Fix drop event for main window
-40b19131c2 EAP: force a new conversation at EAP-Request/Identify
-8a0e22b4b9 doc+docbook: Update our CSS file.
-84ff57971f QUIC: add references to the QUIC wiki
-d4c14dd11c TLS: update outdated file-level comment
-486efaedb1 make interface update libnl1 compatible
-7bd3edccf1 EAP: show reassembled TLS fragments only on the final frame
-4ce6f6040d radiotap: Comment that there are no more header bit numbers left.
-c91856a48f IEEE 802.15.4: Add conversation table and conversation filter
-5d638e83eb ZigBee: Add conversation table and conversation filter
-cae2b50b36 f5ethtrailer: generate keylog entries from the debug data
-89f041908a [Automatic update for 2019-08-11]
-e1e41c0db5 Qt: fix wrong default packet list order in Qt 5.13
-5750f24787 Qt: Correctly present numerous text on extcap
-5e1bcb8501 Qt: Fix numerous translation for extcap
-5199a0efd9 Qt: Fix coverity issues for profile model
-372fc9ff6c Qt: Fix Preference dialog translation
-a41c7aa223 Update the set of buildbots to the current reality.
-9a1d7caac3 tools: Add oxipng to compress-pngs.sh.
-0dfb50ef82 Qt: Restructure duplicateEntry to rectify copying issues
-dc4084fb82 Qt: Respect recent values on startup
-52e111e4d9 Qt: Remove unnecessary label from default copy
-293b239406 Qt: Simplify guard checks
-b69f032d03 tools: add libnl to rpm-setup.
-e0857e190c NAS-5GS: Dissect the Route selection descriptor.
-2f5d8a1780 lsd: Add support of IPv6
-6b09c1d03b NAS-5GS: Enhance Appendix D.5 dissection.
-7cd55aafe2 f5ethtrailer: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-64ff87712f s7comm: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-aa3598764e DOCSIS: correct behaviour when working with truncated messages
-8097f6a038 Qt: ProfileModel code cleanup
-fe8744026c ISO14443: Update some commands
-f86c6bd957 GTPv2: hf for spare bits must have a bitmask.
-24e43bf542 Qt: Fix profile copy with wrong profile name
-353a2dabb0 Qt: Better translation texts
-5c678288bc Qt: Check filename before import
-b31d1168f7 GSM RR: Change the TMSI/PTMSI field name
-d043439e1c Qt: Sequence Dialog simplify context menu
-94f9563f5d GTPv2: Update Cause IE.
-1ff576cbeb Diameter: Update 3GPP AVP 513 Specific-Action.
-545a3986fe Docbook: Document using middle-click to mark packets.
-686ef87306 Qt: Always store lastdir on profile import
-0f6b655db6 f5ethtrailer: Add dissection for TLS trailers
-c11fe64834 Qt: do not adjust the time origin for empty graphs
-a2b4586376 Qt: Guard no minizip build
-072fecbbd4 [Automatic update for 2019-08-04]
-4c9a012133 USBLL: Minimal destination address handling
-a4c95bcddf TDS: Fix handling of numeric and decimal types.
-e206eb2992 Use ENC_NA, not ENC_BIG_ENDIAN, for a sequence of bytes.
-ade3a6b658 Set tm_isdst before calling mktime().
-8ae710dbdc Note the Microsoft standard, fix the LZNT1 comment.
-ca432674b1 Qt: Write recent before exporting profiles
-3109f526cd test: skip some tests on big endian machines.
-b1e74c527b gitlab-ci: Add job to create debian install-packages
-9011ad1030 wiretap: Add support for Busmaster log file format
-19488f334d QUIC: add field for the QUIC packet length
-fc926c0e97 CDP: Expand dissection of capabilites
-048af39e47 Correct typo in Extcap-Options-Dialog
-6c32251bd6 Qt: Fix minizip guards
-a76044f47c Qt: Mark with middle button
-cdee7494d5 ED137: Fix Climax Time Delay.
-f259187803 Qt: Update UI for profiles and handle export/import properly
-66747a982b wsutil: link with -lm.
-c5b158bec1 Qt: Rework VOIP Dialog context menu
-6376a69675 rtps: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
-ad5db22a14 caputils: cast g_malloc pointer.
-e7852aa3ba debian-setup.sh: Correct order of apt-get update and add_package
-d286b819b7 RTPS: Filter added for detecting starts and end of coherent sets
-225068d89d MAC-NR: SRS Act-Deact CE dissection improvements.
-1b1de214c4 epan: Work around a p11-kit bug on Windows.
-6b4264cb26 MAC-NR: Call RLC dissector for SRB LCIDs using defaults.
-61004d728c Qt: Fix typo in extcap options dialog
-67dfb53dcf eth: add dst and src specific local/group fields
-af59b00f2d Qt: Check for invalid filters after coloring rules import
-0c4264f6cf Qt: Add ctx menu to start capturing packets
-cae3bec14e Qt: Remove global recent_ctx_menu
-927afac570 Qt: Check for NULL pointer in profile->reference
-5d0a2ccbb7 Qt: Change from User/System to Personal/Global profile types
-d614865c8c docbook: fix infos and commands.
-a0cdb06aba Fix shadow variable warnings, fix type error.
-679ae4c1e3 Qt: Improve numerus translation in status bar
-40af4aa93e Rename variable to eliminate shadow variable warning.
-f0cde7ca34 The next release, introducing those functions, will probably be 3.1.1.
-ecd731ca92 tools: add missing packages to bsd-setup.
-77b6160696 proto: fix proto_item_add_bitmask_tree with zero length
-53ecc16079 USBLL: Verify Token/Split packets CRC-5
-d89eb91eaf Bluetooth: SDP: add new AVRCP 1.6 supported feature flags
-cef6752648 Bluetooth: AVRCP: add new AVRCP 1.6 MediaPlayer Item feature flags
-3951759e83 Qt: avoid NULL to terminate a g_build_filename in ExportObjectModel
-04c12dd67b doc: document WIRESHARK_CONFIG_DIR
-fb055b1c4f log3gpp: Fix purpose of 'init' in proto_reg_handoff_log3gpp
-b09f249a13 Qt: Fix memory leak in zip helper
-348de74cfb Qt: Fix memory leak in Profile model
-b5c82c51bc Qt: Rename lblInfo to hintLabel
-c37cabe900 Qt: Rename profile global to system
-a5d2c5e44c Qt: Improve profile dialog messages
-806bef47a2 Qt: Add a Contextmenu for the PacketDialog
-47af39136f Qt: Fix copy from profile
-bcd19c9f86 tools: add brotli to alpine-setup.
-cfab27d464 debian/rules: reduce log spam from asn1 target
-ede4ecb8c8 [Automatic update for 2019-07-28]
-22e7952e06 HTTPS In Even More Places, update some links.
-3eb76d1c3a Point to the Wayback Machine for a now-dead link.
-245086eb83 HTTPS In Still More Places, update more URLs.
-cdee223c32 Remove trailing space.
-5cf3fd03f1 HTTPS In More Places, update some URLs.
-3a53b8643b Qt: Fix coloring rules dialog
-1759288e4e Tag routines added in 3.0.x releases appropriately.
-20800366dd HTTPS (almost) everywhere.
-99f574aecb Initialize newly-allocated iap_conversation_t before fetching packet data.
-3a137dfef0 Debian: remove symbols
-12e8b4edd3 3.1.0 > 3.1.1.
diff --git a/debian/changelog b/debian/changelog
index 3acac4d539..7287700b5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (3.1.1) unstable; urgency=low
+wireshark (3.1.2) unstable; urgency=low
 
   * Self-made package
 
diff --git a/docbook/attributes.adoc b/docbook/attributes.adoc
index 9162ef7618..0ffc71482e 100644
--- a/docbook/attributes.adoc
+++ b/docbook/attributes.adoc
@@ -1,6 +1,6 @@
 // Common attributes
 
-:wireshark-version: 3.1.1
+:wireshark-version: 3.1.2
 
 // Required for btn, kbd:, and menu: macros.
 :experimental:
diff --git a/docbook/release-notes.adoc b/docbook/release-notes.adoc
index 78068b0b06..20a3ef87dd 100644
--- a/docbook/release-notes.adoc
+++ b/docbook/release-notes.adoc
@@ -32,6 +32,11 @@ section below for more details.
 === New and Updated Features
 
 The following features are new (or have been significantly updated)
+since version 3.1.1:
+
+* Nothing of note.
+
+The following features are new (or have been significantly updated)
 since version 3.1.0:
 
 * Automatic updates are supported on macOS.