[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'seb/bug5665'

[asn at torproject.org]

commit 70c522aaa6fa4fdbc335d4c7422924249a278bab
Merge: eaf42ad 0feee69
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed May 2 04:38:21 2012 +0300

    Merge remote-tracking branch 'seb/bug5665'

 ChangeLog                |    3 +++
 m4/ax_build_hardening.m4 |   21 +++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)