Backed out changeset 98e9fea75e5b

Backed out changeset 37b3e9ed8918 (again)

Backed out changeset a0fc73d5f48c

Backed out changeset 8f17ba74823c

Reverting stanza_router to non-conflicted version

Making the best attempt out of a bad merge from waqas

Added TODO

(0) -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 tip

mercurial