Merge branch 'less_charbuf_rebased' into maint-0.2.4

Conflicts:
	src/or/dirserv.c
	src/or/dirserv.h
	src/test/test_dir.c

1 files changed, 3 insertions, 2 deletions

diff --git a/src/or/routerparse.h b/src/or/routerparse.h
index 7bf7d79073..c65cdc996c 100644
--- a/src/or/routerparse.h
+++ b/src/or/routerparse.h
@@ -16,11 +16,12 @@ int router_get_router_hash(const char *s, size_t s_len, char *digest);
 int router_get_dir_hash(const char *s, char *digest);
 int router_get_runningrouters_hash(const char *s, char *digest);
 int router_get_networkstatus_v2_hash(const char *s, char *digest);
-int router_get_networkstatus_v3_hash(const char *s, char *digest,
-                                     digest_algorithm_t algorithm);
 int router_get_networkstatus_v3_hashes(const char *s, digests_t *digests);
 int router_get_extrainfo_hash(const char *s, size_t s_len, char *digest);
 #define DIROBJ_MAX_SIG_LEN 256
+char *router_get_dirobj_signature(const char *digest,
+                                  size_t digest_len,
+                                  crypto_pk_t *private_key);
 int router_append_dirobj_signature(char *buf, size_t buf_len,
                                    const char *digest,
                                    size_t digest_len,