commit d0243e82cfcdf6684283c37f20db2d999740bdf3 Merge: ebda15e f54ac08 Author: Nick Mathewson <ni...@torproject.org> Date: Sat Jun 23 15:10:57 2012 -0400
Merge branch 'bug5099_nm' into maint-0.2.3
changes/bug5099 | 3 +++
src/or/transports.c | 14 +++++++++++++-
2 files changed, 16 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
