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

18 Mar 2015


      commit 98c3942162831ddccea9dcf149d4c7f12b0a52a9
Merge: 6c26483 ca03b10
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed Mar 18 16:33:11 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