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

[nickm at torproject.org]

commit 572b9ff4d7937a568bc786f7dce08b34011de7d9
Merge: 60d147f dfd6cf9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 24 10:24:53 2015 -0400

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