aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-25 01:24:39 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-25 01:24:39 -0400
commitd3c05a79f0b3e688e43edfffe9886664777517f7 (patch)
treecaf18aa657f83c5bf224bd2750dc5e81d2000e3d /src/or/circuitbuild.c
parent12b1d64b0378450fb8c69dfe81fde2d1cd1b36b1 (diff)
parent5470795b834a788ec482f22091d58b27a1999a2d (diff)
downloadtor-d3c05a79f0b3e688e43edfffe9886664777517f7.tar
tor-d3c05a79f0b3e688e43edfffe9886664777517f7.tar.gz
Merge branch 'scanbuild_fixes'
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 583ccff78..cd92326b3 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -313,9 +313,9 @@ circuit_rep_hist_note_result(origin_circuit_t *circ)
static int
circuit_cpath_supports_ntor(const origin_circuit_t *circ)
{
- crypt_path_t *head = circ->cpath, *cpath = circ->cpath;
+ crypt_path_t *head, *cpath;
- cpath = head;
+ cpath = head = circ->cpath;
do {
if (cpath->extend_info &&
!tor_mem_is_zero(