[tor-commits] [tor-browser-bundle/master] Add bridge keyids where I was able to find them.

[mikeperry at torproject.org]

commit 2629af99bfcb92dae4add2c125fd3be65f67ab51
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Jan 12 17:02:11 2014 -0800

    Add bridge keyids where I was able to find them.
---
 Bundle-Data/beta/linux/torrc-defaults-appendix   |   22 +++++++++++-----------
 Bundle-Data/beta/mac/torrc-defaults-appendix     |   22 +++++++++++-----------
 Bundle-Data/beta/windows/torrc-defaults-appendix |   22 +++++++++++-----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix
index 3b4c04e..fff3147 100644
--- a/Bundle-Data/beta/linux/torrc-defaults-appendix
+++ b/Bundle-Data/beta/linux/torrc-defaults-appendix
@@ -1,20 +1,20 @@
 
 ## obfsproxy configuration
 #
-# Bridge obfs3 83.212.101.2:42782
-# Bridge obfs3 83.212.101.2:443
-# Bridge obfs3 169.229.59.75:46328
-# Bridge obfs3 169.229.59.74:31493
+# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
+# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
+# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
+# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
 # Bridge obfs3 209.141.36.236:45496
 # Bridge obfs3 208.79.90.242:35658
-# Bridge obfs3 109.105.109.163:38980
-# Bridge obfs3 109.105.109.163:47779
+# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD
+# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E
 #
-# Bridge obfs2 83.212.100.216:47870
-# Bridge obfs2 83.212.96.182:46602
-# Bridge obfs2 70.182.182.109:54542
-# Bridge obfs2 128.31.0.34:1051
-# Bridge obfs2 83.212.101.2:45235
+# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80
+# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41
+# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35
+# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496
+# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
 
 ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed
 
diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix
index 404c659..c3b90fc 100644
--- a/Bundle-Data/beta/mac/torrc-defaults-appendix
+++ b/Bundle-Data/beta/mac/torrc-defaults-appendix
@@ -1,20 +1,20 @@
 
 ## obfsproxy configuration
 #
-# Bridge obfs3 83.212.101.2:42782
-# Bridge obfs3 83.212.101.2:443
-# Bridge obfs3 169.229.59.75:46328
-# Bridge obfs3 169.229.59.74:31493
+# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
+# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
+# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
+# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
 # Bridge obfs3 209.141.36.236:45496
 # Bridge obfs3 208.79.90.242:35658
-# Bridge obfs3 109.105.109.163:38980
-# Bridge obfs3 109.105.109.163:47779
+# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD
+# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E
 #
-# Bridge obfs2 83.212.100.216:47870
-# Bridge obfs2 83.212.96.182:46602
-# Bridge obfs2 70.182.182.109:54542
-# Bridge obfs2 128.31.0.34:1051
-# Bridge obfs2 83.212.101.2:45235
+# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80
+# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41
+# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35
+# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496
+# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
 
 ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed
 
diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix
index edaa575..6ac0f95 100644
--- a/Bundle-Data/beta/windows/torrc-defaults-appendix
+++ b/Bundle-Data/beta/windows/torrc-defaults-appendix
@@ -1,20 +1,20 @@
 
 ## obfsproxy configuration
 #
-# Bridge obfs3 83.212.101.2:42782
-# Bridge obfs3 83.212.101.2:443
-# Bridge obfs3 169.229.59.75:46328
-# Bridge obfs3 169.229.59.74:31493
+# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
+# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
+# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
+# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
 # Bridge obfs3 209.141.36.236:45496
 # Bridge obfs3 208.79.90.242:35658
-# Bridge obfs3 109.105.109.163:38980
-# Bridge obfs3 109.105.109.163:47779
+# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD
+# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E
 #
-# Bridge obfs2 83.212.100.216:47870
-# Bridge obfs2 83.212.96.182:46602
-# Bridge obfs2 70.182.182.109:54542
-# Bridge obfs2 128.31.0.34:1051
-# Bridge obfs2 83.212.101.2:45235
+# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80
+# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41
+# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35
+# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496
+# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
 
 ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed