Conflicts:
	src/or/config.c

(this is an "ours" merge, to avoid taking 6a4f5d9b into 0.2.5: that
commit downgrades the bug 7164 warning in versions <= 0.2.4 because it
isn't as useful as the one 0.2.5 has)

Conflicts:
	src/or/microdesc.c

The 0.2.5.x warning is the one that might help us track this down; the
warnings in stable are just annoying users over and over and over.

We don't have any more latex files in Tor, so there's no reason to
.gitignore all of the latex droppings.  On the other hand, automake
likes to use .trs files and .log for test suite outputs.

In doc, restoring torify made us generate some .in files we didn't
before.

In contrib, we added tor.service.in, but didn't add tor.service to .gitignore

Doing an "ours" merge to avoid taking 35699ef9, which is
a cherry-picked backport of 9686.

on #9686, gmorehose reports that the 500 MB lower limit is too high
for raspberry pi users.

This is a backport of 64724872 to 0.2.4.

Note that in 0.2.4, the option is called MaxMemInCellQueues.

dana koch authored 10 years ago and Nick Mathewson committed 10 years ago

This was previously satisfied by using a temporary variable, but there
are three other instances in circuitlist.c that gcc is now bothered by,
so now introduce a CONST_TO_ORIGIN_CIRCUIT that takes a const
circuit_t instead.

This closes 8368.

When clearing a list of tokens, it's important to do token_clear()
on them first, or else any keys they contain will leak.  This didn't
leak memory on any of the successful microdescriptor parsing paths,
but it does leak on some failing paths when the failure happens
during tokenization.

Fixes bug 11618; bugfix on 0.2.2.6-alpha.

We pre-populate that value in main(), and we weren't freeing it
before overriding it.

This won't affect anybody's configuration, but it makes it match what
we documented. Fixes part of 11634.

Found with 'make check-docs'.  Part of 11634.

Fixes bug 11635; bugfix on 0.2.5.1-alpha.