Merge commit 'origin/maint-0.2.1'

diff --cc ChangeLog
Simple merge

diff --cc src/common/memarea.c
index 8d363fd5acaac7f633b28386e79d4629c492fcdb,1c81e2fd78b23da3e5256432cc2df6311d19cd63..e7f6720646856f2f262c1676784f9b0d4c141390
--- 1/src/common/memarea.c
--- 2/src/common/memarea.c
+++ b/src/common/memarea.c
@@@ -210,7 -182,8 +210,9 @@@ memarea_alloc(memarea_t *area, size_t s
    memarea_chunk_t *chunk = area->first;
    char *result;
    tor_assert(chunk);
 +  CHECK_SENTINEL(chunk);
+   if (sz == 0)
+     sz = 1;
    if (chunk->next_mem+sz > chunk->u.mem+chunk->mem_size) {
      if (sz+CHUNK_HEADER_SIZE >= CHUNK_SIZE) {
        /* This allocation is too big.  Stick it in a special chunk, and put
@@@ -301,9 -274,9 +304,10 @@@ memarea_assert_ok(memarea_t *area
    tor_assert(area->first);
  
    for (chunk = area->first; chunk; chunk = chunk->next_chunk) {
 +    CHECK_SENTINEL(chunk);
      tor_assert(chunk->next_mem >= chunk->u.mem);
-     tor_assert(chunk->next_mem <= chunk->u.mem+chunk->mem_size+MEMAREA_ALIGN);
+     tor_assert(chunk->next_mem <=
+           (char*) realign_pointer(chunk->u.mem+chunk->mem_size));
    }
  }