add note about issue #20 fix
Fix bug that prevented txtorcon.TCPHiddenServiceEndpoint from properly taking data_dir keyword argument
* We don't call _update_onion() when data_dir argument is passed
Merge remote branch 'hellais/data_dirbug' into datadir_bug
test-cases for providing data_dir to TCPHiddenServiceEndpoint

Change implementation so it can properly handle a valid data_dir
when provided explicitly, and self.hiddenservice isn't yet valid.
Allow TorConfig().hiddenservices.append(hs) to work when no attached protocol
Prepare documentation for 0.7 release
bump next version
Change circuit_failed to take dict of args instead of just reason.

This breaks backwards-compatibility.
Filter out the router IDs that look like keywords.

Add test-case for keyword filtering, and fix test-case
for circuit_failed
documentation about API change
Add support for specifying a timeout argument when starting Tor
Implement unittest for launching Tor with timer.
This requires changes to some of the other unittests
* XXX I believe there is some problem in this unittest, because I have not
  fully grokked how the current status of setup is being set. Specifically I
  believe that the TorProcessController thinks it has reaches 100% so our
  checkTimeout function is not actually being called.
* This patch should probably not be merged in total, but it illustrated how
  exceptions should be trapped with self.expectFailure that are thrown when
  timeout occurs.
Use IReactorTime and IDelayedCall instead of polling, and fix unit-tests.
remove unused import
at least call circuit, stream mix-in methods
make log more-testable, and add simple test
cleanup comment
Merge branch 'master' of github.com:meejah/txtorcon
update docs
get rid of custom exception