Wrap both `waiting` and `conns` in Mutex

[jwilm]

The race condition we fixed happens when accessing both of these. The Mutex should wrap both of them to provide type safety on their access.