Merge branch 'bug25843_v2_squashed'

This commit is contained in:
Nick Mathewson
2018-04-27 12:45:07 -04:00
6 changed files with 47 additions and 6 deletions
+3
View File
@@ -0,0 +1,3 @@
o Minor feature (entry guards):
- Introduce torrc option NumPrimaryGuards for controlling the number of
primary guards. Closes ticket 25843.