commit 9522b90e43e219dd80849201979dccc684742a29 Merge: dc7f7d7 0225d89 Author: Arturo Filastò arturo@filasto.net Date: Fri Mar 27 16:23:28 2015 +0100

Merge pull request #381 from TheTorProject/feature/unique_identifier

Feature/unique identifier + Test helper addresses

data/ooniprobe.conf.sample | 2 ++ ooni/deck.py | 21 ++++++++++-------- ooni/nettest.py | 51 ++++++++++++++++++++++++++------------------ 3 files changed, 44 insertions(+), 30 deletions(-)