diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-12 01:14:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-12 01:14:32 -0400 |
| commit | 63ab5f4849620cee81c578d231174bf9f846d740 (patch) | |
| tree | c8a476701ec9d0b17775dfae6b12c4b6f51f8443 /src/or/or.h | |
| parent | d39f7138063125b92f738715ca1bcd53f5ef147c (diff) | |
| parent | 97246a5b6d6c2e25db14e7a82f4a01b876447101 (diff) | |
| download | tor-63ab5f4849620cee81c578d231174bf9f846d740.tar.gz tor-63ab5f4849620cee81c578d231174bf9f846d740.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 7252c6cd13..f5c5fc68ea 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1165,6 +1165,9 @@ typedef struct connection_t { /** Set to 1 when we're inside connection_flushed_some to keep us from * calling connection_handle_write() recursively. */ unsigned int in_flushed_some:1; + /** True if connection_handle_write is currently running on this connection. + */ + unsigned int in_connection_handle_write:1; /* For linked connections: */ |