commit b76314d3a1430f4440dcbec4f5026564981f2030 Merge: 95a9920 8aa0440 Author: Nick Mathewson <nickm at torproject.org> Date: Wed May 13 11:04:17 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5'