add config for bridges

3 files changed, 29 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1024b1504895..f984a12e1ca7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,14 +15,18 @@ pkgbase = tor-git
 	depends = libseccomp
 	depends = zstd
 	optdepends = torsocks: allow transparent SOCKS proxying
+	optdepends = obfs4proxy: obfuscating pluggable transport proxy
+	optdepends = meek: obfuscating pluggable transport proxy
 	provides = tor
 	conflicts = tor
 	backup = etc/tor/torrc
 	backup = etc/tor/torrc.d/nodes
+	backup = etc/tor/torrc.d/bridge
 	backup = etc/tor/torrc.d/transparent_proxy
 	source = git+https://git.torproject.org/tor.git#branch=master
 	source = torrc
 	source = nodes
+	source = bridge
 	source = transparent_proxy
 	source = tor.logrotate
 	source = tor.service
diff --git a/PKGBUILD b/PKGBUILD
index 4df3e6778221..f544eac9590a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,12 +14,15 @@ url="http://www.torproject.org"
 license=('BSD')
 depends=('openssl' 'libevent' 'libseccomp' 'zstd')
 makedepends=('asciidoc')
-optdepends=('torsocks: allow transparent SOCKS proxying')
+optdepends=('torsocks: allow transparent SOCKS proxying'
+            'obfs4proxy: obfuscating pluggable transport proxy'
+            'meek: obfuscating pluggable transport proxy')
 conflicts=('tor')
 provides=('tor')
 install='tor.install'
 backup=('etc/tor/torrc'
         'etc/tor/torrc.d/nodes'
+        'etc/tor/torrc.d/bridge'
         'etc/tor/torrc.d/transparent_proxy')
 
 [[ $_malloc = 'jemalloc' ]] && depends+=('jemalloc')
@@ -30,7 +33,7 @@ backup=('etc/tor/torrc'
 }
 
 source=("git+https://git.torproject.org/tor.git#branch=${_branch:-master}"
-        'torrc' 'nodes' 'transparent_proxy'
+        'torrc' 'nodes' 'bridge' 'transparent_proxy'
         'tor.logrotate' 'tor.service' 'tor.tmpfiles' 'tor.sysusers')
 sha256sums=('SKIP'
             '5e40baff0e6cdc487793453ab06155c2974cc8bb20096db98be641fcceccd328'
@@ -82,6 +85,7 @@ package() {
     install -dm750 "$pkgdir/etc/tor/torrc.d"
     install -Dm640 "$srcdir/torrc"             "$pkgdir/etc/tor/torrc"
     install -Dm640 "$srcdir/nodes"             "$pkgdir/etc/tor/torrc.d/nodes"
+    install -Dm640 "$srcdir/bridge"            "$pkgdir/etc/tor/torrc.d/bridge"
     install -Dm640 "$srcdir/transparent_proxy" "$pkgdir/etc/tor/torrc.d/transparent_proxy"
     install -Dm644 "$srcdir/tor.logrotate" "$pkgdir/etc/logrotate.d/tor"
     install -Dm644 "$srcdir/tor.service"   "$pkgdir/usr/lib/systemd/system/tor.service"
diff --git a/bridge b/bridge
new file mode 100644
index 000000000000..fcec8de30533
--- /dev/null
+++ b/bridge
@@ -0,0 +1,19 @@
+## When set, Tor will fetch descriptors for each bridge listed in the Bridge
+## config lines, and use these relays as both entry guards and directory guards.
+#UseBridges 1
+
+## When set (along with UseBridges), Tor will try to fetch bridge descriptors
+## from the configured bridge authorities when feasible. It will fall back to
+## a direct request if the authority responds with a 404.
+#UpdateBridgesFromAuthority 1
+
+## ClientTransportPlugin transport exec path-to-binary [options]
+#ClientTransportPlugin obfs4 exec /usr/bin/obfs4proxy -enableLogging -logLevel WARN
+#ClientTransportPlugin meek exec /usr/bin/meek-client --log /var/lib/tor/pt_state/meek-client.log
+
+## Bridge [transport] IP:ORPort [fingerprint]
+## https://gitweb.torproject.org/builders/tor-browser-bundle.git/plain/Bundle-Data/PTConfigs/bridge_prefs.js
+#Bridge obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0
+#Bridge obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0
+#Bridge meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com
+#Bridge meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com