[tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5

[arma@xxxxxxxxxxxxxx]

commit 4467e5ce56e657e6063c77b8399a30416084b0da
Merge: 29a82b5 fcbb21b
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Mon Jul 28 04:09:37 2014 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5




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