6628684 Merge remote-tracking branch 'origin/master' into f16

Merged and Committed by Enrico Scholz 12 years ago
    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	tor.spec
    
        
file modified
+2 -0
file modified
+1 -1
file modified
+2 -2
file modified
+7 -1