Update example: choose a running exit which allows the port
This increases the success rate of createStream from around 50% to around 90%.
Also demonstrate how to choose running relay(s), if desired.
(Accidentally merged - duplicate commit).
Merge branch 'minor-README-only'
Minor comment change to accept/reject policy to match actual syntax
Minor comment fix
Also ignore the backup ~idea directory
typo
Merge branch 'use-consensus-exitpolicy', picking exception changes from master

Conflicts:
	src/main/java/tor/OnionRouter.java
Merge branch 'use-consensus-exitpolicy' - trivial merge failure

Conflicts:
	src/main/java/tor/OnionRouter.java
Merge branch 'z-dir-streams'
No conflicts visible

Merge https://github.com/drgowen/tor-research-framework

Conflicts:
	src/main/java/tor/OnionRouter.java
Resolved in favour of latest version.

Merge https://github.com/drgowen/tor-research-framework

Conflicts:
	src/main/java/tor/OnionRouter.java
Minor typo and comment fixes
Merge pull request #12 from twilsonb/comments-only

Fix typos in comments