commit f724692fe512a2eaf2b2c4bfd491513f48bfca23 Merge: a4243fd 6f626f3 Author: Damian Johnson <atagar@torproject.org> Date: Thu Jun 21 08:45:09 2012 -0700 Merging Beck's windows test compatibility fixes run_tests.py | 3 +- stem/util/system.py | 46 ++++++++++++++++++++++----------------- test/integ/descriptor/reader.py | 16 ++++++++++++- test/integ/util/system.py | 5 +++- 4 files changed, 47 insertions(+), 23 deletions(-)