]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'teor/bug13718-consensus-interval'
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Dec 2014 19:25:37 +0000 (14:25 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Dec 2014 19:25:37 +0000 (14:25 -0500)
commitf9ba0b76cd5b447b86efa87eb115d12d6f0be2e7
treebac54f1a900879e11c417bbe759a6c77cfb2cad0
parentd7776315df8ec12a496127a5d5c3c9fcbec9c092
parent8a8797f1e45e6124ac93e3a8fb277b5758d7c935
Merge remote-tracking branch 'teor/bug13718-consensus-interval'
src/or/config.c
src/or/router.c