summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-09 02:20:39 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-09 02:20:39 -0300
commit15abb4277ad27253c1260d39bd22b8bc0353f3ee (patch)
tree8f5212c723f703f52279c9610d77e932a9ea3c5d
parenta4e695c512cecb48bc349ff54ddc874203ae8101 (diff)
adding Javier Barcena <javierbuilder@gmail.com>
-rw-r--r--authorized_keys1
-rw-r--r--parabola-keyring/Makefile2
-rw-r--r--parabola-keyring/packager-keyids1
-rw-r--r--parabola-keyring/parabola-trusted1
4 files changed, 4 insertions, 1 deletions
diff --git a/authorized_keys b/authorized_keys
index b8fe208..b26b1d6 100644
--- a/authorized_keys
+++ b/authorized_keys
@@ -25,3 +25,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQC4rlCe6LBEXLgchO0z/Cx8inNwuTmW6mSGxtUE3Jrv
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDth/6LYAf6KqShPsliqs22qlz5eLw5TkikjqLKKr9GUOL1I4Sip7jct0rbsmegzJ0NVMfvJrqMQR6D5brb3rVR/JymvG/+jhMo3HjPU0iC/DAlj6ZPGBgw6lE9wqDR7ZkyZKfAMz9Osx78aMXwdLZDEitoGCSvFy26XVaS5YXibIVcpxVc0rWrdbo6fF6WklIMJxDcqP2A8cwUot1WTABpKVtsFbtMtiyEndmcoXn4qudunFS46yFQ9DU9UkWYsz3ZBnWjpYeKmKxtyquAH0kD9CxmyHshAyNGoNTYT94rj+fDGwOcRdgmvkQLuXdSlkAA/5OOzGpxxjN7PsLMeFRz "Harry Prevor <habstinat@gmail.com>"
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCr4f39/SpmrgR8qNj2spPLNS3ZaaEY82JOv+XUKR1QNWbRtimCtXyPmIOCKx2D/V0WAzLaRs8WDrK28RMv2ZN/pDwGYBubmQUp+dOrdDdmks6lUMsK4Q5kM2ZZEd5yqSC5FWCAJG8oIbWCPbMXNciHjy0ZLVpwBpgJf3bEnfc/+q2YufTH4C6girRcBExuk21DckPu9L4iHEWq60O7hG8hy/IbL7rCuGhUF3tYm+9v3yROn1mN6l4WcsT/BDVqpFw9PDTyGqqu4cbfrvmoZ1+ghCzXK+7fu1PaxE890iSGpuqyzA677f8zuzOaCOJk+SVeFqJvRAF3ehOS8O9v01SB Drtan Samos (drtan@lavabit.com)
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCfm8nzwgXNSSxcakjSGXdvMMLeJZvRJj/B81y5t7BN22Diciv2dFtw0QFNqtBRB1OW5ASrCEez+0/f3seOijaHUO2ZNddhg4j3co1S/DFY6lBD/VBE3zFeafTe6Kn+a8b2HZ5ndYTw3HugwieqGEjLdhsn7h5ulm/SBVGZo2s9XMXgSjxfdUYthNxZaySIDQZ2lLvFq1hmdSp9fKq82MimqWR0Xpm4CB0gUic7WUHOLJGJMwXU4fRygVU8azc2hrJ4ZWtf2hpgQJUAK0lxoN/5pVLmQa24Gp3jkAWPrv7o9YOqrWfjzpeXMkA2LbbzINDm7X4uQxfNpuL/EaKks4x "Guest One <theguestone@gmail.com>"
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCynovB+LlVJAe4h9Gay+39fmin2gzQktrYrv4robOT0Cjo/4xCvyLGvRZr9Cwo2b2lV5lAcaaFMNZ3hQvGlSukkVDSxRTmYA0HBQfteKA7LfQ5Ray8NAcLN/1IZa/XbiId1U9C1oYL+nE9SyOUuzGafT0/fqNk4ruWG6jaOwsmlA8d+va50qKLOUg8CgTLxXbG6GJ5docH9uypoELgi8yxWVHu1e4OyY+SI8/n7c48MVLOGLWBsxMh0ZpjVrFW1MXObooE97rVbvjFezL31LfepfbQuUlqkw7pn6otPg05FD8fTDWvneuq54sbnbOlVbBzKaFMVfd+lxWuebZBIQQX "Javier Barcena <javierbuilder@gmail.com>"
diff --git a/parabola-keyring/Makefile b/parabola-keyring/Makefile
index e7fb8ab..7e82097 100644
--- a/parabola-keyring/Makefile
+++ b/parabola-keyring/Makefile
@@ -1,4 +1,4 @@
-V=20130529
+V=20130609
PREFIX = /usr/local
diff --git a/parabola-keyring/packager-keyids b/parabola-keyring/packager-keyids
index 7d62672..47428d1 100644
--- a/parabola-keyring/packager-keyids
+++ b/parabola-keyring/packager-keyids
@@ -7,6 +7,7 @@ B70107A3E6A744682A22208D7D19D1AFDD312BBE encyclomundi
49F707A1CB366C580E625B3C456032D717A4CD9C fauno
E511343A987CB73D883EFB7E5CECF9F86574BEF2 guestone
0164B3A70D698FC77420BC426DAFB5EDF426E4B1 habstinat
+DA808EA82C6BC5ABA73FC7C47FF126D64348FE04 javierbuilder
6A2C273EDD3F3EFBFD778FBE37F6873B8EC2FF36 jesse
5519848081FC9E63F5F28659F6A3F50DFEFB7F29 joe
8C3F8ABD30DF2AFAC6C039A45906AB5E9AAD00E5 jorginho
diff --git a/parabola-keyring/parabola-trusted b/parabola-keyring/parabola-trusted
index 17ded0c..c7f1580 100644
--- a/parabola-keyring/parabola-trusted
+++ b/parabola-keyring/parabola-trusted
@@ -7,6 +7,7 @@ B70107A3E6A744682A22208D7D19D1AFDD312BBE:4:
49F707A1CB366C580E625B3C456032D717A4CD9C:4:
E511343A987CB73D883EFB7E5CECF9F86574BEF2:4:
0164B3A70D698FC77420BC426DAFB5EDF426E4B1:4:
+DA808EA82C6BC5ABA73FC7C47FF126D64348FE04:4:
6A2C273EDD3F3EFBFD778FBE37F6873B8EC2FF36:4:
5519848081FC9E63F5F28659F6A3F50DFEFB7F29:4:
8C3F8ABD30DF2AFAC6C039A45906AB5E9AAD00E5:4: