summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-02 17:49:42 -0500
committerNick Mathewson <nickm@torproject.org>2010-09-27 14:22:18 -0400
commit98ec959c9c1d2b0a872926a3cafe42742520397a (patch)
treeab49b76a5c04d9a748667a304bda10c87e64c823 /src/or/main.c
parent0c9b64d449a725dc2f9f043d174b581e3a5d9cb2 (diff)
downloadtor-98ec959c9c1d2b0a872926a3cafe42742520397a.tar.gz
tor-98ec959c9c1d2b0a872926a3cafe42742520397a.zip
Fix a couple of bufferevent incompatibilities that snuck in.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 263103662c..f6f26b05f9 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -925,7 +925,11 @@ run_connection_housekeeping(int i, time_t now)
the connection or send a keepalive, depending. */
or_conn = TO_OR_CONN(conn);
+#ifdef USE_BUFFEREVENTS
+ tor_assert(conn->bufev);
+#else
tor_assert(conn->outbuf);
+#endif
if (or_conn->is_bad_for_new_circs && !or_conn->n_circuits) {
/* It's bad for new circuits, and has no unmarked circuits on it: