diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-09-03 14:16:08 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-09-03 14:16:08 +0000 |
| commit | 999525211e1a5a22194411a4b078259137f5fe19 (patch) | |
| tree | 3927532d2baa80554b30d4d446d5250868f988a2 /SECURITY.md | |
| parent | 3c137c9f2888334596fb9f4313d4389d39afe8fd (diff) | |
| parent | b0be5d7c39d4a5f7d29db4630926a4cef7c3edce (diff) | |
| download | gnutls-999525211e1a5a22194411a4b078259137f5fe19.tar.gz | |
Merge branch 'tmp-backport-3.6' into 'gnutls_3_6_x'
Backport bug fixes from master to gnutls_3_6_x
See merge request gnutls/gnutls!1317
Diffstat (limited to 'SECURITY.md')
| -rw-r--r-- | SECURITY.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SECURITY.md b/SECURITY.md index b8d055c282..26d3e8457b 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -15,7 +15,7 @@ issues are handled with the normal release process. # Committing a fix -The fix when is made available, preferrably within 1 month of the report, +The fix when is made available, preferably within 1 month of the report, is pushed to the repository using a detailed message on all supported branches which are affected. The commit message must refer to the bug report addressed (e.g., our issue tracker or some external issue tracker). @@ -30,7 +30,7 @@ and other relevant parties to the problem. # Releasing Currently our releases are time-based, thus there are no special releases -targetting security fixes. At release time the NEWS entries must reflect +targeting security fixes. At release time the NEWS entries must reflect the issues addressed (also referring to the relevant issue trackers), and security-related entries get assigned a GNUTLS-SA (gnutls security advisory number). The assignment is done at release time at the web repository, in |