Feature #7934

Upgrade to Tor 0.2.6.x

Added by intrigeri 2014-09-22 11:30:59 . Updated 2015-05-12 18:42:00 .

Status:
Resolved
Priority:
Normal
Assignee:
Category:
Target version:
Start date:
2014-09-22
Due date:
% Done:

100%

Feature Branch:
feature/8925-tor-0.2.6
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description


Subtasks

Feature #7935: Wait for Tor 0.2.6.x to be out Resolved

0

Feature #8925: Test Tor 0.2.6.x in the context of Tails Resolved

100

Feature #9147: Build Tor 0.2.6.6 with seccomp Resolved

100


Related issues

Blocks Tails - Bug #7283: Use upstream solution for Tor Launcher: Set ClientTransportPlugin according to the bridge entries Resolved 2014-05-26
Blocks Tails - Feature #9114: Investigate Tor Browser 4.5's new circuit lifetime behaviour Resolved 2015-03-26
Blocks Tails - Feature #7620: Drop Tor Launcher patch that relabels the finish button Resolved 2014-07-19
Blocks Tails - Feature #7087: Do not bundle Tor Launcher in the main Tails Git repository Resolved 2014-04-15
Blocks Tails - Feature #6840: Upstream our Tor Launcher changes Resolved 2014-05-26

History

#1 Updated by intrigeri 2014-09-22 11:31:46

  • blocks Bug #7283: Use upstream solution for Tor Launcher: Set ClientTransportPlugin according to the bridge entries added

#2 Updated by intrigeri 2015-03-02 10:32:16

  • Feature Branch set to feature/8925-tor-0.2.6

#3 Updated by intrigeri 2015-03-15 10:38:02

  • Status changed from Confirmed to In Progress
  • Target version set to Tails_1.4

#4 Updated by anonym 2015-03-31 19:50:15

  • Assignee set to anonym

#5 Updated by anonym 2015-04-01 20:58:21

At the moment all tests using Tor bridges (tor_bridges.feature and the latter half of times_syncting.feauter) are broken because this branch makes us use the Tor Launcher bundled in the Tor Browser tarball. As of Tor Browser 4.0.6 (which is what Tails use since 1.3.2) that’s Tor Launcher 0.2.7.0.2 but we use Tor Launcher 0.2.7.2 since Tails 1.3.2, which changes the order of the pages in the wizard, hence the problems with the tests.

There are two ways to fix this so this branch can be merged:

  • Temporarily reverting commit:d899831 but then we’d have to revert that revert later, and live with a downgraded Tor Launcher.
  • We split out commit:3710b2c and commit:fc6667a (into a feature/WXYZ-use-tor-browsers-bundled-tor-launcher branch) and restore the in-tree Tor Launcher 0.2.7.2 until the Tor Browser bundles it (or a higher version) and then we merge those commits back. For instance, once we merge feature/9031-tor-browser-4.5 this won’t be a problem since it installs Tor Launcher 0.2.7.3.

#6 Updated by intrigeri 2015-04-03 10:08:04

anonym wrote:
> As of Tor Browser 4.0.6 (which is what Tails use since 1.3.2) that’s Tor Launcher 0.2.7.0.2 but we use Tor Launcher 0.2.7.2 since Tails 1.3.2, which changes the order of the pages in the wizard, hence the problems with the tests.

I’m confused. Introducing the new Tor Launcher was precisely meant to fix discrepancies between Tails and Tor Browser, in that wizard (Bug #8964), and as a result we have other discrepancies, so it feels like we’ve made a mistake along the way. Anyway, no big deal :)

> There are two ways to fix this so this branch can be merged:
>
> * Temporarily reverting commit:d899831 but then we’d have to revert that revert later, and live with a downgraded Tor Launcher.

Kinda ugly, but acceptable.

> * We split out commit:3710b2c and commit:fc6667a (into a feature/WXYZ-use-tor-browsers-bundled-tor-launcher branch) and restore the in-tree Tor Launcher 0.2.7.2 until the Tor Browser bundles it (or a higher version) and then we merge those commits back. For instance, once we merge feature/9031-tor-browser-4.5 this won’t be a problem since it installs Tor Launcher 0.2.7.3.

If we go this way, we could move these two commits to feature/9031-tor-browser-4.5, then mark Feature #9031 as blocked by Feature #7934, then merge feature/8925-tor-0.2.6, then merge devel into feature/9031-tor-browser-4.5, right? Given we’re almost ready to move to Tor 0.2.6, I think I prefer this solution.

#7 Updated by anonym 2015-04-29 11:39:04

  • blocks Feature #9114: Investigate Tor Browser 4.5's new circuit lifetime behaviour added

#8 Updated by anonym 2015-04-29 11:44:37

  • blocks Feature #7620: Drop Tor Launcher patch that relabels the finish button added

#9 Updated by anonym 2015-04-29 11:46:04

  • blocks Feature #7087: Do not bundle Tor Launcher in the main Tails Git repository added

#10 Updated by anonym 2015-04-29 11:46:51

#11 Updated by anonym 2015-04-30 10:01:36

  • Assignee deleted (anonym)
  • QA Check set to Ready for QA

As stated in Feature #9114, I’ve merged feature/9114-tor-with-bug15482.patch to feature/8925-tor-0.2.6. Please merge this branch! See the merge request on @tails-dev!

#12 Updated by intrigeri 2015-05-01 04:08:14

  • Assignee set to intrigeri

Code review passes, now going to run automated tests.

#13 Updated by intrigeri 2015-05-01 10:00:10

  • Status changed from In Progress to Fix committed

Applied in changeset commit:e88f3b27b295e745eb31af186fc48879bc4a1ca0.

#14 Updated by intrigeri 2015-05-01 10:08:26

  • Assignee deleted (intrigeri)
  • QA Check changed from Ready for QA to Pass

#15 Updated by BitingBird 2015-05-12 18:42:00

  • Status changed from Fix committed to Resolved