Conjure Integration with Tor Browser (!618) · Merge requests · The Tor Project / Applications / tor-browser-build · GitLab

Merge Info

Related Issues
- tor-browser#41361 (closed)
Backport Timeline
- Immediate - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- Next Minor Stable Release - patchset that needs to be verified in nightly before backport
- Eventually - patchset that needs to be verified in alpha before backport
- No Backport - patchset for the next major stable
Issue Tracking
- Link resolved issues with appropriate Release Prep issue for changelog generation

Change Description

Includes:

reproducible builds of Conjure on all platforms
integration with desktop tor browser
default ClientTransportPlugin line

Edited Jan 16, 2023 by morgan

projects/tor-expert-bundle/build

+1 −0

Changes for projects/tor-expert-bundle/build: 1 added line, 0 removed lines.
Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,7 @@ mkdir pluggable_transports && cd pluggable_transports
	tar -xkf $rootdir/[% c('input_files_by_name/obfs4') %]		tar -xkf $rootdir/[% c('input_files_by_name/obfs4') %]
	tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]		tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
	tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %]		tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %]
			tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]

	# copy in bridge lines for each pluggable transport		# copy in bridge lines for each pluggable transport
	mv $rootdir/bridges_list.obfs4.txt .		mv $rootdir/bridges_list.obfs4.txt .

projects/tor-expert-bundle/config

+2 −0

Changes for projects/tor-expert-bundle/config: 2 added lines, 0 removed lines.
Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,8 @@ input_files:
	project: snowflake		project: snowflake
	- project: webtunnel		- project: webtunnel
	name: webtunnel		name: webtunnel
			- name: conjure
			project: conjure
	- filename: pt_config.json		- filename: pt_config.json
	- filename: bridges_list.obfs4.txt		- filename: bridges_list.obfs4.txt
	- filename: bridges_list.meek-azure.txt		- filename: bridges_list.meek-azure.txt

projects/tor-expert-bundle/pt_config.json

+2 −1

Changes for projects/tor-expert-bundle/pt_config.json: 2 added lines, 1 removed line.
Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,8 @@
	"pluggableTransports" : {		"pluggableTransports" : {
	"obfs4proxy" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}obfs4proxy${pt_extension}",		"obfs4proxy" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}obfs4proxy${pt_extension}",
	"snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}",		"snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}",
	"webtunnel" : "ClientTransportPlugin webtunnel exec ${pt_path}webtunnel-client${pt_extension}"		"webtunnel" : "ClientTransportPlugin webtunnel exec ${pt_path}webtunnel-client${pt_extension}",
			"conjure" : "ClientTransportPlugin conjure exec ${pt_path}conjure-client${pt_extension} -registerURL https://registration.refraction.network/api"
	},		},
	"bridges" : {		"bridges" : {
	"meek-azure" : [		"meek-azure" : [