Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin J. Thompson
Tor
Commits
116dcf6c
Commit
116dcf6c
authored
13 years ago
by
Daniel 'koolfy' Faucon
Committed by
Nick Mathewson
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Make it clear that bridges should not be set in MyFamily
parent
c7cbd06d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/config/torrc.bridge.in
+2
-0
2 additions, 0 deletions
src/config/torrc.bridge.in
src/config/torrc.sample.in
+2
-0
2 additions, 0 deletions
src/config/torrc.sample.in
with
4 additions
and
0 deletions
src/config/torrc.bridge.in
+
2
−
0
View file @
116dcf6c
...
...
@@ -140,6 +140,8 @@ DirPort 9030 # what port to advertise for directory connections
## different networks. You declare it here so Tor clients can avoid
## using more than one of your relays in a single circuit. See
## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleServers
## However, you should never include a bridge's fingerprint here, as it would
## break its concealability and potentionally reveal its IP/TCP address.
#MyFamily $keyid,$keyid,...
## A comma-separated list of exit policies. They're considered first
...
...
This diff is collapsed.
Click to expand it.
src/config/torrc.sample.in
+
2
−
0
View file @
116dcf6c
...
...
@@ -144,6 +144,8 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
## different networks. You declare it here so Tor clients can avoid
## using more than one of your relays in a single circuit. See
## https://www.torproject.org/docs/faq#MultipleRelays
## However, you should never include a bridge's fingerprint here, as it would
## break its concealability and potentionally reveal its IP/TCP address.
#MyFamily $keyid,$keyid,...
## A comma-separated list of exit policies. They're considered first
...
...
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
register
or
sign in
to comment