commit 3455f6a2273d5de1742560be4fd85494a417beee
Merge: b4d1a8a 83d9d23
Author: Arturo Filastò
Date: Mon May 5 15:14:55 2014 +0200
Merge branch 'master' of github.com:TheTorProject/ooni-backend
* 'master' of github.com:TheTorProject/ooni-backend:
Make Vagrantfile also install
commit 873b193ad40a625e58cdf3004600d0e40d61ac6c
Merge: 0148e99 207e4b0
Author: Arturo Filastò
Date: Mon Apr 21 19:39:37 2014 +0200
Merge branch 'master' of github.com:TheTorProject/ooni-backend
* 'master' of github.com:TheTorProject/ooni-backend:
If p is a dictionary (as I a
commit d19e59f60d42a62137d6f32474207672e4ebbf21
Merge: 446f247 fa783dc
Author: Arturo Filastò
Date: Wed Jan 29 15:52:47 2014 +0100
Merge branch 'master' of github.com:TheTorProject/ooni-backend
* 'master' of github.com:TheTorProject/ooni-backend:
Add ooni-backend SysV Init S
commit 02b6747405a89e05d91336431f1bd9c1939f342d
Merge: d220907 3f0f8e2
Author: Arturo Filastò
Date: Fri Aug 16 18:06:04 2013 +0200
Merge branch 'master' of github.com:TheTorProject/ooni-backend
* 'master' of github.com:TheTorProject/ooni-backend:
Fixes a bug where logfile co