commit 630677f339dda6fbb720380d42cfe247b85eb1a8 Merge: da3edc4 9c5a118 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jun 29 00:38:30 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3'