MaintNotes: post 2.3.1

Also mention conservancy and git-security.

Junio C Hamano committed Mar 6, 2015 at 15:23 UTC e0ab1fb4aa67ad511defe65bfd5aab01d0521535
1 file changed +12 -2
MaintNotes
+12 -2
@@ -52,6 +52,11 @@ available at:
52 http://colabti.org/irclogger/irclogger_log/git
53 http://colabti.org/irclogger/irclogger_log/git-devel
54
55 +Git is a member project of software freedom conservancy, a non-profit
56 +organization (https://sfconservancy.org/). To reach a committee of
57 +liaisons to the conservancy, contact them at <git@sfconservancy.org>.
58 +
59 +
60 * Reporting bugs
61
62 When you think git does not behave as you expect, please do not stop
@@ -78,6 +83,11 @@ Please remember to always state
83 See http://www.chiark.greenend.org.uk/~sgtatham/bugs.html for further
84 hints.
85
86 +If you think you found a security-sensitive issue and want to disclose
87 +it to us without announcing it to wider public, please contact us at
88 +our security mailing list <git-security@googlegroups.com>.
89 +
90 +
91 * Repositories, branches and documentation.
92
93 My public git.git repositories are at:
@@ -129,8 +139,8 @@ are cut from it. The maintenance releases used to be named with four
139 dotted decimal, named after the feature release they are updates to
140 (e.g. "1.8.5.1" was the first maintenance release for "1.8.5" feature
141 release). These days, maintenance releases are named by incrementing
132 -the last digit of three-dotted decimal name (e.g. "2.2.1" will be the
133 -first maintenance relaese for "2.2" series).
142 +the last digit of three-dotted decimal name (e.g. "2.3.2" is the
143 +second maintenance relaese for "2.3" series).
144
145 New features never go to the 'maint' branch. This branch is also
146 merged into "master" to propagate the fixes forward as needed.