diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-03 08:44:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-03 08:44:46 -0400 |
| commit | d9ca4e20bd51915317c7bda38ef56c67499f6f5e (patch) | |
| tree | 992d25548574cbe67a0c1fb791b12f24997be2b8 /src/or/channel.c | |
| parent | 25f53955f6d4fd85a7a1a50484a62d18dfa96524 (diff) | |
| parent | f156156d56ec61394eb814397c33557762870809 (diff) | |
| download | tor-d9ca4e20bd51915317c7bda38ef56c67499f6f5e.tar.gz tor-d9ca4e20bd51915317c7bda38ef56c67499f6f5e.zip | |
Merge branch 'feature_15055_v2'
Diffstat (limited to 'src/or/channel.c')
| -rw-r--r-- | src/or/channel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 75aab3cfef..939b7f93e4 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3220,9 +3220,10 @@ channel_free_all(void) channel_t * channel_connect(const tor_addr_t *addr, uint16_t port, - const char *id_digest) + const char *id_digest, + const ed25519_public_key_t *ed_id) { - return channel_tls_connect(addr, port, id_digest); + return channel_tls_connect(addr, port, id_digest, ed_id); } /** |