]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Apr 2013 05:40:31 +0000 (01:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Apr 2013 05:40:31 +0000 (01:40 -0400)
commit3dfd1ebf12671323e97b002f66484544d90f1bae
treec4b9e9e34104693f35ecbb18cadc8aacaf3eeef2
parent8e7226cf7f1f14032158c0c057050c0ac87740e6
parent7f50af116f2497a73fe9113e814a5765047cf3ca
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/config.c
src/or/connection.c
src/or/or.h