Opened 3 weeks ago

Closed 3 weeks ago

#31058 closed task (fixed)

Remove ln5's bridges on mobile

Reported by: gk Owned by: tbb-team
Priority: High Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: tbb-bridges, tbb-mobile, tbb-parity, TorBrowserTeam201907R, GeorgKoppen201907
Cc: ln5, sysrqb Actual Points:
Parent ID: #31055 Points:
Reviewer: Sponsor:

Description

#31055 removes Linus' bridges on desktop. We need to invest a bit more effort to do the same for mobile, in particular as we won't have any obfs3 default bridges anymore.

Child Tickets

Change History (6)

comment:1 Changed 3 weeks ago by gk

Okay, bug_31058 (​https://gitweb.torproject.org/user/gk/tor-android-service.git/commit/?h=bug_31058&id=f81e8f61fd83367aead34ae0ce3b397d2ed6a494) in my tor-android-service repo and bug_31058 (​https://gitweb.torproject.org/user/gk/tor-browser.git/commit/?h=bug_31058&id=81262fe533f8608f7a83c7215d7bb34fb41e7a55) in my tor-browser repo have proposed fixes that should do it. I'll give them a test now.

comment:2 Changed 3 weeks ago by gk

Keywords: GeorgKoppen201907 added

comment:3 in reply to:  1 Changed 3 weeks ago by gk

Cc: sysrqb added
Keywords: TorBrowserTeam201907R added; TorBrowserTeam201907 removed
Status: new → needs_review

Replying to gk:

Okay, bug_31058 (​https://gitweb.torproject.org/user/gk/tor-android-service.git/commit/?h=bug_31058&id=f81e8f61fd83367aead34ae0ce3b397d2ed6a494) in my tor-android-service repo and bug_31058 (​https://gitweb.torproject.org/user/gk/tor-browser.git/commit/?h=bug_31058&id=81262fe533f8608f7a83c7215d7bb34fb41e7a55) in my tor-browser repo have proposed fixes that should do it. I'll give them a test now.

Okay, this seems to work for me, up for review then. I tweaked the commit message slightly and pushed a new branch for tor-browser (bug_31058_v2 (​https://gitweb.torproject.org/user/gk/tor-browser.git/commit/?h=bug_31058_v2&id=7b1e2fcdeea717bf24423326430625a3a36bec13)).

comment:4 Changed 3 weeks ago by sysrqb

This looks good. I'm (re-)building it now and I'll test it.

comment:5 Changed 3 weeks ago by sysrqb

Status: needs_review → merge_ready

Seems good.

comment:6 Changed 3 weeks ago by gk

Resolution: → fixed
Status: merge_ready → closed

Thanks! I merged the tor-android-service changes to master (commit f81e8f61fd83367aead34ae0ce3b397d2ed6a494) and cherry-picked the tor-browser changes to tor-browser-60.7.0esr-9.0-1 (commit a150cb8f3a47147f76bc8e98bd2d4769463a1df8) and tor-browser-60.7.0esr-8.5-1 (commit 0a490c5506b922bc386801fa7fb79d90e2ef325e).

I bumped the tor-android-service commit used in tor-browser-build on master (commit c24b91b2f5a5daf1ca8e14d54b1faa653f5b01fa) and maint-8.5 (commit 074285582eb6415431759738fcccc712d1e4bee3) respectively.

Note: See TracTickets for help on using tickets.