Also fixes .onion support TODO: Test and backport to previous branches Signed-off-by: Tavi <tavi@divested.dev>