master
Bug 1629553 Use order-prereq for $(MAKE_OBJDIR) r=rrelyea
Bug 2029791 - Reserve NUL terminator for CKA_NSS_URL in nssCKObject_GetAttributes. r=nss-reviewers,rrelyea
Bug 1965328 Implement PKCS #11 v3.2 trust objects - nss proper
bug 1237872 - Add gyp build system for NSS. r=fkiefer
Bug 1244152 - NSS clang-format: lib/dev, r=kaie
Bug 2031756 - Backed out changeset 83110dba958b
Bug 2012002 - remove lock instrumentation feature. r=nss-reviewers,djackson,rrelyea
Bug 2029765 - avoid refcount over-release in nssTokenObjectCache error path [@ nssToken_Destroy]. r=nss-reviewers,nkulatova
bug 1316604 - Add variables for <(nss_dist_dir)/{public,private}. r=franziskus
Bug 1629553 Merge simple config.mk files r=rrelyea
Bug 863871: Remove CVS keywords from NSS source files, Part 1 (trivial cases). r=wtc.