[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
 
            
            
            
            
                24 Oct
                
                    2014
                
            
            
                24 Oct
                
                '14
                
            
            
            
        
    
                3:23 p.m.
            
        commit 1d02f64932627bf97f10416c5f36e9745db72e7b Merge: 42b4260 9e2608b Author: Nick Mathewson <nickm@torproject.org> Date: Fri Oct 24 09:23:29 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5
        4022
        
      
          Age (days ago)
        
      
        4022
        
    
          Last active (days ago)
        
        
        
        0 comments
    
    
        
        1 participants
    
    
    
    
    
    
    
    
    participants (1)
- 
                 nickm@torproject.org nickm@torproject.org