commit df0214e8ced0be1ab6bf965e1385cbe428ff1e8d Merge: 7eae5c1 5e86276 Author: Arturo Filastò arturo@filasto.net Date: Fri Jul 29 13:30:01 2016 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe: Add backend to required options to show error when it's not provided

ooni/nettests/manipulation/traceroute.py | 5 +++-- ooni/templates/scapyt.py | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-)