Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tor-browser-build
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Applications
tor-browser-build
Commits
c3c4bd9f
Commit
c3c4bd9f
authored
Oct 15, 2022
by
Cecylia Bocovich
Committed by
Richard Pospesel
Jan 31, 2023
Browse files
Options
Downloads
Patches
Plain Diff
Bug 41361: Add conjure to tor-expert-bundle
parent
76c3558e
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!618
Conjure Integration with Tor Browser
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
projects/tor-expert-bundle/build
+1
-0
1 addition, 0 deletions
projects/tor-expert-bundle/build
projects/tor-expert-bundle/config
+2
-0
2 additions, 0 deletions
projects/tor-expert-bundle/config
projects/tor-expert-bundle/pt_config.json
+2
-1
2 additions, 1 deletion
projects/tor-expert-bundle/pt_config.json
with
5 additions
and
1 deletion
projects/tor-expert-bundle/build
+
1
−
0
View file @
c3c4bd9f
...
...
@@ -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/snowflake
'
)
%
]
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
mv
$
rootdir
/
bridges_list
.
obfs4
.
txt
.
...
...
This diff is collapsed.
Click to expand it.
projects/tor-expert-bundle/config
+
2
−
0
View file @
c3c4bd9f
...
...
@@ -20,6 +20,8 @@ input_files:
project
:
snowflake
-
project
:
webtunnel
name
:
webtunnel
-
name
:
conjure
project
:
conjure
-
filename
:
pt_config.json
-
filename
:
bridges_list.obfs4.txt
-
filename
:
bridges_list.meek-azure.txt
...
...
This diff is collapsed.
Click to expand it.
projects/tor-expert-bundle/pt_config.json
+
2
−
1
View file @
c3c4bd9f
...
...
@@ -3,7 +3,8 @@
"pluggableTransports"
:
{
"obfs4proxy"
:
"ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}obfs4proxy${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"
:
{
"meek-azure"
:
[
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment