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.
Backport exception changes from master
resolve conflict
Merge branch 'twilsonb-use-consensus-exitpolicy'