aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-02 11:58:08 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-02 11:58:08 -0400
commite3c143f5214b4a2d37dbb47940eaf2cc2e212f86 (patch)
tree9dc89abc6d5816ae8ced5764124b50238eadce2b /src/or/connection.c
parent67c0ad54263be7fb742a8d499f97f5908f9ec970 (diff)
parentefcab439564dcadc5bc14609a9205d73d236e966 (diff)
downloadtor-e3c143f5214b4a2d37dbb47940eaf2cc2e212f86.tar.gz
tor-e3c143f5214b4a2d37dbb47940eaf2cc2e212f86.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 4d7cec7f9a..26ee4faf20 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1613,6 +1613,7 @@ connection_connect(connection_t *conn, const char *address,
}
}
+ tor_assert(options);
if (options->ConstrainedSockets)
set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize);