[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'asn/bug5098'

[nickm at torproject.org]

commit 3dc1832319219ab82281ab873ab2c8fb3878b521
Merge: aee59f0 443aea0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 12 19:36:18 2012 -0500

    Merge remote-tracking branch 'asn/bug5098'

 src/main.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)