summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-05-29 19:11:07 -0400
committerRoger Dingledine <arma@torproject.org>2011-05-29 19:11:07 -0400
commit6917728637bdbaed86d48d394eab6a063c319269 (patch)
tree78137c7234bfa4a55925e1a01822614d68d501ee /src/or/circuitbuild.c
parente676db656da1c3911f0667faa4fd2396db1c9e8f (diff)
parent5f182ea10e25ed027cf75627f74013e7c6da2038 (diff)
downloadtor-6917728637bdbaed86d48d394eab6a063c319269.tar.gz
tor-6917728637bdbaed86d48d394eab6a063c319269.zip
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 97e57ab61f..34bb1fd065 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -263,7 +263,7 @@ circuit_build_times_test_frequency(void)
}
/**
- * Retrieve and bounds-check the cbtmintimeout consensus paramter.
+ * Retrieve and bounds-check the cbtmintimeout consensus parameter.
*
* Effect: This is the minimum allowed timeout value in milliseconds.
* The minimum is to prevent rounding to 0 (we only check once