about summary refs log tree commit diff homepage
path: root/merge.c
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-07-24 17:23:57 -0400
committerJune McEnroe <june@causal.agency>2018-07-24 17:23:57 -0400
commit07d8a9ed7697c7a23c789b7f119b78f4783bc0aa (patch)
tree049fb5aec41e8c45a995472ff348fab796ba7cfe /merge.c
parentPrint time_t with %jd in meta (diff)
downloadtorus-07d8a9ed7697c7a23c789b7f119b78f4783bc0aa.tar.gz
torus-07d8a9ed7697c7a23c789b7f119b78f4783bc0aa.zip
Revert "Do not set non-blocking on client sockets"
This reverts commit 44bec9d4ec5d3240b1c518ff11bfd3d8a19d2354.

There actually are adverse effects.
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions
&id=cc13f4d43a9e6f8544f347800adbbe5000b83305&follow=1'>build: Add README.7 to EXTRA_DIST 3.2.0June McEnroe 2020-08-03doc: Indicate that only OpenSSL 1.1.1b and newer workJune McEnroe