Wes Kocher c0ece6bf0d Merge m-c to fx-team, a=merge ... --HG-- extra : commitid : 2bzybQqlwy0		2015-11-16 17:28:26 -08:00
..
locales	Bug 901698 - Implement OCSP-must-staple; r=keeler	2015-11-13 16:49:08 +00:00
pki	Bug 1221453 - Use ObjDirPaths for GENERATED_INCLUDES and merge with LOCAL_INCLUDES. r=gps	2015-11-06 09:59:21 +09:00
ssl	Merge m-c to fx-team, a=merge	2015-11-16 17:28:26 -08:00
tools	Bug 1224481 - Comment out CA certs removed in NSS 3.21 in PreloadedHPKPins.json to keep periodic Static HPKP updates working. r=dkeeler	2015-11-13 07:28:28 -08:00
android_stub.h	Bug 1103816 - Add support for gonk-L to android_stub.h, r=glandium	2014-12-16 21:35:09 -05:00
moz.build	Bug 1164714 - Move and flatten security/manager/boot/{public,src}/ into security/manager/ssl/. r=keeler	2015-05-26 10:31:25 -07:00