commit 8676a08362a192f17f2850359b16933c2a5786dd Merge: 61029d6 db2c2a6 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 31 14:08:57 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' Do an "ours" merge to not take the 0.2.4 fix for #9731