devapp/owners: clean up Security team ownerships

Sprinkled some Secondary owners based on common interest (Secondary
owners are essentially CC's), added myself to math/big Primary,
flattened net/http carveouts, and assigned x/crypto/acme to Roland who
has the most subject matter experience.

Change-Id: Ic09521d18e1e5bf203817caff5d857311673e1b5
Reviewed-on: https://go-review.googlesource.com/c/build/+/257999
Reviewed-by: Roland Shoemaker <roland@golang.org>
Reviewed-by: Katie Hockman <katie@golang.org>
Trust: Roland Shoemaker <roland@golang.org>
Trust: Filippo Valsorda <filippo@golang.org>
Run-TryBot: Roland Shoemaker <roland@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
diff --git a/devapp/owners/owners_test.go b/devapp/owners/owners_test.go
index 582d969..1f166c7 100644
--- a/devapp/owners/owners_test.go
+++ b/devapp/owners/owners_test.go
@@ -32,7 +32,7 @@
 			"crypto/chacha20poly1305/chacha20poly1305.go",
 			&Entry{
 				Primary:   []Owner{filippo},
-				Secondary: []Owner{agl},
+				Secondary: []Owner{agl, katie, roland},
 			},
 		},
 		{
@@ -102,7 +102,7 @@
 			},
 			map[string]*Entry{
 				"go/src/archive/zip/a.go":                     {Primary: []Owner{joetsai}, Secondary: []Owner{bradfitz}},
-				"crypto/chacha20poly1305/chacha20poly1305.go": {Primary: []Owner{filippo}, Secondary: []Owner{agl}},
+				"crypto/chacha20poly1305/chacha20poly1305.go": {Primary: []Owner{filippo}, Secondary: []Owner{agl, katie, roland}},
 			},
 		},
 	}
diff --git a/devapp/owners/table.go b/devapp/owners/table.go
index 55248d2..f180935 100644
--- a/devapp/owners/table.go
+++ b/devapp/owners/table.go
@@ -50,6 +50,7 @@
 	josharian    = gh("josharian")
 	julieqiu     = gh("julieqiu")
 	kardianos    = gh("kardianos")
+	katie        = gh("katiehockman")
 	kevinburke   = gh("kevinburke")
 	kele         = gh("kele")
 	khr          = gh("randall77")
@@ -70,6 +71,7 @@
 	prattmic     = gh("prattmic")
 	r            = gh("robpike")
 	rakoczy      = gh("toothrot")
+	roland       = gh("rolandshoemaker")
 	rsc          = gh("rsc")
 	rstambler    = gh("stamblerre")
 	sameer       = gh("Sajmani")
@@ -99,16 +101,10 @@
 
 	"crypto": {
 		Primary:   []Owner{filippo},
-		Secondary: []Owner{agl},
+		Secondary: []Owner{agl, katie, roland},
 	},
 	"crypto/acme": {
-		Primary: []Owner{filippo, x1ddos},
-	},
-	"crypto/acme/autocert": {
-		Primary:   []Owner{bradfitz, x1ddos},
-		Secondary: []Owner{filippo},
-	},
-	"crypto/ssh": {
+		Primary:   []Owner{roland, x1ddos},
 		Secondary: []Owner{filippo},
 	},
 
@@ -246,15 +242,11 @@
 	},
 	"go/src/crypto": {
 		Primary:   []Owner{filippo},
-		Secondary: []Owner{rsc},
+		Secondary: []Owner{agl, katie, roland},
 	},
 	"go/src/crypto/tls": {
 		Primary:   []Owner{filippo},
-		Secondary: []Owner{agl, rsc, kevinburke},
-	},
-	"go/src/crypto/x509": {
-		Primary:   []Owner{filippo},
-		Secondary: []Owner{agl, rsc},
+		Secondary: []Owner{agl, katie, roland, kevinburke},
 	},
 	"go/src/database/sql": {
 		Primary:   []Owner{bradfitz, kardianos},
@@ -275,7 +267,7 @@
 	},
 	"go/src/encoding/asn1": {
 		Primary:   []Owner{filippo},
-		Secondary: []Owner{agl},
+		Secondary: []Owner{agl, katie, roland},
 	},
 	"go/src/encoding/binary": {
 		Primary: []Owner{gri},
@@ -407,15 +399,16 @@
 		Primary: []Owner{gri, rsc},
 	},
 	"go/src/math/big": {
-		Primary: []Owner{gri},
+		Primary:   []Owner{gri, filippo},
+		Secondary: []Owner{katie, roland},
 	},
 	"go/src/math/bits": {
 		Primary:   []Owner{gri},
-		Secondary: []Owner{khr, josharian},
+		Secondary: []Owner{khr, josharian, filippo},
 	},
 	"go/src/math/rand": {
 		Primary:   []Owner{gri, rsc},
-		Secondary: []Owner{josharian},
+		Secondary: []Owner{josharian, filippo},
 	},
 	"go/src/mime": {
 		Primary: []Owner{bradfitz},
@@ -432,25 +425,7 @@
 	},
 	"go/src/net/http": {
 		Primary:   []Owner{bradfitz},
-		Secondary: []Owner{rsc},
-	},
-	"go/src/net/http/cgi": {
-		Primary: []Owner{bradfitz},
-	},
-	"go/src/net/http/cookiejar": {
-		Primary: []Owner{},
-	},
-	"go/src/net/http/httptest": {
-		Primary: []Owner{bradfitz},
-	},
-	"go/src/net/http/httptrace": {
-		Primary: []Owner{bradfitz},
-	},
-	"go/src/net/http/httputil": {
-		Primary: []Owner{bradfitz},
-	},
-	"go/src/net/http/internal": {
-		Primary: []Owner{bradfitz},
+		Secondary: []Owner{rsc, empijei},
 	},
 	"go/src/net/http/pprof": {
 		Primary: []Owner{rsc},
@@ -563,7 +538,7 @@
 	},
 	"go/src/testing/quick": {
 		Primary:   []Owner{},
-		Secondary: []Owner{agl},
+		Secondary: []Owner{agl, katie},
 	},
 	"go/src/text/scanner": {
 		Primary: []Owner{gri},
@@ -622,10 +597,12 @@
 		Primary: []Owner{danderson, mdlayher},
 	},
 	"net/http": {
-		Primary: []Owner{bradfitz},
+		Primary:   []Owner{bradfitz},
+		Secondary: []Owner{empijei},
 	},
 	"net/http2": {
-		Primary: []Owner{bradfitz, tombergan},
+		Primary:   []Owner{bradfitz, tombergan},
+		Secondary: []Owner{empijei},
 	},
 	"net/icmp": {
 		Primary: []Owner{mikioh},
diff --git a/internal/gophers/gophers.go b/internal/gophers/gophers.go
index c6b79b5..1632ceb 100644
--- a/internal/gophers/gophers.go
+++ b/internal/gophers/gophers.go
@@ -2372,10 +2372,10 @@
 	addPerson("Robert Xu", "robxu9@gmail.com")
 	addPerson("Robert-André Mauchin", "zebob.m@gmail.com")
 	addPerson("Roberto Clapis", "roberto@golang.org", "robclap8@gmail.com", "@empijei")
+	addPerson("Roberto Clapis", "empijei@users.noreply.github.com", "@empijei")
 	addPerson("Roberto Lublinerman Reitzes", "rluble@google.com", "@rluble")
 	addPerson("Roberto Selbach", "roberto@selbach.ca")
 	addPerson("Roberto Selbach", "roberto@selbach.ca", "@robteix")
-	addPerson("Roberto", "empijei@users.noreply.github.com", "@empijei")
 	addPerson("Robin Eklind", "r.eklind.87@gmail.com")
 	addPerson("Rodolfo Carvalho", "rhcarvalho@gmail.com", "@rhcarvalho")
 	addPerson("Rodolfo Rodriguez", "rodolfobgibson@gmail.com", "@techmexdev")
@@ -2388,8 +2388,8 @@
 	addPerson("Rohit Agarwal", "agarwalrohit@google.com")
 	addPerson("Roland Illig", "roland.illig@gmx.de")
 	addPerson("Roland Illig", "roland.illig@gmx.de", "@rillig")
+	addPerson("Roland Shoemaker", "roland@golang.org", "@rolandshoemaker")
 	addPerson("Roland Shoemaker", "rolandshoemaker@gmail.com", "12545@62eb7196-b449-3ce5-99f1-c037f21e1705")
-	addPerson("Roland Shoemaker", "rolandshoemaker@gmail.com", "@rolandshoemaker")
 	addPerson("Rollie Ma", "rollie.ma@gmail.com")
 	addPerson("Roman Budnikov", "romanyx90@yandex.ru", "23999@62eb7196-b449-3ce5-99f1-c037f21e1705")
 	addPerson("Ron Hashimoto", "mail@h2so5.net", "@h2so5")