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

31 Oct 2013


      commit a19e3e26f467ecbf31f2c4174d699cd1989caf7a
Merge: 4c60819 0e8ee79
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu Oct 31 13:26:33 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