commit 974f4d2ceb0c494bc5008749928bd2d49317cf0b Merge: 383238b 550c033 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 11 21:41:56 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' (Do an "ours" merge to avoid taking version number changes)