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

27 Mar 2014


      commit 0f395a7c064c314ca9dff4ac076b10461cc9b8c3
Merge: 2721246 24e0b10
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu Mar 27 15:35:11 2014 -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