Merge branch 'maint-0.4.2' into release-0.4.2

This commit is contained in:
teor
2019-11-25 12:50:59 +10:00
+1 -3
View File
@@ -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
---------------------------