diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:09:32 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:09:32 -0400 |
commit | 57b954293e3880f3b39d2f0f0f7710250e8ffc5f (patch) | |
tree | 06800a08323c179e6e38292ebba543165b0fb22d /src/or/circuitbuild.c | |
parent | 415caba967b9b470623ab29230b820b3470a91e6 (diff) | |
parent | 6617822b841e32d6339bac13c79dd5f2b566c3c6 (diff) | |
download | tor-57b954293e3880f3b39d2f0f0f7710250e8ffc5f.tar tor-57b954293e3880f3b39d2f0f0f7710250e8ffc5f.tar.gz |
Merge remote-tracking branch 'origin/maint-0.2.2'
Trivial Conflicts in
src/common/crypto.c
src/or/main.h
src/or/or.h
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r-- | src/or/circuitbuild.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 015dfb479..28b1e795f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -458,7 +458,7 @@ circuit_build_times_rewind_history(circuit_build_times_t *cbt, int n) * Add a new build time value <b>time</b> to the set of build times. Time * units are milliseconds. * - * circuit_build_times <b>cbt</a> is a circular array, so loop around when + * circuit_build_times <b>cbt</b> is a circular array, so loop around when * array is full. */ int @@ -656,7 +656,7 @@ circuit_build_times_update_state(circuit_build_times_t *cbt, /** * Shuffle the build times array. * - * Stolen from http://en.wikipedia.org/wiki/Fisher\u2013Yates_shuffle + * Adapted from http://en.wikipedia.org/wiki/Fisher-Yates_shuffle */ static void circuit_build_times_shuffle_and_store_array(circuit_build_times_t *cbt, |