Merge branch 'maint-0.4.2'

Merge tor_free() notes with whitespace fixes.
This commit is contained in:
teor 2019-11-25 12:52:10 +10:00
commit 68b6d85248
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A

View File

@ -42,6 +42,7 @@ If you have changed build system components:
- For example, if you have changed Makefiles, autoconf files, or anything - For example, if you have changed Makefiles, autoconf files, or anything
else that affects the build system. else that affects the build system.
License issues License issues
============== ==============
@ -58,7 +59,6 @@ Some compatible licenses include:
- CC0 Public Domain Dedication - CC0 Public Domain Dedication
How we use Git branches How we use Git branches
======================= =======================
@ -390,7 +390,6 @@ for more information about trunnel.
For information on adding new trunnel code to Tor, see src/trunnel/README For information on adding new trunnel code to Tor, see src/trunnel/README
Calling and naming conventions Calling and naming conventions
------------------------------ ------------------------------
@ -501,7 +500,6 @@ to use it as a function callback), define it with a name like
When deallocating, don't say e.g. `if (x) tor_free(x)`. The convention is to When deallocating, don't say e.g. `if (x) tor_free(x)`. The convention is to
have deallocators do nothing when NULL pointer is passed. have deallocators do nothing when NULL pointer is passed.
Doxygen comment conventions Doxygen comment conventions
--------------------------- ---------------------------