Merge branch 'bug6097'

changes/bug5909

changes/fix_unicode

src/common/compat.c

src/common/util.c

src/or/config.c

src/or/eventdns.c

src/or/ntmain.c

src/test/test.c

src/test/test_util.c