Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY
ALLOW_ACCESS_TO_HIDDEN_SERVICE