[tor-commits] [vidalia/alpha] Merge branch 'bug2188_bwgraph' into alpha