[tor-bugs] #2672 [Torperf]: Fix bugs/issues with consolidate_stats

[Tor Bug Tracker & Wiki]

#2672: Fix bugs/issues with consolidate_stats
----------------------------------------+-----------------------------------
 Reporter:  mikeperry                   |          Owner:  mikeperry
     Type:  defect                      |         Status:  assigned 
 Priority:  major                       |      Milestone:           
Component:  Torperf                     |        Version:           
 Keywords:  MikePerryIteration20110320  |         Parent:           
   Points:  2                           |   Actualpoints:           
----------------------------------------+-----------------------------------

Comment(by mikeperry):

 Ok, I think I fixed this. Now we store unmatched lines from either .data
 or .extradata, and should also be better about skipping missed lines from
 either. The result is a file that contains everything from .data and
 .extradata, even if they do not match.

 I also added the didtimeout field to the mergedata.

 All of this + the earlier changes should be in mikeperry/ticket2672.

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/2672#comment:9>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online