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

7 Feb 2014


      commit 2d41cab1502666eaace21f10385964737d246388
Merge: 1b93e3c 9e2de8c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu Feb 6 16:12:42 2014 -0500

    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