Also ignore the backup ~idea directory
Store and use the port line for the consensus for exit policy checks, falling back to the router descriptor when needed.
Merge branch 'use-consensus-exitpolicy', picking exception changes from master

Conflicts:
	src/main/java/tor/OnionRouter.java
Backport exception changes from master
Merge branch 'use-consensus-exitpolicy' - trivial merge failure

Conflicts:
	src/main/java/tor/OnionRouter.java