commit 830492fbdaef92ecf82c5bfde9373a2a2d9157d3
Merge: 9fb86c8 29c28d3
Author: Nick Mathewson <[email protected]>
Date: Wed Apr 23 11:05:54 2014 -0400
Merge branch 'bug11156_issue2_squashed'
changes/bug11156 | 5 ++++
src/or/config.c | 6 +++++
src/or/transports.c | 63 +++++++++++++++++++++++++++------------------------
src/or/transports.h | 2 +-
4 files changed, 46 insertions(+), 30 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
