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

[andrea at torproject.org]

commit 0e939c1e0021b40491789a082eec8ddb422ecc2d
Merge: 2f17b91 1eb2c0c
Author: Andrea Shepard <andrea at persephoneslair.org>
Date:   Wed Jun 10 15:03:22 2015 +0000

    Merge branch 'maint-0.2.6' into release-0.2.6