search

gsathya / htpt

HTTP Tor Pluggable Transport
Other
4 stars 3 forks source link

Google #23

Closed ben-jones closed 10 years ago

ben-jones commented 10 years ago

Added code to encode urls as google search strings.

gsathya commented 10 years ago

Wait. This is based on your baidu changes right? Can you fix that pull request first?

ben-jones commented 10 years ago

I already addressed all of the comments from the Baidu branch but apparently it didn't push correctly (github was having issues earlier today.) I will push the update now.

gsathya commented 10 years ago

I merged your baidu branch. Can you rebase this branch on master and push? Thanks!

ben-jones commented 10 years ago

I rebased the branch. Please let me know what you think

gsathya commented 10 years ago

I think something went wrong. I see two of the same commits - https://github.com/ben-jones/htpt/compare/google

ben-jones commented 10 years ago

I see what you are talking about, but I have no idea how to fix this. Thoughts?

gsathya commented 10 years ago

I cherry picked the two commits. Thanks!