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

[arma at torproject.org]

commit 1ed77ff724444dec9bd2493d7d28fdd21869bcff
Merge: a3d8ffe 1b55182
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jul 24 19:48:37 2014 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/bug12227 |    5 +++++
 1 file changed, 5 insertions(+)