20 Apr
2018
20 Apr
'18
1:18 p.m.
commit f75543371864ae9a4d041cf3b75efa2d96e33d37 Merge: fd7b0d7 70822d0 Author: David Goulet dgoulet@ev0ke.net Date: Fri Apr 20 09:16:48 2018 -0400
Merge remote-tracking branch 'upstream/master'
README.md | 1 + src/lib/connect.c | 2 +- src/lib/torsocks.c | 4 ++-- tests/Makefile.am | 2 +- tests/test_fd_passing.c | 10 +++++++++- 5 files changed, 14 insertions(+), 5 deletions(-)