Skip to content
Snippets Groups Projects

Conjure Integration with Tor Browser

Merged Cecylia Bocovich requested to merge cohosh/tor-browser-build:conjure-desktop into main

Merge Info

  • Related Issues

  • Backport Timeline

    • Immediate - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
    • Next Minor Stable Release - patchset that needs to be verified in nightly before backport
    • Eventually - patchset that needs to be verified in alpha before backport
    • No Backport - patchset for the next major stable
  • Issue Tracking

Change Description

Includes:

  • reproducible builds of Conjure on all platforms
  • integration with desktop tor browser
  • default ClientTransportPlugin line
Edited by morgan

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
    • Resolved by morgan

      Can you squash the commit Bump to latest version of Conjure into the first one?

      Otherwise the changes look good to me.

      By the way, are you using a script to generate the projects for the go dependencies automatically? If you have a script for this I think we could add it somewhere in the tools/ directory.

  • Cecylia Bocovich added 4 commits

    added 4 commits

    • b5240312 - Bug 41361: Reproducible conjure builds
    • 3dda47b0 - Bug 41361: Add conjure line to torrc-defaults
    • d1345e78 - Bug 41361: Add conjure to tor-expert-bundle
    • 8f2dfe6c - Bug 41361: Move conjure README to the docs dir

    Compare with previous version

  • morgan changed the description

    changed the description

  • morgan resolved all threads

    resolved all threads

  • morgan changed the description

    changed the description

    • Resolved by morgan

      @cohosh Is conjure (and web tunnel for that matter) meant to be enabled on Android? If so I think we will also need to update the tor-onion-proxy-library project (but that can come in a later MR, we're going to need to tweak things there on our end).

  • morgan marked the checklist item No Backport - patchset for the next major stable as completed

    marked the checklist item No Backport - patchset for the next major stable as completed

  • morgan marked the checklist item Link resolved issues with appropriate Release Prep issue for changelog generation as completed

    marked the checklist item Link resolved issues with appropriate Release Prep issue for changelog generation as completed

  • morgan added 17 commits

    added 17 commits

    • 8f2dfe6c...7855f0b6 - 13 commits from branch tpo/applications:main
    • 22df69b4 - Bug 41361: Reproducible conjure builds
    • 19ea4e17 - Bug 41361: Add conjure line to torrc-defaults
    • 1498827b - Bug 41361: Add conjure to tor-expert-bundle
    • 15fe8719 - Bug 41361: Move conjure README to the docs dir

    Compare with previous version

  • rebased to latest and added the ClientTransportPlugin line to pt_config.json in the tor-expert-bundle project.

  • morgan resolved all threads

    resolved all threads

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading