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

13 May 2015


      commit 113dc51020bc6e6cf4702ac55e3bf17f3833fe99
Merge: b76314d 614d9bc
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed May 13 11:06:10 2015 -0400

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

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

nickm＠torproject.org