diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 19:47:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 19:47:22 -0400 |
| commit | 3f49474349538be499ab485c697c147c8829fa0d (patch) | |
| tree | 060784f765cd523151958a0c0ef34064f17ee407 /src/or/routerlist.h | |
| parent | d6a2fec05ebcc39773a2f6666e1378410c64f047 (diff) | |
| parent | 00f74e0372a956f9db590e1cb2ddcfb265125023 (diff) | |
| download | tor-3f49474349538be499ab485c697c147c8829fa0d.tar.gz tor-3f49474349538be499ab485c697c147c8829fa0d.zip | |
Merge branch 'bug17150_027_extra' into 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 bc48c2087c..67cc253c5a 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -191,7 +191,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); |