diff options
| author | teor <teor@torproject.org> | 2019-11-25 12:50:59 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-25 12:50:59 +1000 |
| commit | 189287e7bc3c4cb5080c4b6c177121c6e69569f3 (patch) | |
| tree | 24f823067a2b880303a8031b7231c1f1843332d2 | |
| parent | aa73b30dfac927c565f553e93685e3c3dd4a2118 (diff) | |
| parent | eb81704081b92738216f3fadb172f9f55b2b3201 (diff) | |
| download | tor-189287e7bc3c4cb5080c4b6c177121c6e69569f3.tar.gz tor-189287e7bc3c4cb5080c4b6c177121c6e69569f3.zip | |
Merge branch 'maint-0.4.2' into release-0.4.2
| -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 e483dd74b3..2c273910d1 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 ======================= @@ -350,7 +350,6 @@ for more information about trunnel. For information on adding new trunnel code to Tor, see src/trunnel/README - Calling and naming conventions ------------------------------ @@ -458,7 +457,6 @@ to use it as a function callback), define it with a name like abc_free_(obj); } - Doxygen comment conventions --------------------------- |