commit a6eea86a2c915ef424c17920139babcfe42f3704
Merge: a88923e f694a44
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed May 14 22:51:51 2014 -0400
Merge branch 'bug11946'
changes/bug11946 | 5 +++
src/common/compat.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++--
src/common/compat.h | 5 +++
src/common/util.c | 10 ++---
src/or/connection.c | 4 +-
src/or/control.c | 2 +-
src/or/main.c | 3 ++
7 files changed, 126 insertions(+), 12 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
