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, 4 insertions, 0 deletions

diff --git a/src/common/crypto.h b/src/common/crypto.h
index b78323078..2fbca4c26 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -205,6 +205,10 @@ int crypto_digest(char *digest, const char *m, size_t len);
 int crypto_digest256(char *digest, const char *m, size_t len,
                      digest_algorithm_t algorithm);
 int crypto_digest_all(digests_t *ds_out, const char *m, size_t len);
+struct smartlist_t;
+void crypto_digest_smartlist(char *digest_out, size_t len_out,
+                             const struct smartlist_t *lst, const char *append,
+                             digest_algorithm_t alg);
 const char *crypto_digest_algorithm_get_name(digest_algorithm_t alg);
 int crypto_digest_algorithm_parse_name(const char *name);
 crypto_digest_t *crypto_digest_new(void);