commit 2d3c12eb581bf82e8dd742cd964cf1565187853f Merge: 39fc5b1 13e5670 Author: Arturo Filastò <hellais@users.noreply.github.com> Date: Mon Nov 4 01:20:31 2013 -0800 Merge pull request #222 from TheTorProject/fix/dnsconsistency_control_resolver_keyname Use a string for the control_resolver key ooni/nettests/blocking/dnsconsistency.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)