aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-27 15:34:02 -0500
committerNick Mathewson <nickm@torproject.org>2010-02-27 15:34:02 -0500
commit937b5cdd41b03a6e05af4003a444172e3e88a31d (patch)
tree45e64a43d551816d0d7a5a443a19ada1f90dc2a4 /src/or/routerlist.c
parent1c39dbd53a4c47ac3bfd6770d0ca2f8f058f888b (diff)
parentb67657bd952919d0b738a1ffd6c48cc369604873 (diff)
downloadtor-937b5cdd41b03a6e05af4003a444172e3e88a31d.tar.gz
tor-937b5cdd41b03a6e05af4003a444172e3e88a31d.zip
Merge remote branch 'origin/maint-0.2.1'
Conflicts: ChangeLog src/or/routerparse.c
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 80229f2141..5f1aa42089 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -583,8 +583,6 @@ signed_desc_append_to_journal(signed_descriptor_t *desc,
const char *body = signed_descriptor_get_body_impl(desc,1);
size_t len = desc->signed_descriptor_len + desc->annotations_len;
- tor_assert(len == strlen(body));
-
if (append_bytes_to_file(fname, body, len, 1)) {
log_warn(LD_FS, "Unable to store router descriptor");
tor_free(fname);