commit 3149bfc254025485496cb6959d4efb5331612cec
Merge: bd73168 699acd8
Author: Nick Mathewson <[email protected]>
Date: Thu Jun 25 11:30:52 2015 -0400
Merge branch 'bug16288_027_03_squashed'
changes/bug16288 | 6 ++++++
src/common/compat.c | 47 ++++++++++++++++++++++++++++++++++++++++-------
src/common/compat.h | 4 ++--
src/or/connection.c | 39 +++++++++++++++++++++------------------
4 files changed, 69 insertions(+), 27 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
