commit d38e2c4d2fdbd52c81d0e43b3ab5090f42cef426 Merge: 824d88b 2c060e3 Author: David Goulet <dgoulet@ev0ke.net> Date: Wed Apr 22 16:15:07 2015 -0400 Merge remote-tracking branch 'yawning/getpeername' src/lib/getpeername.c | 24 +++++++++--------------- tests/test_getpeername.c | 12 +++++++----- 2 files changed, 16 insertions(+), 20 deletions(-)