diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 19:48:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 19:48:49 -0400 |
| commit | a7f6e434be6aa402153af0c6dd3238c58e35ed27 (patch) | |
| tree | f5fe87713048ee9e7b89da553b974fa0b420de10 /src/or/routerlist.h | |
| parent | 36909674b45d05854b821b6ac5952126a2cd2ab3 (diff) | |
| parent | 3f49474349538be499ab485c697c147c8829fa0d (diff) | |
| download | tor-a7f6e434be6aa402153af0c6dd3238c58e35ed27.tar.gz tor-a7f6e434be6aa402153af0c6dd3238c58e35ed27.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or/routerlist.h')
| -rw-r--r-- | src/or/routerlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerlist.h b/src/or/routerlist.h index bd0fa0292f..d5a9b77a82 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -192,7 +192,7 @@ void update_extrainfo_downloads(time_t now); void router_reset_descriptor_download_failures(void); int router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2); -int routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri, +int routerinfo_incompatible_with_extrainfo(const crypto_pk_t *ri, extrainfo_t *ei, signed_descriptor_t *sd, const char **msg); |