[tor-bugs] #3313 [Tor Client]: Security enhancement against malware for Tor

[Tor Bug Tracker & Wiki]

#3313: Security enhancement against malware for Tor
----------------------------+-----------------------------------------------
    Reporter:  ioerror      |       Owner:  ioerror         
        Type:  enhancement  |      Status:  needs_review    
    Priority:  normal       |   Milestone:  Tor: unspecified
   Component:  Tor Client   |     Version:                  
  Resolution:               |    Keywords:                  
      Parent:               |      Points:                  
Actualpoints:               |  
----------------------------+-----------------------------------------------

Comment(by nickm):

 That's how git represents 3-way merges: note how there are two columns of
 + and - entries rather than just 1.  The first column is stuff added and
 removed by your branch; the second column is stuff added and removed in
 master since the version of master that your branch was based on.

 I believe the change in question got made as part of the stream-isolation
 refactoring of how we configure client ports.

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