commit ec8879dbc5d110a6d655ea3d461de432ccc28331 Merge: 653ce38 a0a6338 Author: Sebastian Hahn sebastian@torproject.org Date: Thu Nov 17 19:07:17 2011 +0100

Merge remote-tracking branch 'aagbsn/4500-check-return-value'

controller.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)