aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerparse.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-12-17 13:15:45 -0500
committerNick Mathewson <nickm@torproject.org>2013-12-17 13:15:45 -0500
commit3d5154550c92766347631e4d15fae825a0f165dd (patch)
tree1c696321c3613a2983d1872934b6d76d6931d9f5 /src/or/routerparse.h
parent59f50c80d443a7e148f85cfed493e3e703cc4386 (diff)
parentd8cfa2ef4e6d57f6dd4a33e5b3cfb1a2a12fc4be (diff)
downloadtor-3d5154550c92766347631e4d15fae825a0f165dd.tar
tor-3d5154550c92766347631e4d15fae825a0f165dd.tar.gz
Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4
Diffstat (limited to 'src/or/routerparse.h')
-rw-r--r--src/or/routerparse.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerparse.h b/src/or/routerparse.h
index c65cdc996..eb2e885cb 100644
--- a/src/or/routerparse.h
+++ b/src/or/routerparse.h
@@ -64,7 +64,7 @@ ns_detached_signatures_t *networkstatus_parse_detached_signatures(
smartlist_t *microdescs_parse_from_string(const char *s, const char *eos,
int allow_annotations,
- int copy_body);
+ saved_location_t where);
authority_cert_t *authority_cert_parse_from_string(const char *s,
const char **end_of_string);