commit b1f44fc20ba19690493a674f163cd55c117b6ce9 Merge: 483385d 8b6d0bd Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 14 01:48:16 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' Using "ours" strategy to avoid taking commits