master
Bug 1423557, cryptohi: make RSA-PSS parameter check stricter, r=mt
Bug 1471985, make SECKEY_Get{Public,Private}KeyType consistent on RSA-PSS, r=rrelyea,fkiefer
Bug 2019327 - tests: add native_path helper for cross-platform path conversion. r=nss-reviewers,rrelyea
Bug 845556, reorganize NSS directory layout, moving files, very large changeset! r=wtc