commit cc6fd9833cbea1e148114af007c83906789b58ec Merge: 4a17c54 51e3602 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 24 13:25:47 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5'