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

[nickm at torproject.org]

commit 60fd08f40be9bfe3e53de4e22b66f25451206f96
Merge: 01af92f 60d1442
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 15:13:07 2013 -0400

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

 changes/bug7768                         |    3 +++
 doc/tor-fw-helper.1.txt                 |   14 +++++++-------
 src/tools/tor-fw-helper/tor-fw-helper.c |    2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)