]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'ctoader/gsoc-cap-stage2'
authorNick Mathewson <nickm@torproject.org>
Fri, 13 Sep 2013 16:31:41 +0000 (12:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 13 Sep 2013 16:31:41 +0000 (12:31 -0400)
commite0b2cd061bd62fc790d434b2da7ecc51ed100904
tree0bdd72522895a018e4fc9765df0f3067eff940a1
parentdffc5c3f240e7734e85a427b951c4e493c85906c
parent7cf1b9cc33ab2ba13d84e08105699dd1f39dae1d
Merge remote-tracking branch 'ctoader/gsoc-cap-stage2'

Conflicts:
src/common/sandbox.c
configure.ac
src/common/compat.c
src/common/crypto.c
src/common/sandbox.c
src/common/util.c
src/common/util.h
src/or/config.c
src/or/dns.c
src/or/main.c
src/or/routerlist.c