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

[nickm@xxxxxxxxxxxxxx]

commit 30b8fc3e0d5a2eafa052672619aaaac733f3fa3d
Merge: 66624de fa1034c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Oct 8 16:09:45 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    Using "ours" strategy since we already merged the equivalent of #9866
    into this branch.

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