sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.3' into release-0.3.3

This commit is contained in:
Nick Mathewson 2018-03-13 10:01:30 +01:00
parent 6d44cf66c7 e9dbd6dd8f
commit ed73b086b7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/tor_api.h
View File

@ -66,14 +66,12 @@ void tor_main_configuration_free(tor_main_configuration_t *cfg);
* This function will not return until Tor is done running. It returns zero * This function will not return until Tor is done running. It returns zero
* on success, and nonzero on failure. * on success, and nonzero on failure.
* *
* BUG 23848: In many cases, tor_main will call exit() or abort() instead of * If you want to control when Tor exits, make sure to configure a control
* returning. This is not the intended long-term behavior; we are trying to * socket. The OwningControllerFD option may be helpful there.
* fix it.
* *
* BUG 23847: You can only call tor_main() once in a single process; if it * BUG 23847: Sometimes, if you call tor_main a second time (after it has
* returns and you call it again, you may crash, or you may encounter other * returned), Tor may crash or behave strangely. We have fixed all issues of
* unexpected behavior, including possible security issues. This is not * this type that we could find, but more may remain.
* intended long-term behavior; we are trying to fix it.
* *
* LIMITATION: You cannot run more than one instance of Tor in the same * LIMITATION: You cannot run more than one instance of Tor in the same
* process at the same time. Concurrent calls will cause undefined behavior. * process at the same time. Concurrent calls will cause undefined behavior.