diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-25 12:49:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-25 12:49:09 -0500 |
| commit | 3a91a08e212ac125215b9aff5ad1ae4102623ab9 (patch) | |
| tree | fa1de2fd1a983952a5be9707c9b21ff78e3a4e0d /src/or/or.h | |
| parent | b4ead16d57fab6a8294a0bf374bfcdb0d6e02625 (diff) | |
| parent | bf67a60b86b92f94d0c8b3c13edf4e8ff965c324 (diff) | |
| download | tor-3a91a08e212ac125215b9aff5ad1ae4102623ab9.tar.gz tor-3a91a08e212ac125215b9aff5ad1ae4102623ab9.zip | |
Merge branch 'feature9503_squashed'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 8a9c1cf76e..bbb9192757 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -119,6 +119,7 @@ * conflict with system-defined signals. */ #define SIGNEWNYM 129 #define SIGCLEARDNSCACHE 130 +#define SIGHEARTBEAT 131 #if (SIZEOF_CELL_T != 0) /* On Irix, stdlib.h defines a cell_t type, so we need to make sure |