commit 969cce1e9c81efaf5138decbcd37ec9ea058bdde Merge: ddda393 1f91810 Author: Arturo Filastò <art@fuffa.org> Date: Fri Oct 17 17:53:22 2014 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe * 'master' of ssh://git-rw.torproject.org/ooni-probe: Add ooni.deckgen.processors to the packages listed in setup.py Fix type in README and manpage for oonideckgen.