Merge remote-tracking branch 'origin/maint-0.2.4'

This commit is contained in:
Nick Mathewson
2013-03-20 10:34:31 -04:00
3 changed files with 20 additions and 15 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes:
- Behave correctly when the user disables LearnCircuitBuildTimeout
but doesn't tell us what they would like the timeout to be. Fixes
bug 6304; bugfix on 0.2.2.14-alpha.