]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Fri, 8 Aug 2014 14:09:17 +0000 (10:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 8 Aug 2014 14:09:17 +0000 (10:09 -0400)
commitbb68c731b897a967a4b7eb138728fa077617646e
tree20d7c23762568756b01a6f698d09b7bee6dad808
parent374611d9f6d1efd7ae6c3570104b284991519293
parentfcac4b4467427e8f6ad948e8c8e6f34a0131e716
Merge remote-tracking branch 'origin/maint-0.2.5'
src/or/directory.c
src/or/routerlist.c