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

[nickm at torproject.org]

commit a0577aacb4a94e803b4d9ec266e969f1aa5a88f3
Merge: fdf6847 9bb34aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 7 17:41:41 2014 -0500

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

 changes/bug10835 |    4 ++++
 src/test/bench.c |    4 ++++
 2 files changed, 8 insertions(+)