Ticket #4905: obfsproxy-instructions-update.patch

File obfsproxy-instructions-update.patch, 14.9 KB (added by marlowe, 2 years ago)

Fixes for comment #11

  • deleted file 00:00:00

    From 065419151bf819f59f94a760d2da9877fcd429fc Mon Sep 17 00:00:00 2001
    From: Patrick R McDonald <marlowe@antagonism.org>
    Date: Fri, 27 Jan 2012 13:40:06 -0500
    Subject: [PATCH] Update obfsproxy instructions per armadev and asn's comments
    
    ---
     images/obfs-torrc_bridge.png           |  Bin 4200 -> 0 bytes
     images/obfs-torrc_client.png           |  Bin 5890 -> 0 bytes
     projects/en/obfsproxy-instructions.wml |   23 ++++++++++++++++++++---
     3 files changed, 20 insertions(+), 3 deletions(-)
     delete mode 100644 images/obfs-torrc_bridge.png
     delete mode 100644 images/obfs-torrc_client.png
    
    diff --git a/images/obfs-torrc_bridge.png b/images/obfs-torrc_bridge.png
    deleted file mode 100644
    index e03dd84c90fc36407901bad26ea90a8cbb148244..0000000000000000000000000000000000000000
    GIT binary patch
    literal 0
    HcmV?d00001
  • deleted file literal

    literal 4200
    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
    
    diff --git a/images/obfs-torrc_client.png b/images/obfs-torrc_client.png
    deleted file mode 100644
    index dc6bcdf4c7d868aed5f49403e8f4f8354fc146a3..0000000000000000000000000000000000000000
    GIT binary patch
    literal 0
    HcmV?d00001
  • projects/en/obfsproxy-instructions.wml

    literal 5890
    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
    
    diff --git a/projects/en/obfsproxy-instructions.wml b/projects/en/obfsproxy-instructions.wml
    index 537ae1d..2023314 100644
    a b  
    2828 
    2929    <p> 
    3030    In a Linux system using the APT package manager you could do: <br> 
    31     <tt># apt-get install autotools gcc git libevent-2.0-5 libevent-openssl-2.0-5 libssl-dev</tt> 
     31    <tt># apt-get install autotools-dev gcc git libevent-2.0-5 libevent-openssl-2.0-5 libssl-dev</tt> 
    3232    </p> 
    3333 
    3434    <p> 
     
    6060 
    6161    <p> 
    6262    Set up your Tor configuration file:<br><br> 
    63     <img src="$(IMGROOT)/obfs-torrc_client.png" alt="client torrc"></a> 
     63    User tor<br> 
     64    PIDFile /usr/local/var/run/tor/tor.pid<br> 
     65    SocksPort 1999 # what port to open for local application connections<br> 
     66    Log notice file /usr/local/var/log/tor/tor.log<br> 
     67    DataDirectory /usr/local/var/lib/tor/data<br> 
     68    UseBridges 1<br> 
     69    Bridge obfs2 192.0.2.34:34545<br> 
     70    ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed 
     71    </p> 
     72 
     73    <p>Replace <em>192.0.2.34</em> with the bridge supporting obfsproxy you 
     74    wish to use and <em>34545</em> with the port number the bridge uses. 
    6475    </p> 
    6576 
    6677    <p> 
     
    8899 
    89100    <p> 
    90101    Set up your Tor configuration file:<br><br> 
    91     <img src="$(IMGROOT)/obfs-torrc_bridge.png" alt="bridge torrc"></a> 
     102    User tor<br> 
     103    PIDFile /usr/local/var/run/tor/tor.pid<br> 
     104    ORPort 4367<br> 
     105    Log notice file /usr/local/var/log/tor/tor.log<br> 
     106    DataDirectory /usr/local/var/lib/tor/data<br> 
     107    BridgeRelay 1<br> 
     108    ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed 
    92109    </p> 
    93110 
    94111    <p>