fixes #5102

Also, allow specifying multiple addresses for a single peer.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>