Build 1.10.6.

Change-Id: I062d763ca579febcb9b622c6cc54394c7dc25cc7
Reviewed-on: https://code.wireshark.org/review/551
Reviewed-by: Gerald Combs <gerald@wireshark.org>
1.10.6 → 1.10.7.

Change-Id: I25552020bd642e0de387427cc3b7c468f845c4b9
Reviewed-on: https://code.wireshark.org/review/553
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Fix bug 9835 disabled second media stream disables all media streams

When a single media line is rejected in an SDP answer, for example a second
'm=video' line, wireshark disables ALL media sessions, instead of just that
one.  But per the RFCs, all it should do is disable just the one RTP media
session the m= line represents. This commit fixes that, so that a disabled
media session (one with a m= port of 0) in the SDP answer only disables its
associated/paired media stream in the offer.

Conflicts:
	epan/dissectors/packet-sdp.c

Change-Id: I9bd0d3fc88b8eaa55207c9bf3f3e37da7746fd14
Reviewed-on: https://code.wireshark.org/review/526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit 058527f3f19a09c332b6877030b13dedf7414c1b)
Reviewed-on: https://code.wireshark.org/review/555
Use &GitVersion; to fix guide creation

Change-Id: I4b268d5c7f371ce8b5420586f8ea3a2ff0dd302b
Reviewed-on: https://code.wireshark.org/review/561
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Ensure that the input to strtoul ends with a null.

Otherwise it runs past the end of the array into stack memory. Should fix the
intermittent DVB-CI decryption test suite failures.

Change-Id: Ice17497e661c8579baf3a546efcb5529beda6b49
Reviewed-on: https://code.wireshark.org/review/559
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-on: https://code.wireshark.org/review/566
[Automatic manuf, services and enterprise-numbers update for 2014-03-09]

Change-Id: I3b1885b51d3f01f2ca78c994f479cce095881b1e
Reviewed-on: https://code.wireshark.org/review/570
Reviewed-by: Evan Huus <eapache@gmail.com>
Fix Bug 9853: 'Lua: trying to get/access a Preference before its registered causes a segfault'

Accessing a pref before it's registered causes a segfault, because prefs_p->next
is not being checked for NULL in wslua_proto.c:Prefs__index().

Change-Id: I270978ddb9238a9e8d2c533a96fc01ee0df385c7
Reviewed-on: https://code.wireshark.org/review/563
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/572
Revert some debugging code.

Change-Id: Ie1c99c6f99068fbe99cf06df367cedee83c31655
Reviewed-on: https://code.wireshark.org/review/591
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 20c0878ff825ea549e11c3b68371397b4f725e3a)
Reviewed-on: https://code.wireshark.org/review/598
Fix incorrect file in epan/Makefile.am when build with ENABLE_STATIC

Change-Id: I7f76e3e3d2d6f3edd2a658fccd5953393ef74ed8
Closed-bug: 9871
Reviewed-on: https://code.wireshark.org/review/596
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 1cde337fee8e8af968e872115d9c7b11a9eaa81e)
Reviewed-on: https://code.wireshark.org/review/604