agl / pond

Pond
BSD 3-Clause "New" or "Revised" License
911 stars 109 forks source link

Detect tor port even in developer mode #132

Closed burdges closed 9 years ago

burdges commented 9 years ago

Detect tor port even in developer mode so that PANDA can run properly under TBB. There was an issue because PANDA runs over tor even in developer mode, but TBB uses port 9150 rather than the default tor port 9050.

burdges commented 9 years ago

Apologies for the wonky commit history, not sure what I pulled from where to get those spurious reverts which needed to be reverted.

agl commented 9 years ago

I'm afraid that I can't see which commit is being suggested here!

burdges commented 9 years ago

Appears you got the most important one. https://github.com/burdges/pond/commit/5e4110d794ebac4197b70a66c3750295208ffabb is probably superfluous now.

These are minor bug fixes :

109 - https://github.com/burdges/pond/commit/777b5a56d5e9599b124b7ea2a0ad759233222d7a

125 - https://github.com/burdges/pond/commit/53b50d9c8944e5c1df5ba18650e096ef338564cd

Oh, the original patch to support PANDA on port 9150 in developer mode is either one of https://github.com/burdges/pond/commit/552c8774304ffaaa267a937f1909d19f3d8e01fe or https://github.com/burdges/pond/commit/ab285b09a8321ec6cd546fcbf2892a4d5005d94f due to the unfortunate revert chaos.

These are minor refactoring patches that I felt were worth submitting now instead of with larger change set : https://github.com/burdges/pond/commit/cb2a82c507dcf0ace7e1fbc71d88895b73bc1bc6 https://github.com/burdges/pond/commit/63bd1c3578fa2cd6e0a236cac044f928836fc273 https://github.com/burdges/pond/commit/2e9e3d8101d4e4d707f5e74ea5adfa1607529090

burdges commented 9 years ago

I'll try to figure out how to fix this commit history

burdges commented 9 years ago

Improved version here : https://github.com/agl/pond/pull/136

There are still a few hick ups there, but I don't want to tempt the rebase gods wrath too much.