owenson / tor-research-framework

Tor research framework in Java
www.ghowen.me
GNU General Public License v3.0
55 stars 16 forks source link

Create RandomRouteExample and dependent changes #3

Closed twilsonb closed 10 years ago

twilsonb commented 10 years ago

An example which selects a random route using consensus flags, based on SimpleExample.

Gareth, the changes to Consensus.getDirectoryStream() significantly modify its behaviour:

All other changes are additional functionality, which preserves the original interfaces and behaviour.

The full change list is:

Created RandomRouteExample:

owenson commented 10 years ago

Hi, this looks good that's one whopping commit. Thanks very much!

Looks good from what I can see - probably will merge as is - just want to have a nose through first and familiarise myself with the changes. This is the exact sort of stuff I had on the todo list! I'll have look through tomorrow morning and work out how to merge pull requests without creating lots of commits and merge it (I've not sat on this side of the git fence before).

twilsonb commented 10 years ago

Well, I've not used git (much) before, so I've spent a bit of time grouping my commits into sane pull requests. I'll try to group them in larger, sensible pieces in future to make it easier on your side.

On 30 Jul 2014, at 06:13 , Dr Gareth Owen notifications@github.com wrote:

Hi, this looks good that's one whopping commit. Thanks very much!

Looks good from what I can see - probably will merge as is - just want to have a nose through first and familiarise myself with the changes. This is the exact sort of stuff I had on the todo list! I'll have look through tomorrow morning and work out how to merge pull requests without creating lots of commits and merge it (I've not sat on this side of the git fence before).

— Reply to this email directly or view it on GitHub.

owenson commented 10 years ago

It wasn't a criticism aimed at you - when I merged your earlier commit something I did created two or three extra commits. Just need to work out how to sanely pull it into my local repo, do any tweaks and push it to master whilst preserving your commit history.

owenson commented 10 years ago

PS -merged as is.

twilsonb commented 10 years ago

I didn't take it as a criticism - I could see that we're both working out how to use git (better). In my first hour, I managed to create an unmanageable mess of a master branch. It's now called "trash".

On 30 Jul 2014, at 06:48 , Dr Gareth Owen notifications@github.com wrote:

It wasn't a criticism aimed at you - when I merged your earlier commit something I did created two or three extra commits. Just need to work out how to sanely pull it into my local repo, do any tweaks and push it to master whilst preserving your commit history.

— Reply to this email directly or view it on GitHub.