Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
Trac
Trac
  • Project overview
    • Project overview
    • Details
    • Activity
  • Issues 246
    • Issues 246
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Operations
    • Operations
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Create a new issue
  • Issue Boards

GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

  • Legacy
  • TracTrac
  • Issues
  • #32024

Closed (moved)
Open
Opened Oct 09, 2019 by boklm@boklm

In tor-android-services, document where the code we imported comes from

In tor-android-service, we have commit 36f9873ff075253f4c1c9e394c91031fd4ba9d4a which is adding a bunch of code: https://gitweb.torproject.org/tor-android-service.git/commit/?id=36f9873ff075253f4c1c9e394c91031fd4ba9d4a

However it seems that this code has been taken from various other places, but there is no indication of where.

Ideally we would have kept history of the projects we imported code from (for example with git filter-branch), or just used sub-modules if we did not modify them. But since we didn't do that, I think we should at least put somewhere the information about where all the code we include comes from.

For example the jsocksAndroid directory seems to be imported from https://github.com/guardianproject/jsocks or maybe https://github.com/ravn/jsocks, but there is no indication of that, or which commit was used. The directory service/ looks similar to https://github.com/guardianproject/orbot/tree/master/orbotservice, but there is no indication that it was imported from there, or which commit was used.

I am also wondering why we have both jsocksAndroid/ and external/jsocks/.

We also have a LICENSE file containing the Apache License, but it is unclear to what it applies since this is neither the license of Orbot of jsocks.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
None
Due date
None
Reference: legacy/trac#32024