This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 974
Use a different socks port number for channel ''. #14600
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diracdeltas
previously approved these changes
Jun 28, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this lgtm but i would like @bsclifton to confirm this logic since i also don't know what all the channels correspond to
bsclifton
suggested changes
Jun 28, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you actually make a separate case (with a different port number) for ''
? Local builds are their own channel (kind of)- but in the code, they are treated as dev
(we never made a local
channel)
Channel '' apparently happens for local builds, and we don't want it to step on the toes of release builds. fix #14592 This is a stop-gap measure until we use an OS-chosen socks port number or a local socket as in #12936. Auditors: @diracdeltas @bsclifton Test Plan: 1. Launch a local development build of Brave. 2. Laucnh a release build of Brave. 3. Confirm that Tor works in both.
riastradh-brave
force-pushed
the
riastradh-tor-channelsocksport
branch
from
June 28, 2018 22:32
dc06b16
to
e948fa3
Compare
riastradh-brave
changed the title
Treat channel '' like channel 'developer', not like release channel.
Use a different socks port number for channel ''.
Jun 28, 2018
bsclifton
approved these changes
Jun 28, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Beautiful 😄👌
bsclifton
added a commit
that referenced
this pull request
Jun 28, 2018
Use a different socks port number for channel ''.
bsclifton
added a commit
that referenced
this pull request
Jun 28, 2018
Use a different socks port number for channel ''.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Channel '' apparently happens for local builds, and we don't want it
to step on the toes of release builds.
fix #14592
This is a stop-gap measure until we use an OS-chosen socks port
number or a local socket as in #12936.
Auditors: @diracdeltas @bsclifton
Submitter Checklist:
git rebase -i
to squash commits (if needed).Test Plan:
Reviewer Checklist:
Tests