commit 619bd43a5e2c33ebb02cbeee2dfdf255984794f8 Merge: a9d24f3 dd22ab5 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Sep 9 10:57:09 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5'