Disallow more than one relay per country in a circuit
I have been running the Tor Browser Bundles that use 0.2.2.x tor branch. It seems more and more frequently, 2 of 3 nodes in a circuit are in the same country. My tor prefers Germany and the USA for nodes. I frequently find circuits which start and end in the USA, or start and end in Germany. I would like an option to avoid national surveillance by any one country. I am willing to sacrifice performance for anonymity.
You have the option called EnforceDistinctSubnets that is set to 1 by default. Perhaps EnforceDistinctCountries could be an option.