commit 68b6d852489157d94b14dcdc9ca729f5a7134c76 Merge: 03867b3dd eb8170408 Author: teor teor@torproject.org Date: Mon Nov 25 12:52:10 2019 +1000

Merge branch 'maint-0.4.2'

Merge tor_free() notes with whitespace fixes.

doc/HACKING/CodingStandards.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

diff --cc doc/HACKING/CodingStandards.md index 87ebbd2be,2c273910d..799972416 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@@ -498,10 -457,6 +497,9 @@@ to use it as a function callback), defi abc_free_(obj); }

+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. + - Doxygen comment conventions ---------------------------