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, 2 insertions, 1 deletions

diff --git a/src/or/or.h b/src/or/or.h
index d7142e298a..f2f27eea5f 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2329,7 +2329,8 @@ typedef struct networkstatus_v2_t {
 typedef struct vote_microdesc_hash_t {
   /** Next element in the list, or NULL. */
   struct vote_microdesc_hash_t *next;
-  /** The raw contents of the microdesc hash line, excluding the "m". */
+  /** The raw contents of the microdesc hash line, from the "m" through the
+   * newline. */
   char *microdesc_hash_line;
 } vote_microdesc_hash_t;