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

[nickm at torproject.org]

commit 617d71a63948cbd60fa68e592fdd875aa63832e1
Merge: f15d9cf 7e9b6a1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 15:07:17 2013 -0400

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

 changes/bug8290         |    9 +++++++++
 contrib/include.am      |    3 ---
 contrib/tor-tsocks.conf |   13 -------------
 doc/tor.1.txt           |    2 +-
 doc/torify.1.txt        |   18 +++---------------
 5 files changed, 13 insertions(+), 32 deletions(-)