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

[nickm@xxxxxxxxxxxxxx]

commit b77db2aafbc437ecf1d5b80cd855e5abeff0d5c5
Merge: b166ec6 7f75f0d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jan 13 10:48:15 2012 -0500

    Merge remote-tracking branch 'asn/bug4899'

 src/container.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

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