Rename sun to s_un in test_addr.c

Apparently the compiler on solaris 9 didn't like "sun" as an identifier.

Fix for bug 10565; bugfix on 0.2.5.1-alpha.
Deliver circuit handshake counts as part of the heartbeat

Previously, they went out once an hour, unconditionally.

Fixes 10485; bugfix on 0.2.4.17-rc.
Merge branch 'bug10485_024' into maint-0.2.4
Add a missing include
Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
	changes/bug10485
	src/or/rephist.c
	src/or/status.c
Some anti-forensics paranoia...

sed -i 's/BN_free/BN_clear_free/g'
changelog for 10793
Merge remote-tracking branch 'origin/maint-0.2.4'