Skip to content

Commit

Permalink
[dev.boringcrypto] all: merge master into dev.boringcrypto
Browse files Browse the repository at this point in the history
Change-Id: Ic1d89215bb3e37a722d3d3bc7698edea940a83d9
  • Loading branch information
FiloSottile committed Jun 27, 2019
2 parents 5c354e6 + 0b3a57b commit 98188f3
Show file tree
Hide file tree
Showing 662 changed files with 9,757 additions and 227,001 deletions.
13 changes: 13 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Security Policy

## Supported Versions

We support the past two Go releases (for example, Go 1.11.x and Go 1.12.x).

See https://golang.org/wiki/Go-Release-Cycle and in particular the
[Release Maintenance](https://github.com/golang/go/wiki/Go-Release-Cycle#release-maintenance)
part of that page.

## Reporting a Vulnerability

See https://golang.org/security for how to report a vulnerability.
12 changes: 6 additions & 6 deletions doc/contribute.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<h2 id="contributor">Becoming a contributor</h2>

<h3>Overview</h3>
<h3 id="contrib_overview">Overview</h3>

<p>
The first step is registering as a Go contributor and configuring your environment.
Expand Down Expand Up @@ -261,7 +261,7 @@ <h2 id="before_contributing">Before contributing code</h2>
an <a href="https://golang.org/issues">existing one</a>.
</p>

<h3>Check the issue tracker</h3>
<h3 id="check_tracker">Check the issue tracker</h3>

<p>
Whether you already know what contribution to make, or you are searching for
Expand Down Expand Up @@ -398,7 +398,7 @@ <h2 id="sending_a_change_gerrit">Sending a change via Gerrit</h2>
the flow.
</p>

<h3>Overview</h3>
<h3 id="gerrit_overview">Overview</h3>

<p>
This is an overview of the overall process:
Expand Down Expand Up @@ -666,7 +666,7 @@ <h2 id="commit_messages">Good commit messages</h2>
Fixes #159
</pre>

<h3>First line</h3>
<h3 id="first_line">First line</h3>

<p>
The first line of the change description is conventionally a short one-line
Expand All @@ -684,7 +684,7 @@ <h3>First line</h3>
Follow the first line by a blank line.
</p>

<h3>Main content</h3>
<h3 id="main_content">Main content</h3>

<p>
The rest of the description elaborates and should provide context for the
Expand All @@ -702,7 +702,7 @@ <h3>Main content</h3>
benchmark data for change descriptions.
</p>

<h3>Referencing issues</h3>
<h3 id="ref_issues">Referencing issues</h3>

<p>
The special notation "Fixes #12345" associates the change with issue 12345 in the
Expand Down
14 changes: 14 additions & 0 deletions doc/devel/release.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ <h3 id="go1.12.minor">Minor revisions</h3>
1.12.5 milestone</a> on our issue tracker for details.
</p>

<p>
go1.12.6 (released 2019/06/11) includes fixes to the compiler, the linker,
the go command, and the <code>crypto/x509</code>, <code>net/http</code>, and
<code>os</code> packages. See the
<a href="https://github.com/golang/go/issues?q=milestone%3AGo1.12.6">Go
1.12.6 milestone</a> on our issue tracker for details.
</p>

<h2 id="go1.11">go1.11 (released 2018/08/24)</h2>

<p>
Expand Down Expand Up @@ -154,6 +162,12 @@ <h3 id="go1.11.minor">Minor revisions</h3>
1.11.10 milestone</a> on our issue tracker for details.
</p>

<p>
go1.11.11 (released 2019/06/11) includes a fix to the <code>crypto/x509</code> package.
See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.11.11">Go
1.11.11 milestone</a> on our issue tracker for details.
</p>

<h2 id="go1.10">go1.10 (released 2018/02/16)</h2>

<p>
Expand Down
Loading

0 comments on commit 98188f3

Please sign in to comment.