master
Bug 1629553 Merge simple config.mk files r=rrelyea
Bug 2031756 - Backed out changeset 83110dba958b
bug 1237872 - Add gyp build system for NSS. r=fkiefer
Bug 2029434 - Reject overflowing quantities in nss_ZNEWARRAY and nss_ZREALLOCARRAY. r=nss-reviewers,jschanck
Bug 2012002 - remove lock instrumentation feature. r=nss-reviewers,djackson,rrelyea
Bug 1218427 - clang format on lib/base, r=rrelyea
bug 1316604 - Add variables for <(nss_dist_dir)/{public,private}. r=franziskus
Bug 1251185, NSS clang-format: else line-break fixes, r=ttaubert
Bug 1295115 - follow up to clang-format for CI, r= kaie