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

28 Jun 2012


      commit 2f8a9e3502d6f97fa3ffaa27afa552db7f8773e4
Merge: 19a81ef 64f8e68
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu Jun 28 15:53:14 2012 -0400

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

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

nickm＠torproject.org