Merge branch 'bug24526_squashed'

This commit is contained in:
Nick Mathewson
2018-01-11 12:33:52 -05:00
4 changed files with 27 additions and 2 deletions
+4
View File
@@ -0,0 +1,4 @@
o Documentation:
- Document that operators who run more than one relay or bridge are
expected to set MyFamily and ContactInfo correctly. Closes ticket
24526.