Merge branch 'task2603'

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

 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/>

### 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

### 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