commit 7c9f6a994f610b27b43867ebdbe88ecb6492452f Merge: 888d5d0 53e4452 Author: Nick Mathewson <[email protected]> Date: Mon Jun 25 13:23:07 2012 -0400
Merge remote-tracking branch 'origin/maint-0.2.3'
changes/bug6226 | 3 +++
src/or/transports.c | 30 ++++++++++++++++++++++--------
2 files changed, 25 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
