Merge pull request #13282 from jordan-woyak/onion-tweaks Core/Config: Replace some std::pair with struct to make code more readable.
