commit a5b05edefbbcbc7261e40a5842a1ef901a60a25c Merge: f60e327 5687229 Author: Damian Johnson atagar@torproject.org Date: Sat Dec 22 14:30:29 2012 -0800

Integ test fixes concerning string circ/stream ids

Fixes from Sean to fix integration tests broken by commit 6711458...

https://trac.torproject.org/7778

test/integ/control/controller.py | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-)