Nick Mathewson 60c86a3b79 Merge branch 'bug13315_squashed' ...

Conflicts:
	src/or/buffers.c

2014-11-04 00:48:25 -05:00

..

bug13214

Check descriptor ID in addition to HS ID when saving a v2 hs descriptor

2014-11-04 00:24:15 -05:00

bug13315

Adding changes file for 13315.

2014-11-04 00:37:24 -05:00

bug13399

Use digest256_len in networkstatus_copy_old_consensus_info()

2014-10-31 11:36:31 -04:00

bug13399_part1

Refactor {str,digest}map into a common implementation; add digest256map

2014-10-31 10:54:12 -04:00

spurious-clang-warnings

Silence spurious clang warnings

2014-10-30 22:34:46 +11:00