diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-20 10:42:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-20 10:42:29 -0400 |
| commit | 583df33e2079c6f7b5e0ebe34b5f29d8739a673b (patch) | |
| tree | bff0788f96c84c0f9a553bda2afed28b8f96ecc8 /src | |
| parent | 3c490190163e227d37eb989b41df152e8500e059 (diff) | |
| parent | 977821e59fb6e57639a842f498be32633bb0b0e1 (diff) | |
| download | tor-583df33e2079c6f7b5e0ebe34b5f29d8739a673b.tar.gz tor-583df33e2079c6f7b5e0ebe34b5f29d8739a673b.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src')
| -rw-r--r-- | src/feature/control/control.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 12f10926b7..f22df30e11 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -2011,6 +2011,8 @@ getinfo_helper_listeners(control_connection_t *control_conn, if (!strcmp(question, "net/listeners/or")) type = CONN_TYPE_OR_LISTENER; + else if (!strcmp(question, "net/listeners/extor")) + type = CONN_TYPE_EXT_OR_LISTENER; else if (!strcmp(question, "net/listeners/dir")) type = CONN_TYPE_DIR_LISTENER; else if (!strcmp(question, "net/listeners/socks")) @@ -2019,6 +2021,8 @@ getinfo_helper_listeners(control_connection_t *control_conn, type = CONN_TYPE_AP_TRANS_LISTENER; else if (!strcmp(question, "net/listeners/natd")) type = CONN_TYPE_AP_NATD_LISTENER; + else if (!strcmp(question, "net/listeners/httptunnel")) + type = CONN_TYPE_AP_HTTP_CONNECT_LISTENER; else if (!strcmp(question, "net/listeners/dns")) type = CONN_TYPE_AP_DNS_LISTENER; else if (!strcmp(question, "net/listeners/control")) |