commit 04b048379b43ffa586e44fabf7af5565f6227090 Author: Karsten Loesing karsten.loesing@gmx.net Date: Wed Feb 23 11:40:25 2011 +0100

Clean up unused files, update README and LICENSE. --- LICENSE | 1 + README | 17 ++++++++++++++--- plot_results.R | 4 ++++ run_test.py | 3 +++ 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE index 35f2eb7..c52ccc7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ Copyright (c) 2003 Roger Dingledine Copyright (c) 2004-2007 Roger Dingledine, Nick Mathewson Copyright (c) 2007 Roger Dingledine, Nick Mathewson, Steven J. Murdoch +Copyright (c) 2008-2011 The Tor Project

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/README b/README index b1ecdcc..c4769d4 100644 --- a/README +++ b/README @@ -11,10 +11,21 @@ Contents

Makefile: Builds and tests trivsocks-client

- run_test.py: Script to automate running of trivsocks-client - plot_results.R: Plot the results from run_test.py +[run_test.py: Script to automate running of trivsocks-client -- defect] +[plot_results.R: Plot the results from run_test.py -- defect] + + measurements-HOWTO: Instructions for setting up Torperf + example_start-tors_fastslow.txt: Example start script for Torperfs with + custom guard node selection + extra_stats.py: Tor controller that prints out details of the circuits + used for Torperf measurements + entrycons.py: (optional) Tor controller that influences guard node + selection + analyze_guards.py: Script to check whether custom guard node was working + as expected + consolidate_stats.py: Script to merge the two output data files with + performance data and path data

LICENSE: The Tor license (3-clause BSD) README: This file

-Steven J. Murdoch http://www.cl.cam.ac.uk/users/sjm217/ diff --git a/plot_results.R b/plot_results.R index ecd5795..a291414 100644 --- a/plot_results.R +++ b/plot_results.R @@ -1,6 +1,10 @@ ### Copyright 2007 Steven J. Murdoch ### See LICENSE for licensing information

+### XXX This script is broken, but we should look at it some more and +### maybe reuse parts of it when implementing Trac ticket #2563 (Add R +### code for processing Torperf data to the Torperf repository) + UFACTOR = 1e6

## Subtract to timevals, maintaining precision diff --git a/run_test.py b/run_test.py index 2b9bf5d..3054f4b 100755 --- a/run_test.py +++ b/run_test.py @@ -3,6 +3,9 @@ ### Copyright 2007 Steven J. Murdoch ### See LICENSE for licensing information

+### XXX This script is broken, but we might want to reuse parts of it for +### implementing Trac ticket #2565 (Redesign Python parts in Torperf) + import os import time