commit ece9ef7f41224dbad8c36b735c08877e6193c38b Merge: eb9b282 cd5048d Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 27 21:58:36 2013 -0400

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

doc/tor.1.txt | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)