Merge branch 'ticket9176_squashed'

Conflicts:
	doc/tor.1.txt
This commit is contained in:
Nick Mathewson
2014-03-05 14:32:05 -05:00
5 changed files with 39 additions and 8 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor features:
- Made PREDICTED_CIRCS_RELEVANCE_TIME configurable from config
file. Implements ticket #9176. Patch by unixninja92.