commit e5b07ba17947ba4782cbac8f12de7024b2969c99 Merge: ba7d93d 0b598cb Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 7 15:22:36 2013 -0500 Merge remote-tracking branch 'arma/bug7054' changes/bug7054 | 4 ++++ doc/tor.1.txt | 42 +++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 21 deletions(-)