[tor-bugs] #11271 [Obfsproxy]: ScrambleSuit and obfsproxy repositories should be merged

Tor Bug Tracker & Wiki blackhole at torproject.org
Mon Apr 14 11:25:51 UTC 2014


#11271: ScrambleSuit and obfsproxy repositories should be merged
-----------------------------+-------------------------------
     Reporter:  phw          |      Owner:  phw
         Type:  enhancement  |     Status:  new
     Priority:  normal       |  Milestone:
    Component:  Obfsproxy    |    Version:
   Resolution:               |   Keywords:  scramblesuit, git
Actual Points:               |  Parent ID:
       Points:               |
-----------------------------+-------------------------------

Comment (by asn):

 You are talking about moving the whole git history of scramblesuit to
 obfsproxy? That's a _lot_ of commits (> 300 commits) and most of them are
 raw and unsquashed ('Fix typo', 'Fix indentation', 'Simplify function',
 etc.). Are we sure we want to do this?

 I would personally prefer if we squash (per-ticket) the latest
 scramblesuit changes and then merge them to obfsproxy. Then from that
 point, maintain an obfsproxy repo for any future scramblesuit changes.
 Does this make sense to you?

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


More information about the tor-bugs mailing list