Ryan VanderMeulen
2c0ace7f19
Merge inbound to m-c. a=merge
2016-11-18 15:47:05 -05:00
Carsten "Tomcat" Book
a69c372ef1
Merge mozilla-central to autoland
2016-11-18 16:57:20 +01:00
Carsten "Tomcat" Book
866da9f9c6
merge mozilla-inbound to mozilla-central a=merge
2016-11-18 16:51:17 +01:00
ffxbld
8fe9f3e253
No bug, Automated HPKP preload list update from host bld-linux64-spot-495 - a=hpkp-update
2016-11-18 06:09:07 -08:00
ffxbld
c8a1830779
No bug, Automated HSTS preload list update from host bld-linux64-spot-495 - a=hsts-update
2016-11-18 06:09:05 -08:00
ffxbld
3a09585aba
No bug, Automated HPKP preload list update from host bld-linux64-spot-421 - a=hpkp-update
2016-11-17 06:05:00 -08:00
ffxbld
5179f8fc27
No bug, Automated HSTS preload list update from host bld-linux64-spot-421 - a=hsts-update
2016-11-17 06:04:58 -08:00
Franziskus Kiefer
01e8131c3c
Bug 1317947 - land NSS 0x8219c4fd5c47, r=me
2016-11-18 06:01:13 +01:00
Wes Kocher
f9e9d69899
Merge inbound to m-c a=merge CLOSED TREE
2016-11-16 17:07:26 -08:00
ffxbld
4dc5ed3bff
No bug, Automated HPKP preload list update from host bld-linux64-spot-013 - a=hpkp-update
2016-11-16 06:23:28 -08:00
ffxbld
4610b2f32a
No bug, Automated HSTS preload list update from host bld-linux64-spot-013 - a=hsts-update
2016-11-16 06:23:26 -08:00
Carsten "Tomcat" Book
d2ed86fefb
merge autoland to mozilla-central a=merge
2016-11-16 14:04:04 +01:00
ffxbld
d54c11808a
No bug, Automated HPKP preload list update from host bld-linux64-spot-318 - a=hpkp-update
2016-11-15 06:02:24 -08:00
ffxbld
6b98ea04ea
No bug, Automated HSTS preload list update from host bld-linux64-spot-318 - a=hsts-update
2016-11-15 06:02:21 -08:00
Ted Mielczarek
a449823a50
bug 1295937 - build NSS using gyp files. r=glandium
...
MozReview-Commit-ID: Gm1PLWSJwbD
--HG--
rename : config/external/nss/moz.build => security/moz.build
rename : config/external/nss/nss.symbols => security/nss.symbols
extra : rebase_source : bedd3b2f315f8504e1d0cb1ee94720e380466e5b
2016-11-09 12:37:09 -05:00
Masatoshi Kimura
6e84800733
Bug 1248198 - Remove the "security.ssl.enable_npn" pref. r=keeler,mcmanus
...
MozReview-Commit-ID: J6nYmNAipyL
--HG--
extra : rebase_source : 26b65f99f446f4198ca1b3fd74765f96fd37d85d
2016-11-17 20:45:18 +09:00
Kan-Ru Chen
f8100451db
Bug 1314254 - Add mozilla::ipc::IPCResult type and convert IPDL handlers to use new return type. r=billm
...
We will use the new type for the generated IPDL message handler
prototype to make sure correct error handling method is called.
MozReview-Commit-ID: AzVbApxFGZ0
2016-11-15 04:26:00 +01:00
ffxbld
8f5277c12f
No bug, Automated HPKP preload list update from host bld-linux64-spot-1086 - a=hpkp-update
2016-11-14 06:09:10 -08:00
ffxbld
db430c9dc5
No bug, Automated HSTS preload list update from host bld-linux64-spot-1086 - a=hsts-update
2016-11-14 06:09:08 -08:00
Carsten "Tomcat" Book
c7a033c3e2
merge mozilla-inbound to mozilla-central a=merge
2016-11-14 10:22:06 +01:00
ffxbld
7334f76b81
No bug, Automated HPKP preload list update from host bld-linux64-spot-319 - a=hpkp-update
2016-11-13 06:05:06 -08:00
ffxbld
92a3a37457
No bug, Automated HSTS preload list update from host bld-linux64-spot-319 - a=hsts-update
2016-11-13 06:05:04 -08:00
ffxbld
cc8ca86ec6
No bug, Automated HPKP preload list update from host bld-linux64-spot-363 - a=hpkp-update
2016-11-12 06:06:52 -08:00
ffxbld
b4345b887d
No bug, Automated HSTS preload list update from host bld-linux64-spot-363 - a=hsts-update
2016-11-12 06:06:50 -08:00
Carsten "Tomcat" Book
cc5d30c616
Merge mozilla-central to mozilla-inbound
...
--HG--
extra : rebase_source : 658b3ffdfa71afff2d44129f50e50e2fbecbd06e
2016-11-11 16:43:07 +01:00
Carsten "Tomcat" Book
1863b25bd6
merge autoland to mozilla-central a=merge
2016-11-11 16:32:08 +01:00
ffxbld
3881d7f313
No bug, Automated HPKP preload list update from host bld-linux64-spot-267 - a=hpkp-update
2016-11-11 06:20:51 -08:00
ffxbld
eb7a4fd0fb
No bug, Automated HSTS preload list update from host bld-linux64-spot-267 - a=hsts-update
2016-11-11 06:20:49 -08:00
Carsten "Tomcat" Book
ebe55e2d67
merge autoland to mozilla-central a=merge
2016-11-10 16:57:59 +01:00
ffxbld
c2013c533e
No bug, Automated HPKP preload list update from host bld-linux64-spot-555 - a=hpkp-update
2016-11-10 06:09:41 -08:00
ffxbld
0fec9a7866
No bug, Automated HSTS preload list update from host bld-linux64-spot-555 - a=hsts-update
2016-11-10 06:09:39 -08:00
Carsten "Tomcat" Book
846adaea6c
merge mozilla-inbound to mozilla-central a=merge
2016-11-09 16:38:04 +01:00
Carsten "Tomcat" Book
61fea2322c
merge autoland to mozilla-central a=merge
2016-11-09 16:36:48 +01:00
ffxbld
c215ce9f71
No bug, Automated HPKP preload list update from host bld-linux64-spot-252 - a=hpkp-update
2016-11-09 06:21:45 -08:00
ffxbld
f835d23909
No bug, Automated HSTS preload list update from host bld-linux64-spot-252 - a=hsts-update
2016-11-09 06:21:43 -08:00
Franziskus Kiefer
88ef7187fb
Bug 1305970 - land NSS 5d2424d699a0, r=me
2016-11-11 14:32:54 +01:00
Wes Kocher
b0767bc340
Merge autoland to central, a=merge
2016-11-08 13:34:10 -08:00
ffxbld
26e0e0a7a0
No bug, Automated HPKP preload list update from host bld-linux64-spot-383 - a=hpkp-update
2016-11-08 06:28:33 -08:00
ffxbld
9217e6ed4d
No bug, Automated HSTS preload list update from host bld-linux64-spot-383 - a=hsts-update
2016-11-08 06:28:30 -08:00
Wes Kocher
147936ec43
Merge inbound to central, a=merge
2016-11-07 14:00:52 -08:00
ffxbld
36aecdc554
No bug, Automated HPKP preload list update from host bld-linux64-spot-539 - a=hpkp-update
2016-11-07 06:06:25 -08:00
ffxbld
ee53ffc468
No bug, Automated HSTS preload list update from host bld-linux64-spot-539 - a=hsts-update
2016-11-07 06:06:23 -08:00
ffxbld
2eb1d71918
No bug, Automated HPKP preload list update from host bld-linux64-spot-575 - a=hpkp-update
2016-11-06 06:22:32 -08:00
ffxbld
31d936cf30
No bug, Automated HSTS preload list update from host bld-linux64-spot-575 - a=hsts-update
2016-11-06 06:22:30 -08:00
Phil Ringnalda
a7bc94158c
Merge m-i to m-c, a=merge
...
MozReview-Commit-ID: H4VKCYDq5cD
--HG--
rename : xpcom/tests/TestAutoRef.cpp => xpcom/tests/gtest/TestAutoRef.cpp
rename : xpcom/tests/TestCOMArray.cpp => xpcom/tests/gtest/TestCOMArray.cpp
rename : xpcom/tests/TestCOMPtr.cpp => xpcom/tests/gtest/TestCOMPtr.cpp
rename : xpcom/tests/TestCOMPtrEq.cpp => xpcom/tests/gtest/TestCOMPtrEq.cpp
rename : xpcom/tests/TestFile.cpp => xpcom/tests/gtest/TestFile.cpp
rename : xpcom/tests/TestHashtables.cpp => xpcom/tests/gtest/TestHashtables.cpp
rename : xpcom/tests/TestID.cpp => xpcom/tests/gtest/TestID.cpp
2016-11-05 13:36:25 -07:00
Sebastian Hengst
fdf5c5ad8c
Merge mozilla-central to autoland
2016-11-05 16:55:14 +01:00
Sebastian Hengst
77bdfa9a5e
Merge mozilla-central to mozilla-inbound
2016-11-05 16:53:54 +01:00
ffxbld
edfb76ec53
No bug, Automated HPKP preload list update from host bld-linux64-spot-436 - a=hpkp-update
2016-11-05 06:06:28 -07:00
ffxbld
860af13d4c
No bug, Automated HSTS preload list update from host bld-linux64-spot-436 - a=hsts-update
2016-11-05 06:06:26 -07:00
Phil Ringnalda
6710a46887
Merge autoland to m-c, a=merge
...
MozReview-Commit-ID: ERwR70i3ZXb
2016-11-04 20:42:16 -07:00