diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-26 09:03:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-26 09:03:30 -0500 |
| commit | 3d2366c676233c30133928940b4bc19d8f25f193 (patch) | |
| tree | 22fdc9c7ddd42e762416aeebadd904574087a666 /src/or/or.h | |
| parent | 3a91a08e212ac125215b9aff5ad1ae4102623ab9 (diff) | |
| parent | 415a841378db2489c525ea0c55b169bd2894e992 (diff) | |
| download | tor-3d2366c676233c30133928940b4bc19d8f25f193.tar.gz tor-3d2366c676233c30133928940b4bc19d8f25f193.zip | |
Merge remote-tracking branch 'public/bug13126'
Conflicts:
src/or/or.h
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index bbb9192757..bff7267d37 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -5025,7 +5025,7 @@ typedef enum was_router_added_t { ROUTER_WAS_NOT_WANTED = -6, /* Router descriptor was rejected because it was older than * OLD_ROUTER_DESC_MAX_AGE. */ - ROUTER_WAS_TOO_OLD = -7, + ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'NOT_NEW' */ } was_router_added_t; /********************************* routerparse.c ************************/ |