[tor-commits] [torspec/master] Merge remote-tracking branch 'asn-gitorious/bug6059'

[nickm at torproject.org]

commit e5e36e4acabc2914799f96de70bd649f8b80667d
Merge: 5ddddcb 43c37b1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 6 10:14:09 2012 -0400

    Merge remote-tracking branch 'asn-gitorious/bug6059'

 tor-fw-helper-spec.txt |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)