[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm@xxxxxxxxxxxxxx]

commit 9fb86c82da9afff11b05783777dc83f80b835178
Merge: 7b4b137 9e44df2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Apr 23 11:04:10 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    This is an "ours" merge, to avoid taking the 0.2.4 version of the

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits