]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Wed, 16 Jul 2014 09:01:20 +0000 (11:01 +0200)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 Jul 2014 09:01:20 +0000 (11:01 +0200)
commit7591ce64fbaae8d480224a93d62abda10011c2ba
tree48d7d458c6418d737935a4beb6f4e960b04c3065
parent7bc7188fc94f6662690e07039b4e01dd8a92cdbc
parent9e46855538e9b848b7c37fda502e5d109079cee0
Merge remote-tracking branch 'origin/maint-0.2.5'
configure.ac
src/or/main.c
src/or/router.c