Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use bundled torrc #11406

Merged
merged 1 commit into from
Dec 4, 2021
Merged

Use bundled torrc #11406

merged 1 commit into from
Dec 4, 2021

Conversation

darkdh
Copy link
Member

@darkdh darkdh commented Dec 3, 2021

Resolves brave/brave-browser#17851

Only bundled configs without specific locations or only available in runtime like pid

  • Brave Tor Client Updater needs to push a new version with bundled torrc before merging this PR (1.10.22)

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

  1. Launch Brave without this fix and open a Tor window
  2. Make sure TorClientUpdater is >= 1.10.22
  3. Navigate to https://check.torproject.org/, should be able to connect to Tor
  4. Launch Brave with this fix and open a Tor window
  5. Make sure TorClientUpdater is >= 1.10.22
  6. Navigate to https://check.torproject.org/, should be able to connect to Tor

@darkdh darkdh requested a review from bbondy December 3, 2021 01:22
@darkdh darkdh self-assigned this Dec 3, 2021
@darkdh darkdh force-pushed the torrc-bundle branch 2 times, most recently from d0af353 to a893828 Compare December 3, 2021 19:59
Copy link
Member

@bbondy bbondy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@darkdh darkdh merged commit 819c1e3 into master Dec 4, 2021
@darkdh darkdh deleted the torrc-bundle branch December 4, 2021 02:06
@darkdh darkdh added this to the 1.35.x - Nightly milestone Dec 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Security] Bundle torrc-defaults
2 participants