diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-02 19:18:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-02 19:18:04 -0400 |
| commit | 7bc9f93abbfcabba1acde441b5fac98d4676c08e (patch) | |
| tree | fb81ff00f65a99dd7a669f3f9ab5c0ce02bae542 /src/or/channel.h | |
| parent | a91f948ccac5e681de9e8e63efb267c7ad9e9f5f (diff) | |
| parent | f9af7e8bd01d4b7a70776a96c649a89cf1717dd1 (diff) | |
| download | tor-7bc9f93abbfcabba1acde441b5fac98d4676c08e.tar.gz tor-7bc9f93abbfcabba1acde441b5fac98d4676c08e.zip | |
Merge branch 'teor_connection-with-client-v2_squashed'
Diffstat (limited to 'src/or/channel.h')
| -rw-r--r-- | src/or/channel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channel.h b/src/or/channel.h index 33dceb1be0..3d97b8e306 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -214,8 +214,8 @@ struct channel_s { unsigned int is_bad_for_new_circs:1; /** True iff we have decided that the other end of this connection - * is a client. Channels with this flag set should never be used - * to satisfy an EXTEND request. */ + * is a client or bridge relay. Connections with this flag set should never + * be used to satisfy an EXTEND request. */ unsigned int is_client:1; /** Set if the channel was initiated remotely (came from a listener) */ |