commit 03fdf232bff1e1a98007eaf7c583ee956b09e1d5 Merge: 300f8e6 7344a4f Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 8 08:19:13 2017 -0400 Merge remote-tracking branch 'ahf/coverity/1405875' src/test/test_options.c | 2 -- 1 file changed, 2 deletions(-)