[tor-commits] [tor/master] Merge remote-tracking branch 'yawning/cid1270894'

commit 843c3684752fcd5a3853db15e9bfadbdb13c0ff5 Merge: afe10e4 39a496e Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 18 12:13:54 2015 -0500 Merge remote-tracking branch 'yawning/cid1270894' src/or/dirvote.c | 1 + 1 file changed, 1 insertion(+)