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

31 Jul 2013


      commit 3842c1f5c99ea2de2656692a7c168daab29f855d
Merge: 904a58d 5a5147d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed Jul 31 14:03:05 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'

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

nickm＠torproject.org