Merge commit 'karsten/dirbytes2'

Conflicts:
	src/or/rephist.h

1 files changed, 4 insertions, 0 deletions

diff --git a/src/or/rephist.h b/src/or/rephist.h
index 02ab2f1cbd..c3914dcaf2 100644
--- a/src/or/rephist.h
+++ b/src/or/rephist.h
@@ -23,6 +23,10 @@ void rep_hist_note_extend_failed(const char *from_name, const char *to_name);
 void rep_hist_dump_stats(time_t now, int severity);
 void rep_hist_note_bytes_read(size_t num_bytes, time_t when);
 void rep_hist_note_bytes_written(size_t num_bytes, time_t when);
+
+void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when);
+void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when);
+
 int rep_hist_bandwidth_assess(void);
 char *rep_hist_get_bandwidth_lines(int for_extrainfo);
 void rep_hist_update_state(or_state_t *state);