[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

6 Apr 2015


      commit 9ccf019b168909ef6674c71aebda9f90516bb6a1
Merge: 39c056e f620b8f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon Apr 6 10:03:26 2015 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

nickm＠torproject.org