Add patch for bug in yaml.

Add assets to ignore file.

.gitignore

@@ -1,4 +1,5 @@
 *.pyc
+assets/*
 build/*
 package/*
 proxy-lists/ip-cc.txt
@@ -8,8 +9,4 @@ proxy-lists/italy-http-ips.txt
 private/*
 /ooni/plugins/dropin.cache
 oonib/oonibackend.conf
-<<<<<<< HEAD
-ooni/assets/*
-=======
 ooni/lib/txtorcon
->>>>>>> 21505f84aef5d60c7e138590a1a40e3df773d680

bin/ooniprobe

@@ -1,8 +1,19 @@
 #!/usr/bin/python2
+# -*- encoding: utf-8 -*-
+#
 # startup script based on twisted trial
 # See http://twistedmatrix.com/
+#
+# :authors: Arturo Filastò
+# :licence: see LICENSE
+
+
 import os, sys
 
+# This is a hack to overcome a bug in python
+from ooni.utils import patched_reduce_ex
+copy_reg._reduce_ex = patched_reduce_ex
+
 sys.path[:] = map(os.path.abspath, sys.path)
 
 sys.path.insert(0, os.path.abspath(os.getcwd()))

docs/source/conf.py

@@ -94,8 +94,13 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'haiku'
 
+html_theme_options = {'textcolor': "#222222",
+        'headingcolor': "#555",
+        'linkcolor': "#4183C4",
+        'visitedlinkcolor': "#888",
+        'hoverlinkcolor': "#888"}
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.