commit 1415cfd325af85d4922c2a69ac395432887a3636 Merge: 0a5200e b9a3fe1 Author: George Kadianakis <desnacked@riseup.net> Date: Mon Mar 19 12:49:24 2012 -0700 Merge branch 'bug4921' Makefile.am | 3 +- src/network.c | 22 ++--------- src/test/unittest.c | 2 + src/test/unittest_util.c | 59 +++++++++++++++++++++++++++++ src/util.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++ src/util.h | 3 + 6 files changed, 163 insertions(+), 19 deletions(-)