An updated and much simpler patch is attached,
which adds the missing test_proxy.sh.  However,
it is currently failing (something about CONVERSATION,
IDENTITY and type errors?).  I haven't investigated
closely yet, as I'm currently focusing on other things,
so I'm posting the (failing) patch and build log.