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

[nickm at torproject.org]

commit 1d02f64932627bf97f10416c5f36e9745db72e7b
Merge: 42b4260 9e2608b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 24 09:23:29 2014 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5