[tor-commits] [stegotorus/master] Merge branch 'master' of https://git.safdef.isc.org/git/stegotorus

[zwol at torproject.org]

commit c8b967ef7f599d1625e1abb227e2bc00f0fbf39f
Merge: 7539220 f65fb5c
Author: Vinod Yegneswaran <vinod at safdef.isc.org>
Date:   Tue Feb 14 15:34:06 2012 -0800

    Merge branch 'master' of https://git.safdef.isc.org/git/stegotorus

 .gitignore           |    2 ++
 .gitmodules          |    3 +++
 scripts/benchmark.py |   50 +++++++++++++++++---------------------------------
 scripts/bm-mcurl.c   |    4 ++--
 scripts/torctl       |    1 +
 5 files changed, 25 insertions(+), 35 deletions(-)