Deadlock fixes

We have packaged Orchid as an I2P plugin, enabling I2P users to easily use Orchid as an outproxy for their non-I2P web connections. This is the first patch we are pushing upstream for bugs we have found. The patch is in the current released version of the Orchid plugin.

Ref: https://trac.i2p2.de/ticket/1207