Nick Mathewson 2aa6fc5ae8 Merge branch 'bug1522' %!s(int64=14) %!d(string=hai) anos
..
common 03ea5f930e Reinstate warning when HOME isn't set. %!s(int64=14) %!d(string=hai) anos
config 50afadb74d Sample torrc as a bridge %!s(int64=14) %!d(string=hai) anos
or faf51fa52a Don't cannibalize one-hop circuits %!s(int64=14) %!d(string=hai) anos
test 71fb687ddd Add --enable-static-zlib option %!s(int64=14) %!d(string=hai) anos
tools 9563b0d508 clean up whitespace in src/tools %!s(int64=14) %!d(string=hai) anos
win32 076063ca90 moved wince related includes and defs to compat.h where possible, removed unused/redundant wince includes %!s(int64=14) %!d(string=hai) anos
Makefile.am da1aa66f70 Move testing code into new src/test directory. %!s(int64=14) %!d(string=hai) anos