[tor-bugs] #33745 [Circumvention/Snowflake]: Merge a turbotunnel branch

Tor Bug Tracker & Wiki blackhole at torproject.org
Thu Apr 9 21:27:42 UTC 2020


#33745: Merge a turbotunnel branch
-------------------------------------+--------------------------
 Reporter:  dcf                      |          Owner:  dcf
     Type:  task                     |         Status:  assigned
 Priority:  Medium                   |      Milestone:
Component:  Circumvention/Snowflake  |        Version:
 Severity:  Normal                   |     Resolution:
 Keywords:  turbotunnel              |  Actual Points:
Parent ID:  #19001                   |         Points:
 Reviewer:                           |        Sponsor:
-------------------------------------+--------------------------

Comment (by dcf):

 Here's what a dependency-reduction patch for kcp-go looks like:
  * https://gitweb.torproject.org/user/dcf/tor-browser-build.git/commit/?h
 =snowflake-turbotunnel-kcp&id=6eba497377279bc9d1d7a62f64f5d168c2fbba3f
 It deletes the crypt.go and fec.go files, then introduces a new file with
 shim types for the removed types. My feeling is that this type of patch
 (only add or remove whole files) will be easier to maintain than one that
 makes changes within a file.

 I've made squashed merge branches for snowflake and tor-browser-build.
 I've started a testbuild with them. The snowflake branch uses kcp-go only,
 and removes QUIC support from the server, though the server is still
 compatible with non-turbotunnel clients. The tor-browser-build branch is
 based on [https://gitweb.torproject.org/builders/tor-browser-
 build.git/log/?h=tbb-9.5a11-build2 tbb-9.5a11-build2].
  * snowflake [https://gitweb.torproject.org/user/dcf/snowflake.git/log/?h
 =turbotunnel-merge&id=619802d12707baf5aee7091a7f1c02c3dbcaa30c
 turbotunnel-merge],
 [https://gitweb.torproject.org/user/dcf/snowflake.git/diff/?h=turbotunnel-
 merge&id=619802d12707baf5aee7091a7f1c02c3dbcaa30c&id2=8eef3b63482deb50d988e3703b7a718802cdd2f1
 cumulative diff]
  * tor-browser-build [https://gitweb.torproject.org/user/dcf/tor-browser-
 build.git/commit/?h=snowflake-turbotunnel-
 merge&id=032d66a73b20d46769e5497a5c3caea3ec4e7e23 snowflake-turbotunnel-
 merge]

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/33745#comment:6>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online


More information about the tor-bugs mailing list