Commit a6a97236 authored by David Goulet's avatar David Goulet 🆘
Browse files

Merge branch 'tor-gitlab/mr/135'

parents d4f3cfe9 90707c92
...@@ -249,8 +249,8 @@ get_configured_bridge_by_exact_addr_port_digest(const tor_addr_t *addr, ...@@ -249,8 +249,8 @@ get_configured_bridge_by_exact_addr_port_digest(const tor_addr_t *addr,
* address/port matches only. */ * address/port matches only. */
int int
addr_is_a_configured_bridge(const tor_addr_t *addr, addr_is_a_configured_bridge(const tor_addr_t *addr,
uint16_t port, uint16_t port,
const char *digest) const char *digest)
{ {
tor_assert(addr); tor_assert(addr);
return get_configured_bridge_by_addr_port_digest(addr, port, digest) ? 1 : 0; return get_configured_bridge_by_addr_port_digest(addr, port, digest) ? 1 : 0;
...@@ -596,7 +596,7 @@ find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port) ...@@ -596,7 +596,7 @@ find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port)
*/ */
int int
get_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, get_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port,
const transport_t **transport) const transport_t **transport)
{ {
*transport = NULL; *transport = NULL;
if (!bridge_list) if (!bridge_list)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment