commit e1623db26e9d3ef223379021d6b083a905b8e0d8
Merge: 612972b 3e83236
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Apr 17 12:01:25 2014 +0200
    Fix typo in commit message.
    
    Reminder: parse your commit message carefully before committing. :(