4 Commits 6be87995b3 ... bcc2c0c2d8

Author SHA1 Message Date
  Armin Mesa bcc2c0c2d8 Nuevas contraseñas 9 years ago
  Armin Mesa 95b6ad0808 Merge branch 'master' of https://github.com/r00thouse/secretos 9 years ago
  Armin Mesa 878c070724 Merge branch 'master' of https://github.com/r00thouse/secretos 9 years ago
  Armin Mesa 7afda39f35 nueva adicion 9 years ago
2 changed files with 61 additions and 35 deletions
  1. 26 1
      keys/ahorasi.asc
  2. 35 34
      keys/meshservers.asc

+ 26 - 1
keys/ahorasi.asc

@@ -1,6 +1,30 @@
 -----BEGIN PGP MESSAGE-----
-Version: GnuPG v1
+Version: GnuPG v2
 
+<<<<<<< HEAD
+hQEMA3ROqZ9DIEQ3AQgAiWrgpybQn7V0UqURlkcDTcYFeaIyrA3j1bKpme4SP11X
++ZPIBaI8nwD5c0M0qB9xaAv5H7WgbOxuTpPjOCT1GqayA8XscIdd+dJV5XKtNCDP
+nszVI644d+s3rfh4IeQKJJ2mN5QQXff/8EhnRhlk3kAUZB1Evr9/qZ/5BVjWF2ok
+XrXDNgaFKofMjaRVFr6uYd/3GxX5ZtR5IKsl+UcDx05do8fwVR41l6t87c10cI68
+5cb78Dso+FYxAbcNC+LdkYXhfUOApkp+grJ6vHqmD5J9fgHefDQ4NlkftuRo4K+G
+Ia/b3UKrOEFadpcd22QR2YGLjd43oSZHHF43id4oTIUBDAMZzuPL5f4NfgEIAIHn
+pUhUU3Y6vb5vnZD1YfLjLM4pjfqqkPtt1ILjEVOI1QPABu0u1+Cx1db2DV7J0eAe
+WaYJ6ptO53VuJ6p/JOKZ14G0y4szg6xJ5DgY1TKqJWncl4b361o0ybY4lL/cVDM4
+bYMvhgZ0GChS1JfrvIega3SZIoOqBePoyw1EOiKf8n+nXe+iv3HysIeV91c3Zi5Q
+17Z4N3JADDl6ZDlRXCI0ubvnmuU14BEpBXnQMPLMrUoQ0SLPNgJjAt48A2kTjrkQ
+UT2h+CWocoumPAw4GordzZLoJQCG6OTkNbIhqOXTAORvCGtAaY8ZBakJBm5I/t22
+Cjq5UnYpyYLPSJeLUnfSwQwBdaNRHPVzj36fMwGmrRfss2xeXTMNIHLERUkaU9u0
+7/oSFG3SscNONN/xSRimXSv6SC1WivCFueHvCjLUFTB8L+MswXwpqIQaWC4oRHPt
+xUkS/Ombnn921iXOcd0U670rnq2ZHeOrxPqj49JTMpt+6Ayqc6RbyDQ+Pp7M3g2K
+eo0oz3+1gV1/ZOXquI6mmIF+Kfq0Vxufh1r/Lf8+KqWfrrOGv6KdG/KjGEcVCfbE
+mHdVV2M8e1U4MtRjy5fB1VpsBRIDs47YkCsmeuUZix7I65ApimzBd5AlqvG7v55A
+Vw9h3HfodhIWjTEgOghVFvf9TODDlGASZmeeeozPkFH2EGl9iZ+Lm8tADxaCZbUE
+VfRIXyfvg+hpnC8c6QCw/gJjojUFd0iNWMpg9zDlFD38ZziwKkcYLVnqO7xhOFaa
+mrRqMwLmNQ6Ep0QZEhDmoFKbzHjyJKdD5C88+S6esAL3P1uhdoDzLG1oEU6pVlOI
+nFRRg9dAOvChsMN2MQKZofUBpnB2BK0PV+pc3U3PCtRxrfAEh7ELoRXTBW2Ntw3c
+HXDxEDYVjEI3+Wum/kdpXdwzbdmOZ9G7sSWkFwRIRQMLw8mlZdRYWk6taPwG
+=P/eU
+=======
 hQEMA3ROqZ9DIEQ3AQf+KCJXaDh39nxqiVenUEzkrByKznu+U1duqdw91mjQmHk2
 6pyfjw2GY/bwvSKprMnqjk7L0jmW28yfjqP7M5ncm6DPbqoPLWnkaB0KD4UfLhMZ
 dRDqG1WyylflLDWTJUOOshaQ+bBgCnd/Rn5wtk9ehbJ43E8W37Zw3V3Yeu7WgUtB
@@ -28,4 +52,5 @@ hTOfHcX69y4Ku50ekdAz0lloJEUiGZLqTNcRcDLuZgd4UwG3Lzl9hLrc1k+2rPqU
 mKkYEiQu959ghA68DpDjaWz0V3J6VQYELF8TeVPa7CGy47WljbewXpCAXkijmExs
 jgSvC2KzpY/6MffbFyP3rpkarvUjNL1yVKH/I4CH
 =v6NB
+>>>>>>> a6c7e6c96df947a491e52622007cc65dd8d22d48
 -----END PGP MESSAGE-----

+ 35 - 34
keys/meshservers.asc

@@ -1,37 +1,38 @@
 -----BEGIN PGP MESSAGE-----
-Version: GnuPG v1
+Version: GnuPG v2
 
-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
-=8Ehp
+hQEMA3ROqZ9DIEQ3AQf+OvCiyUtjpzhBMmpbLvlMJG4fOWAoytZiBL3FXhSXx1AL
+k69ljIBA7wXnOOeCgP/WOGTGM38TYprWPlM6Qx7vvHvAmxU3i3ZG8N+r7TMUdpAo
+QlGemPgLMMcjEL8e6ioSDZ7styyjO+Z2IavRCso+QoVM4bC48zNdXiwiwywdXpgP
+ogQB+xYbf9/qZ+M8pH0WT7mPYGSUwVbrB9W9VHx3MSGeUEOCcNtyMJlQekq9xWHQ
+csQadVszH01ia8FYXRLus7AYcsufTQyASNAYRvfVNE9TNn6IQWZtEQcSVGmRcgBO
+vrDaNxXIX89IJTl7Ihn6dBKGpgp2QcVmm5sxqDtLyoUBDAMZzuPL5f4NfgEH+gNZ
+SQ1MyQoL8wFEEzD9jQ//d+AgK8JO21ai8ZHrPZFvz8sbCc8GSPywcqXGn0yr7sYE
+lu0ksBVdR71keHOqBsOOcF7ynGMJvzxbcy9O2nH/fOTEPAPzdZjKJBqJJLCZ/bhZ
+qneXzWzY0HJLETuIy1hFGteOpmHrCG+NRA+p2vtr+r5x+1xMjlG3NsqpdmWcLRGd
+wZ2U7II35jeYZt1c298JRyHFTB0+Emw/P3V/YPV/BgkGZEPBuWni25SFVdbEsleH
+mCuTesZc95iM2k8H1L7LMElof246IMz7sHq2tkkkjyWM7m4wvDUolAps8+rdzB2X
++uAAJJoa1e1i3VM3sNSFAQwDMcp37w+hocsBCACZ8UoESaSt7O5Yg/oay6hdgpvA
+mIZuaRfV9ePmXEyNZTM7b06KQbdWOd24JoQzokRf3U2sAwKBEHDp/4xLYz0GKYd0
+6GBJxaRC0nJbrrliwot3a38ixnNp2htGgjH6xwPa+gvkUilvF5Ct+sMF/ysjlT17
+T3d1dBX9Awz6SRILmXW0Ei7C75LtuNctu4TfdzXuYko6obTtO/TnXQk0N4M0tTjv
+pwBiol369IHFCvF6qpEPuV+QcbvAGOnd8WF5bml3jxMCEfGa3WOcMaPW2kqp/2qT
+XWlzKPgScBVrChKl5aLJeyyeeTc/5pUVveZuRv4xZU7tL6zAf+H3ns+xpezXhQEM
+A4t8qze96L+UAQgAysHaUbj8OCTxn5UrLRVOOXniLvx45RX20I61Im+C/DGDldRf
+6BTBt+5vb3enF26oD2MQvGDIJS+lRGMLRBtNbK3dDZs9tYxjU3QA2bRoUVF15jON
+c2zu4PqbX+QSjSQXFGIVfPXiATgkhqnKSNaMgY/jVKLwm7+vjwfczJY54esEAJ40
+S4UPRCA6DPXY3sEFh3Y7e4/GiSRbeQvffhReJ4l4tQI2f68J6GvuUUoSjz7awuHL
+XHETg0gLv1sfPh8zMegxzmfl4SqosoiAWPtnkGeXNsGtQLkAMZ6jCdNDRYvy9YAr
+QhCsB4VPgThMOxd+j6lmYcGAKrHTN+/Fc5H2wtLBFQG3zE38G92cPvZidAcOoYyU
+XsTlNOzdZBMpEcj0gT2mOj+VJI26PFPNHKrFzrJJuUrI/rE6hd5FJexeYNM2F71/
+RB0VVZvHOPvPCelyLK7dEFLHHdm8B6pWnUgYwgfI6H7vc0MISQNp+A//nbllH4UK
+sg+H7LMfYn+OUbI3aO9kl/czptSy+ZZ567djQDi1OF8g/HKKooP7qvtvuEEnvG5o
+AjxpafTFzUoo2XZiglbxTEr97dvmF//mhpLZbOG3zujYJeEsReSzLEZ6KpT/DlUq
+wYwIiFE+b8EXjfkAZ0gArTBm4cF+Q/wVcAbLxpIcts/YpYvbEUl1r6e9+cCCunl3
+y5XxFsvxlzxa4nGS1CwMesWwDqJRV/l+kmB7BskqRON6khZIgj15nMWzWgXPHDeT
+lS3V96ZSXrtt2J6hCSPc+Y6XSSsDbHd+v6YxHt3kkGq/7t8yH0XqL9dz+wQzwNYS
+E5pXlb0aonQPxtYWhaBTP2duEUT/wXJO4lmfGvJjmR29oxLkvZOQ9YL+OfELESoU
+ltXdVyLZ+nLrmP7GV1faPsqDQnK+GO9Tv+0s1PK6GBSa3fVP7VZkk+SoBH5vorRG
+zilD0hqcObrEcEmi/Lr+PZNXqlk=
+=8thr
 -----END PGP MESSAGE-----