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

[Tor Bug Tracker & Wiki]

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

 Sorry for the long delay.

 asn, it looks like all the files in your `scramblesuit_merge` branch are
 identical to ScrambleSuit's `master` branch (with the single exception of
 `USE_IAT_OBFUSCATION` being `True`, which is what we want) so that's good.



 > Are we going to maintain the `doc/scramblesuit/ChangeLog` file? Should
 we add a note there saying that it's for historical purposes only or
 remove it?

 I'm OK with both but would favour removing it.  If people are interested
 in the history, they can get the original repository including its git
 history.

 > Why was def test4_ioerrorFail( self ): dropped from the state tests?

 Changes in the code made the test fail and I haven't had time to fix it
 yet.

 > Looks good to me, apart from the assert issue.

 We might want to fix that before merging this.  See
 https://trac.torproject.org/projects/tor/ticket/10887#comment:12  I could
 create a patch on top of your `bug10887_take2` branch?

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