commit 045c989d037058293e9320db7c7d8143d5d3aa4c Merge: dc4ccfd 74c3394 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Mar 1 10:19:19 2013 -0500 Merge remote-tracking branch 'origin/maint-0.2.4'