Nick Mathewson 9265190b16 Merge branch 'bug1384' 16 lat temu
..
common 90d3260b4a whitespace fix 16 lat temu
config f9a4b3e45b Don't put a ControlPort without auth in sample bridge torrc 16 lat temu
or 9265190b16 Merge branch 'bug1384' 16 lat temu
test 49b0eb7a32 Fix up geoip unit tests to know about ?? 16 lat temu
tools 14bc4dcc22 Rename log.h to torlog.h 16 lat temu
win32 69dfd67d90 bump to 0.2.2.14-alpha-dev 16 lat temu
Makefile.am da1aa66f70 Move testing code into new src/test directory. 16 lat temu