diff options
| author | teor <teor@torproject.org> | 2019-11-25 12:52:10 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-25 12:52:10 +1000 |
| commit | 68b6d852489157d94b14dcdc9ca729f5a7134c76 (patch) | |
| tree | ab0be767ad296eefc6e475d3fdaec98765f6d366 /doc/HACKING | |
| parent | 03867b3dd71f765e5adb620095692cb41798c273 (diff) | |
| parent | eb81704081b92738216f3fadb172f9f55b2b3201 (diff) | |
| download | tor-68b6d852489157d94b14dcdc9ca729f5a7134c76.tar.gz tor-68b6d852489157d94b14dcdc9ca729f5a7134c76.zip | |
Merge branch 'maint-0.4.2'
Merge tor_free() notes with whitespace fixes.
Diffstat (limited to 'doc/HACKING')
| -rw-r--r-- | doc/HACKING/CodingStandards.md | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 87ebbd2bec..7999724166 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -42,6 +42,7 @@ If you have changed build system components: - For example, if you have changed Makefiles, autoconf files, or anything else that affects the build system. + License issues ============== @@ -58,7 +59,6 @@ Some compatible licenses include: - CC0 Public Domain Dedication - 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 - 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 have deallocators do nothing when NULL pointer is passed. - Doxygen comment conventions --------------------------- |