[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

#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 phw):

 Replying to [comment:3 asn]:
 > 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?

 Yes, that should be fine.  I'm starting to think that discarding
 ScrambleSuit's git history would also be acceptable.  After all, we don't
 want to keep all of it anyway and depending on how interested you are in
 its history, at some point you will have to dig into ScrambleSuit's rather
 than obfsproxy's history.  We might as well make that point point 0.
 Besides, the most recent and important changes are also documented in
 obfsproxy's changelog.  What do you think?

 > What should we do with this? Should I fix #10887 and merge my branch?
 Any chance you could give a quick review to my branch before I merge?

 Yes, I can review the branch.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/11271#comment:7>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs