summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2015-06-18 10:13:23 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2015-06-18 10:13:23 +0200
commita9f19366acb347b6346ef205628c179bc89034f2 (patch)
treeaafbe191b3080a0de5a464d5f1c4d9a52b32b083
parent39eb639ba1145cf61c557a7b6d3b9361261f93b7 (diff)
parent8cf5ed957d78da2e5e2620df52407f513f70d8b6 (diff)
downloadhosts-a9f19366acb347b6346ef205628c179bc89034f2.tar.gz
hosts-a9f19366acb347b6346ef205628c179bc89034f2.tar.zst
hosts-a9f19366acb347b6346ef205628c179bc89034f2.zip
Merge branch 'master' into android
-rw-r--r--Hiko1
-rw-r--r--Jabbah1
-rw-r--r--Lancel1
-rw-r--r--Malige1
-rw-r--r--Mercurule1
-rw-r--r--Nasmo1
-rw-r--r--Oldkary8
-rw-r--r--sakamain1
-rw-r--r--yuki2
9 files changed, 8 insertions, 9 deletions
diff --git a/Hiko b/Hiko
index a1f6879..c025428 100644
--- a/Hiko
+++ b/Hiko
@@ -1,4 +1,3 @@
1
2-----BEGIN RSA PUBLIC KEY----- 1-----BEGIN RSA PUBLIC KEY-----
3MIIBCgKCAQEA9AoiO1XveXC6of2ajm8HR6WQKTS6QWommRrHTzypZuWjywCTlb1y 2MIIBCgKCAQEA9AoiO1XveXC6of2ajm8HR6WQKTS6QWommRrHTzypZuWjywCTlb1y
4pldVxAG3BVhPBs1zbbeNNDvffSVn2WY+yZpN5vxgIS3aGALtmSF66aGnzM+yhUfa 3pldVxAG3BVhPBs1zbbeNNDvffSVn2WY+yZpN5vxgIS3aGALtmSF66aGnzM+yhUfa
diff --git a/Jabbah b/Jabbah
index 9f66703..5b03c70 100644
--- a/Jabbah
+++ b/Jabbah
@@ -6,4 +6,3 @@ MC8imUWIe2UMwihFlpARs3UrbKrOXke2ZBkXHWprQEwcUKTUPmqvH+YsCRZTHeQ3
6PhKI8PVam5CLB24XPMHLp/tGfT6L4smkJzo3EHB8Mr8znw7zYvJa/5djv69WNph+ 6PhKI8PVam5CLB24XPMHLp/tGfT6L4smkJzo3EHB8Mr8znw7zYvJa/5djv69WNph+
794tPgHTFmNIz++hcQ2YDqEtCWBK2n2WBRQIDAQAB 794tPgHTFmNIz++hcQ2YDqEtCWBK2n2WBRQIDAQAB
8-----END RSA PUBLIC KEY----- 8-----END RSA PUBLIC KEY-----
9
diff --git a/Lancel b/Lancel
index af835b1..abdb39a 100644
--- a/Lancel
+++ b/Lancel
@@ -1,4 +1,3 @@
1
2-----BEGIN RSA PUBLIC KEY----- 1-----BEGIN RSA PUBLIC KEY-----
3MIIBCgKCAQEAwpBXRSVYkovYjT1qNKrOiz+jC255j3v/BA4VPlbLdA6edfm99bSg 2MIIBCgKCAQEAwpBXRSVYkovYjT1qNKrOiz+jC255j3v/BA4VPlbLdA6edfm99bSg
4G0MzPWFByArFw/kX9/wsyx7O03dD88xXS36T2b9T6RP9yutjuJ+UTMLXobydwgbo 3G0MzPWFByArFw/kX9/wsyx7O03dD88xXS36T2b9T6RP9yutjuJ+UTMLXobydwgbo
diff --git a/Malige b/Malige
index 357fbb6..3bd3efd 100644
--- a/Malige
+++ b/Malige
@@ -1,4 +1,3 @@
1
2-----BEGIN RSA PUBLIC KEY----- 1-----BEGIN RSA PUBLIC KEY-----
3MIIBCgKCAQEArqoqbGwHmwre/ktkVqk1xMLAgM9o5OgJKGCvhDNHssJFZ6AA2WhH 2MIIBCgKCAQEArqoqbGwHmwre/ktkVqk1xMLAgM9o5OgJKGCvhDNHssJFZ6AA2WhH
4fpW62IfJoXNVzrvDrVuolTLDBvjTzEgUwaW/4d4tmoaJaPwCe1n0sZ3cZe7ZCSkY 3fpW62IfJoXNVzrvDrVuolTLDBvjTzEgUwaW/4d4tmoaJaPwCe1n0sZ3cZe7ZCSkY
diff --git a/Mercurule b/Mercurule
index e64b662..bcb1726 100644
--- a/Mercurule
+++ b/Mercurule
@@ -1,4 +1,3 @@
1
2-----BEGIN RSA PUBLIC KEY----- 1-----BEGIN RSA PUBLIC KEY-----
3MIIBCgKCAQEA1Sa3kDlpqfvbckCFbApG+w2DoKpyYfEBt8jfCa9ZhWKKKilVaz5l 2MIIBCgKCAQEA1Sa3kDlpqfvbckCFbApG+w2DoKpyYfEBt8jfCa9ZhWKKKilVaz5l
4srcyJUC9rk3mI7+nhNEquPGuxJRRXrfmAsqkaXkIq9vWJPwVLui2X7MCkrMGFxIf 3srcyJUC9rk3mI7+nhNEquPGuxJRRXrfmAsqkaXkIq9vWJPwVLui2X7MCkrMGFxIf
diff --git a/Nasmo b/Nasmo
index 27f7567..47cac48 100644
--- a/Nasmo
+++ b/Nasmo
@@ -6,4 +6,3 @@ Y9EzjahpkFCtBYyXJ6mh7G3BvkYlYyhNr5j3zaXSty8NJNUsdQlDXr9dWpt5Iv0P
6cnGc6pmk5sizU9tDQfNHuORGpVIafBxmLnv8aVT36QM8loYUXGdev+Xf4cUjgCbq 6cnGc6pmk5sizU9tDQfNHuORGpVIafBxmLnv8aVT36QM8loYUXGdev+Xf4cUjgCbq
7FX/4LtI+xTizIdqb82kNq5TXnx9nmX8tCwIDAQAB 7FX/4LtI+xTizIdqb82kNq5TXnx9nmX8tCwIDAQAB
8-----END RSA PUBLIC KEY----- 8-----END RSA PUBLIC KEY-----
9
diff --git a/Oldkary b/Oldkary
new file mode 100644
index 0000000..525571c
--- /dev/null
+++ b/Oldkary
@@ -0,0 +1,8 @@
1-----BEGIN RSA PUBLIC KEY-----
2MIIBCgKCAQEAxPrfGdIs9fItc7+KWEnTHBY5uuHGg6lqO02OavSkL7Zvz4t6N6QX
3bpQ3iUq+dOXIafFQiuOvY1zA9mcMK/ZmUBaJyaBKF40G2vQNM8rDS5ohQVMhyDrN
4pGGWvbNZpMElqKg1GHaiw+yXcXHmB5Zh4ICYYaFzWENKY7fossulc4Y7wsWzDmH3
5ntgQZuD6kBvRrv00gqrjECll0IrTQ/Ix6bYkxKc5md1kC05b34JYvtthbyzUQfow
6Fo7YmrpaS1rHyj6EQzbmYe+JNqJ1Phjm/iuE0WiMcO1IRqg+1mIuXef6IyIJ/+r4
7dg3UK8mDzDf4GzNKvayW67QNNarIXTWz0wIDAQAB
8-----END RSA PUBLIC KEY-----
diff --git a/sakamain b/sakamain
index 0dee0c8..e1b420e 100644
--- a/sakamain
+++ b/sakamain
@@ -6,4 +6,3 @@ yhYwylZtTcZJbr01SyflYsJcZovaG2PU9z+0GNvcOXOmi86XvGrOUi0NT1BqBR5C
6W3Zcxk1TqmqwQHw4kXwHHjGBw6eLu751c/TvlyUnDssPghOPJ+B3zoTkiXpHQ55Y 6W3Zcxk1TqmqwQHw4kXwHHjGBw6eLu751c/TvlyUnDssPghOPJ+B3zoTkiXpHQ55Y
7TkAauvpNvreKllxTCHi5Q9ak0l76nRDROQIDAQAB 7TkAauvpNvreKllxTCHi5Q9ak0l76nRDROQIDAQAB
8-----END RSA PUBLIC KEY----- 8-----END RSA PUBLIC KEY-----
9
diff --git a/yuki b/yuki
index 5efbbdd..2258a72 100644
--- a/yuki
+++ b/yuki
@@ -1,4 +1,3 @@
1
2-----BEGIN RSA PUBLIC KEY----- 1-----BEGIN RSA PUBLIC KEY-----
3MIIBCgKCAQEAx771Nb/xhWBmrhk6zCI9Jz/uY5K1uBruQpLgsWUp3hxpfQVTAKWD 2MIIBCgKCAQEAx771Nb/xhWBmrhk6zCI9Jz/uY5K1uBruQpLgsWUp3hxpfQVTAKWD
414xzH8QPCByu5jiaG74Pd27ngQdvd09sENnnZr7Ap3b8zWvwJpEdigppt9hDcY/v 314xzH8QPCByu5jiaG74Pd27ngQdvd09sENnnZr7Ap3b8zWvwJpEdigppt9hDcY/v
@@ -7,4 +6,3 @@ nITkz8gZbO8wWT6iWbdjHCy05vKY+iebjVDMmnRJhLBURuRIhC/X2YQi1Sgj4RI3
7w/IUngWveXhRVfXdFdIKVkPNtDod0FzkTblxRw5O1UDhr85RtQngoKBF0klrW8RW 6w/IUngWveXhRVfXdFdIKVkPNtDod0FzkTblxRw5O1UDhr85RtQngoKBF0klrW8RW
8vxTYlorSTnhwpslxZY10yMj+N4ndCFPQmQIDAQAB 7vxTYlorSTnhwpslxZY10yMj+N4ndCFPQmQIDAQAB
9-----END RSA PUBLIC KEY----- 8-----END RSA PUBLIC KEY-----
10