[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'asn/bug4742'
commit da0fb3efd3be668f0b732ecb7b006b9140b012df
Merge: d589ba6 710d2c7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Mon Dec 19 11:37:31 2011 -0500
Merge remote-tracking branch 'asn/bug4742'
src/main.c | 6 +++---
src/protocols/obfs2.c | 24 ++++++++++++------------
2 files changed, 15 insertions(+), 15 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits