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

19 May 2015


      commit 32bd533ddac5bd7d594a81119449b3d30206eedd
Merge: d5e4a63 b3a225f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue May 19 14:59:39 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