Ticket #10951: 0001-Remove-commented-obfsbridges-from-torrc.patch

File 0001-Remove-commented-obfsbridges-from-torrc.patch, 5.8 KB (added by dcf, 6 years ago)
  • Bundle-Data/beta/linux/torrc-defaults-appendix

    From ebbc23502848c11b839b130830b2757e38d09610 Mon Sep 17 00:00:00 2001
    From: David Fifield <david@bamsoftware.com>
    Date: Tue, 18 Feb 2014 09:53:48 -0800
    Subject: [PATCH] Remove commented obfsbridges from torrc.
    
    We're now pointing users to copy-paste from one of these places, until
    #10418 is done:
    
    https://trac.torproject.org/projects/tor/wiki/doc/TorBrowserBundle3FAQ#HowdoIusepluggabletransports
    https://www.torproject.org/docs/faq.html.en#PluggableTransports
    
    # Please enter the commit message for your changes. Lines starting
    # with '#' will be kept; you may remove them yourself if you want to.
    # An empty message aborts the commit.
    # On branch master
    # Your branch is ahead of 'origin/master' by 1 commit.
    #   (use "git push" to publish your local commits)
    #
    # Changes to be committed:
    #	modified:   Bundle-Data/beta/linux/torrc-defaults-appendix
    #	modified:   Bundle-Data/beta/mac/torrc-defaults-appendix
    #	modified:   Bundle-Data/beta/windows/torrc-defaults-appendix
    #
    
    # Please enter the commit message for your changes. Lines starting
    # with '#' will be kept; you may remove them yourself if you want to.
    # An empty message aborts the commit.
    # On branch master
    # Your branch is ahead of 'origin/master' by 1 commit.
    #   (use "git push" to publish your local commits)
    #
    # Changes to be committed:
    #	modified:   Bundle-Data/beta/linux/torrc-defaults-appendix
    #	modified:   Bundle-Data/beta/mac/torrc-defaults-appendix
    #	modified:   Bundle-Data/beta/windows/torrc-defaults-appendix
    #
    ---
     Bundle-Data/beta/linux/torrc-defaults-appendix   | 15 ---------------
     Bundle-Data/beta/mac/torrc-defaults-appendix     | 15 ---------------
     Bundle-Data/beta/windows/torrc-defaults-appendix | 15 ---------------
     3 files changed, 45 deletions(-)
    
    diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix
    index 2f5ad32..f19ce7d 100644
    a b  
    11
    22## obfsproxy configuration
    3 #
    4 # Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
    5 # Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
    6 # Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
    7 # Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
    8 # Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2
    9 # Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F
    10 # Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD
    11 # Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E
    12 #
    13 # Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80
    14 # Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41
    15 # Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35
    16 # Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496
    17 # Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
    183
    194ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed
    205
  • Bundle-Data/beta/mac/torrc-defaults-appendix

    diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix
    index 3738142..10c6776 100644
    a b  
    11
    22## obfsproxy configuration
    3 #
    4 # Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
    5 # Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
    6 # Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
    7 # Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
    8 # Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2
    9 # Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F
    10 # Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD
    11 # Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E
    12 #
    13 # Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80
    14 # Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41
    15 # Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35
    16 # Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496
    17 # Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
    183
    194ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed
    205
  • Bundle-Data/beta/windows/torrc-defaults-appendix

    diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix
    index 550e7b5..5c6c8e7 100644
    a b  
    11
    22## obfsproxy configuration
    3 #
    4 # Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
    5 # Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
    6 # Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
    7 # Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
    8 # Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2
    9 # Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F
    10 # Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD
    11 # Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E
    12 #
    13 # Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80
    14 # Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41
    15 # Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35
    16 # Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496
    17 # Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
    183
    194ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed
    205