commit 1ce57267b4dbb765dc0ce652080b60ecc013703e Merge: 9116f49 9e2608b Author: Nick Mathewson <nickm at torproject.org> Date: Fri Oct 24 09:23:53 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5'