Merge branch 'maint-0.3.3' into maint-0.3.4

diff --cc src/or/nodelist.c
Simple merge

diff --cc src/test/test_nodelist.c
Simple merge