[tor-commits] [stegotorus/master] Merge branch 'master' of ssh://sandbox03.sv.cmu.edu/usr/home/zack/stegotorus

[zwol@xxxxxxxxxxxxxx]

commit 33dd34526ccf5c5b87875838857251f7bd4f8963
Merge: 704c053 572cfd2
Author: Zack Weinberg <zackw@xxxxxxx>
Date:   Mon Feb 13 10:55:06 2012 -0800

    Merge branch 'master' of ssh://sandbox03.sv.cmu.edu/usr/home/zack/stegotorus

 src/main.cc                |    2 +-
 src/socks.cc               |    1 +
 src/test/unittest_socks.cc |    1 +
 src/util.cc                |    4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits