diff options
| author | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-10 18:53:38 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-10 18:53:38 -0700 |
| commit | 8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9 (patch) | |
| tree | 92eabec1394092735e8b6e47f664f0094b76e6be /src/or/onion.c | |
| parent | ec97319464aab204740acb013b504abb0e13d989 (diff) | |
| parent | bd28322d3815a03ca04beb6d00052d613dbe226f (diff) | |
| download | tor-8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9.tar.gz tor-8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9.zip | |
Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor
Diffstat (limited to 'src/or/onion.c')
| -rw-r--r-- | src/or/onion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/onion.c b/src/or/onion.c index ff1556c3e1..17d8e777ad 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -106,7 +106,7 @@ onion_next_task(char **onionskin_out) return NULL; /* no onions pending, we're done */ tor_assert(ol_list->circ); - tor_assert(ol_list->circ->p_conn); /* make sure it's still valid */ + tor_assert(ol_list->circ->p_chan); /* make sure it's still valid */ tor_assert(ol_length > 0); circ = ol_list->circ; *onionskin_out = ol_list->onionskin; |