From 15a4d4dd831f1fabd599d4ac3ad1e761068aabe7 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Jul 2012 14:57:35 +0300 Subject: [PATCH 1/3] PGP/OTR.html.md: Add Pidgin keys. It's not converted to HTML yet, because I didn't have Pandoc on Ubuntu. --- PGP/OTR.html.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/PGP/OTR.html.md b/PGP/OTR.html.md index f8e31e8..6b8ae59 100644 --- a/PGP/OTR.html.md +++ b/PGP/OTR.html.md @@ -8,6 +8,51 @@ syntax: account || fingerprint Devgan is laptop. +# Pidgin + +I have moved to Pidgin (again). The old PSI+ keys can still be found on this page. + +``` +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +Facebook || Fingerprint: B01D4904 8A3BD352 2729758A E42D51D5 BFF44871 +GMail || Fingerprint: 8283844D 6F0CB2B5 AB23E239 AF583045 40A06B47 +MSN || Fingerprint: C1FEF252 9ABF73F8 2E4C08C2 56FB2549 EC761644 +Jabber || Fingerprint: D01ABB87 A9B77C61 BB63EE7E 9AD9E9A6 313B8978 +DukGo || Fingerprint: A62333B8 EF1D6615 9432FF5E 86BDAADE 722BCDA0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) +Comment: Homepage: http://mkaysi.github.com/ +Comment: gpg --keyserver pool.sks-keyservers.net --recv-keys 82A46728 +Comment: Public key: http://mkaysi.github.com/PGP/key.txt +Comment: Fingerprint = 24BC 1573 B8EE D666 D10A AA65 4DB5 3CFE 82A4 6728 +Comment: Why do I (clear)sign emails? http://git.io/6FLzWg +Comment: Please send plaintext instead of HTML. http://git.io/TAc0cg +Comment: Please don't toppost. http://git.io/7-VB3g +Comment: Please remove PGP lines in replies. http://git.io/nvHrDg +Comment: Charset of this message should be UTF-8. + +iQIcBAEBAgAGBQJP+XTqAAoJEE21PP6CpGcoA4IP/2pYzxCSLwr8HUYBQOIfFAqj +ooUiDCfZpK9rrEDg5EP77uxMy1jLXk74XQYNMqGlto+2tsW1c7pcwP8UyJzjDIXt +KNbwgPd5YfzDEo4LY6WWSNYOcMzqIlwN748D0pp2CRbNBDoz1xAXcjbmSuyrFl/f +VnJ3mAFmaibAV3GGzoUISs83UTka82vtH6QPwR4hjUcbze69b8z7DrAB+AKSgqY8 +ACDYriQJMjF+BJ6OamjsKZ/zZeD0c+KYN460JCAaYw3PzC+fwgd3emEtpQakIUqG +9RBL7gXtDsFsIycxmg5a9whdGhUbryzbdFusCwKggn/1y8Sn46cLmtQyPK4tLGoN +gRDg+xNc1kGKqiEvWdcpAbOtW4AoWQ2hNpHPLdouf4EV1BTW6QjHCOzwRS6rPSPx +uv7Xuj5Gn6aGHgz7DCBIox3qkkbXNcxxb3yuSteysw1azTXi/CA+nLT3yby9P5iZ +yDknZMRLSOfpVdxNmt5NMA6w/p82UahwqppgYRR0toGak5CKtfoZ5f//KzuOVmwv +8Ju55N0vJAkniTkUey6dWMSSQoPjLlZ94qXZvfDszQX7xZq/26USUZEB2UTwswrJ +eoeiqtgnQ400sksYf2uIRu5G91HSIB1/DOjgJsUVqaN8RELYeSMuBvFwgd2uRw2j +B4Vtxa7mf/z1g0mz+9/a +=nvYk +-----END PGP SIGNATURE----- +``` + +# PSI+ + +I might be using Pidgin more than PSI+. + ``` -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 From 59644a5fe27d143201669ccf5cccc1d4190332af Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Jul 2012 14:58:37 +0300 Subject: [PATCH 2/3] PGP/OTR.html: update from OTR.html.md. --- PGP/OTR.html | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/PGP/OTR.html b/PGP/OTR.html index 4053334..9f8efb4 100644 --- a/PGP/OTR.html +++ b/PGP/OTR.html @@ -3,6 +3,44 @@

syntax: account || fingerprint

Devgan

Devgan is laptop.

+

Pidgin

+

I have moved to Pidgin (again). The old PSI+ keys can still be found on this page.

+
-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+Facebook || Fingerprint: B01D4904 8A3BD352 2729758A E42D51D5 BFF44871
+GMail || Fingerprint: 8283844D 6F0CB2B5 AB23E239 AF583045 40A06B47
+MSN || Fingerprint: C1FEF252 9ABF73F8 2E4C08C2 56FB2549 EC761644
+Jabber || Fingerprint: D01ABB87 A9B77C61 BB63EE7E 9AD9E9A6 313B8978
+DukGo || Fingerprint: A62333B8 EF1D6615 9432FF5E 86BDAADE 722BCDA0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+Comment: Homepage: http://mkaysi.github.com/
+Comment: gpg --keyserver pool.sks-keyservers.net --recv-keys 82A46728
+Comment: Public key: http://mkaysi.github.com/PGP/key.txt
+Comment: Fingerprint = 24BC 1573 B8EE D666 D10A  AA65 4DB5 3CFE 82A4 6728
+Comment: Why do I (clear)sign emails? http://git.io/6FLzWg
+Comment: Please send plaintext instead of HTML. http://git.io/TAc0cg
+Comment: Please don't toppost. http://git.io/7-VB3g
+Comment: Please remove PGP lines in replies. http://git.io/nvHrDg
+Comment: Charset of this message should be UTF-8.
+
+iQIcBAEBAgAGBQJP+XTqAAoJEE21PP6CpGcoA4IP/2pYzxCSLwr8HUYBQOIfFAqj
+ooUiDCfZpK9rrEDg5EP77uxMy1jLXk74XQYNMqGlto+2tsW1c7pcwP8UyJzjDIXt
+KNbwgPd5YfzDEo4LY6WWSNYOcMzqIlwN748D0pp2CRbNBDoz1xAXcjbmSuyrFl/f
+VnJ3mAFmaibAV3GGzoUISs83UTka82vtH6QPwR4hjUcbze69b8z7DrAB+AKSgqY8
+ACDYriQJMjF+BJ6OamjsKZ/zZeD0c+KYN460JCAaYw3PzC+fwgd3emEtpQakIUqG
+9RBL7gXtDsFsIycxmg5a9whdGhUbryzbdFusCwKggn/1y8Sn46cLmtQyPK4tLGoN
+gRDg+xNc1kGKqiEvWdcpAbOtW4AoWQ2hNpHPLdouf4EV1BTW6QjHCOzwRS6rPSPx
+uv7Xuj5Gn6aGHgz7DCBIox3qkkbXNcxxb3yuSteysw1azTXi/CA+nLT3yby9P5iZ
+yDknZMRLSOfpVdxNmt5NMA6w/p82UahwqppgYRR0toGak5CKtfoZ5f//KzuOVmwv
+8Ju55N0vJAkniTkUey6dWMSSQoPjLlZ94qXZvfDszQX7xZq/26USUZEB2UTwswrJ
+eoeiqtgnQ400sksYf2uIRu5G91HSIB1/DOjgJsUVqaN8RELYeSMuBvFwgd2uRw2j
+B4Vtxa7mf/z1g0mz+9/a
+=nvYk
+-----END PGP SIGNATURE-----
+

PSI+

+

I might be using Pidgin more than PSI+.

-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 

From 3d4462f78eb6213e68d0237506a900a370034689 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen 
Date: Sun, 8 Jul 2012 15:00:34 +0300
Subject: [PATCH 3/3] PGP/OTR: fix topic sizes.

---
 PGP/OTR.html    | 5 +++--
 PGP/OTR.html.md | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/PGP/OTR.html b/PGP/OTR.html
index 9f8efb4..6ed3c92 100644
--- a/PGP/OTR.html
+++ b/PGP/OTR.html
@@ -3,7 +3,7 @@
 
syntax: account || fingerprint

 
Devgan

 
Devgan is laptop.

-
Pidgin

+
Pidgin

 
I have moved to Pidgin (again). The old PSI+ keys can still be found on this page.

 
-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
@@ -39,7 +39,7 @@ eoeiqtgnQ400sksYf2uIRu5G91HSIB1/DOjgJsUVqaN8RELYeSMuBvFwgd2uRw2j
 B4Vtxa7mf/z1g0mz+9/a
 =nvYk
 -----END PGP SIGNATURE-----

-
PSI+

+
PSI+

 
I might be using Pidgin more than PSI+.

 
-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
@@ -74,6 +74,7 @@ GoBAFxXmFKgCV3T+1F1v
 -----END PGP SIGNATURE-----

 
Ciblia

 
Ciblia is phone.

+
GibberBot

 
-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
diff --git a/PGP/OTR.html.md b/PGP/OTR.html.md
index 6b8ae59..09b63c4 100644
--- a/PGP/OTR.html.md
+++ b/PGP/OTR.html.md
@@ -8,7 +8,7 @@ syntax: account || fingerprint
 
 Devgan is laptop.
 
-# Pidgin
+## Pidgin
 
 I have moved to Pidgin (again). The old PSI+ keys can still be found on this page.
 
@@ -49,7 +49,7 @@ B4Vtxa7mf/z1g0mz+9/a
 -----END PGP SIGNATURE-----
 ```
 
-# PSI+
+## PSI+
 
 I might be using Pidgin more than PSI+.
 
@@ -91,6 +91,8 @@ GoBAFxXmFKgCV3T+1F1v
 
 Ciblia is phone.
 
+## GibberBot
+
 ```
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1