Browse code

Add sections for trac (#18586) and reporting bad relays (#22412).

Add sections.
Move security section to directly follow trac section.

kat authored on03/12/2017 20:59:18
Showing1 changed files
... ...
@@ -16,9 +16,11 @@
16 16
     <li><a href="#support">Support</a></li>
17 17
     <li><a href="#irc">IRC</a></li>
18 18
     <li><a href="#twitter">Twitter</a></li>
19
+    <li><a href="#bugs">Bug Tracker</a></li>
20
+    <li><a href="#security">Security Issues</a></li>
21
+    <li><a href="#badrelays">Report Bad Relays</a></li>
19 22
     <li><a href="#email">Email</a></li>
20 23
     <li><a href="#mail">Mailing Address</a></li>
21
-    <li><a href="#security">Security Issues</a></li>
22 24
     </ul>
23 25
 
24 26
     <a id="support"></a>
... ...
@@ -88,7 +90,34 @@
88 90
 	</ul>
89 91
     </p>
90 92
 
91
-    <a id="email"></a>
93
+	<a id="bugs"></a>
94
+	<h3><a class="anchor" href="#bugs">Bug Tracker</a></h3>
95
+	<p>You can report bugs other than <a href="#security">security 
96
+	issues</a> using our <a href="https://trac.torproject.org/projects/tor"
97
+	>bug tracker</a>. Our 
98
+	<a href="<page getinvolved/volunteer>">volunteer page</a> has 
99
+	convenient links to <a href="<page getinvolved/volunteer>#Projects"> 
100
+	project-related queries</a>.</p>
101
+    
102
+	<a id="security"></a>
103
+	<h3><a class="anchor" href="#security">Security Issues</a></h3>
104
+	<p>If you've found a security issue in one of our projects or our
105
+	infrastructure, please email the respective maintainer. You can find
106
+	their GPG fingerprint/key on our <a
107
+	href="https://db.torproject.org">developer ldap search page</a>. Due
108
+	to the many different projects we have, we do not offer a single
109
+	list for security issues.</p>
110
+
111
+	<a id="badrelays"></a>
112
+	<h3><a class="anchor" href="#badrelays">Report Bad Relays</a></h3>
113
+	<p>If you find a relay that you think is malicious, misconfigured, 
114
+	or otherwise broken, please check out our 
115
+	<a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">
116
+	wiki page</a> and <a href="https://blog.torproject.org/how-report-bad-relays"
117
+	>blog post</a> on how to report it.</p>
118
+
119
+
120
+	<a id="email"></a>
92 121
     <h3><a class="anchor" href="#email">Email</a></h3>
93 122
     <p>If you have Tor questions, please try to help yourself via the
94 123
     above support venues. Please don't use this contact address
... ...
@@ -116,15 +145,6 @@
116 145
 Seattle, WA 98194 USA<br><br>
117 146
 </address>
118 147
 
119
-    <a id="security"></a>
120
-    <h3><a class="anchor" href="#security">Security Issues</a></h3>
121
-    <p>If you've found a security issue in one of our projects or our
122
-    infrastructure, please email the respective maintainer. You can find
123
-    their GPG fingerprint/key on our <a
124
-    href="https://db.torproject.org">developer ldap search page</a>. Due
125
-    to the many different projects we have, we do not offer a single
126
-    list for security issues.
127
-
128 148
   </div>
129 149
   <!-- END MAINCOL -->
130 150
   <div id = "sidecol">