[tor-bugs] #10598 [Obfsproxy]: Merge ScrambleSuit v2014.01.a.

[Tor Bug Tracker & Wiki]

#10598: Merge ScrambleSuit v2014.01.a.
-----------------------------+-----------------------------------------
     Reporter:  phw          |      Owner:  asn
         Type:  enhancement  |     Status:  new
     Priority:  normal       |  Milestone:
    Component:  Obfsproxy    |    Version:
   Resolution:               |   Keywords:  pt, obfsproxy, scramblesuit
Actual Points:               |  Parent ID:
       Points:               |
-----------------------------+-----------------------------------------

Comment (by phw):

 For the record: the previous branch had a broken history.  The final
 branch is:
 https://gitweb.torproject.org/user/phw/obfsproxy.git/shortlog/refs/heads/scramblesuit_integration-6

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