user/mikeperry/torperf, branch ticket2672

Fix script header info.

2011-03-16T11:48:53+00:00

We now fully merge all data.

Improve error output and remove some unused cases.

2011-03-16T11:46:35+00:00

Now we should complain about any missed data lines after we already found a
match. This should allow you to attach extra_stats.py to an existing torperf
without tons of noise, but still catch missed lines later on.

Fix entrycons.py to send a NEWNYM signal after every stream.

2011-03-16T11:46:09+00:00

Add a DIDTIMEOUT field to mergedata.

2011-03-11T09:41:44+00:00

Merge branch 'karsten-2618' into ticket2672

2011-03-11T09:38:43+00:00

Store every line from both files, even if no matches are found.

2011-03-11T09:37:42+00:00

Also, better handle missing lines from either file.

Update measurements-HOWTO for new consolidate_stats.py.

2011-03-11T09:37:42+00:00

Update consolidate_stats to new .extradata format.

2011-03-11T09:37:42+00:00

Add a ':' to keep the reasons all part of the 'value' string.

2011-03-11T09:37:42+00:00

Add a didtimeout field to .data.

2011-03-10T10:20:33+00:00