Nick Mathewson 70910479e3 Merge remote-tracking branch 'public/bug5598' ...

Conflicts:
	doc/tor.1.txt

Conflict was on a formatting issue in the manpage.

2012-06-11 10:26:48 -04:00

..

bug2865

Correct the defaults for the *Statistics options

2012-06-07 13:46:51 -04:00

bug3886

let private tor networks more reliably handle hidden services

2011-09-01 03:13:27 -04:00

bug5235_log

changes file and whitespace fix for bug5235 patch

2012-06-08 14:33:16 -04:00

bug5598

Change the default for DynamicDHGroups to 0

2012-06-06 12:00:04 -04:00

bug5909

Be more careful calling wcstombs

2012-06-07 11:09:38 -04:00

bug6094

Send a CRLF at the end of a STATUS_* event, not in the middle of it

2012-06-07 03:22:06 +00:00

fix_unicode

Fix mingw build with -DUNICODE -D_UNICODE

2012-06-07 11:59:32 -04:00