need to link against -lgcc_s for the testsuite to work
Merge branch 'tor.130308' of git://github.com/jcumming/nixpkgs

This commit ensures tor is linked to lgcc_s. Tests didn't pass before,
pass now.

Signed-off-by: Shea Levy <shea@shealevy.com>
tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do
tor: minor cleanups

Signed-off-by: Shea Levy <shea@shealevy.com>