[Pkg-privacy-commits] [obfs4proxy] 112/151: Improve README.Debian

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfs4proxy.

commit 3a5de095cdee6ae0c1a5a9736c7b234551eeab33
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Oct 3 12:07:53 2014 +0200

    Improve README.Debian
---
 debian/README.Debian | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index b3c465e..f7e6a62 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -59,20 +59,25 @@ This is a short guide on how to setup an obfs4 bridge:
 
        ServerTransportListenAddr obfs4 0.0.0.0:40000
 
+4. (optional) Get the “Bridge” line
+
+   If you are running a private bridge or wish to give access to
+   your bridge specifically, you can read an example “Bridge” line
+   in `/var/lib/tor/pt_state/obfs4_bridgeline.txt`. The bridge
+   fingerprint is printed in Tor log messages upon startup.
+
 Using an obfs4 bridge
 ---------------------
 
-First you need to retrieve the content of the
-`/var/lib/tor/pt_state/obfs4_state.json` file on the
-server. An obfs4 bridge line requires the `node-id`, `public-key` and
-`iat-mode` arguments. The bridge fingerprint is printed in Tor log
-messages.
-
-Then, to use the obfs4, please add the following lines to
+To use an obfs4 bridge, please add the following lines to
 `/etc/tor/torrc`:
 
     ClientTransportPlugin obfs4 exec /usr/bin/obfs4proxy
     UseBridges 1
-    Bridge obfs4 192.0.2.42:40000 C2A9DC82AA7E85DB6465EC8C4B1B4B1B77787BE0 node-id=7c8174f0754d13c531707fe1cba2a5f12957321e public-key=57afe87b3827dded97233adfd7976c452a87c5da2d078aa84db0a004fefbab66 iat-mode=0
 
-Adjust the fingerprint and the options accordingly.
+Then for each bridges, add a line looking like the following one:
+
+    Bridge obfs4 192.0.2.42:40000 C2A9DC82AA7E85DB6465EC8C4B1B4B1B77787BE0 cert=VB9mQFAGV/jXguEiXDDthSlXMh1Xr+h4OCfd8ZLXySfzmipU3lmdqLsQiegtsKAE/vurZg iat-mode=0
+
+Actual Bridge lines are usually given by Tor Project's bridge database
+or by the bridge operator directly.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfs4proxy.git