Fixed win_handle_error_message
Check for res_query, then for __res_query in libresolv
Merge branch 'master' into otr
Added conditionals to makefile for otr support
Removed debug statements