sengler/tor-parallel-relay-conn @ cb01aaea12b5ed217a1af2595aa9d658c4a52709

Nick Mathewson cb01aaea12 Merge branch 'bug2865'		пре 13 година
..
bug2865	b74f851861 Correct the defaults for the *Statistics options	пре 13 година
bug3886	44f6be4681 let private tor networks more reliably handle hidden services	пре 14 година
bug5235_log	8be6058d8f changes file and whitespace fix for bug5235 patch	пре 13 година
bug6094	0dc47dfebf Send a CRLF at the end of a STATUS_* event, not in the middle of it	пре 13 година