diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-25 14:29:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-25 14:29:06 -0400 |
| commit | 1dfa2213a424c36d4aa70fdab60b27b6b5e1ced2 (patch) | |
| tree | b53afb27b4ab30c2913ac5e4fba69e8f319fdbc7 /src/or/connection_or.c | |
| parent | 20136a8207f0cda0d23093a884caae0358f98bac (diff) | |
| parent | 9a09513c0bd54abae3317be4136cf2578e11fbf3 (diff) | |
| download | tor-1dfa2213a424c36d4aa70fdab60b27b6b5e1ced2.tar.gz tor-1dfa2213a424c36d4aa70fdab60b27b6b5e1ced2.zip | |
Merge remote-tracking branch 'andrea/ticket18640_v3'
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 1f0c4bdef5..72d8e13e90 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -394,8 +394,8 @@ connection_or_change_state(or_connection_t *conn, uint8_t state) * be an or_connection_t field, but it got moved to channel_t and we * shouldn't maintain two copies. */ -int -connection_or_get_num_circuits(or_connection_t *conn) +MOCK_IMPL(int, +connection_or_get_num_circuits, (or_connection_t *conn)) { tor_assert(conn); |