]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d777631 8a8797f)
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)
1  2 
src/or/config.c patch | diff1 | diff2 | blob | history
src/or/router.c patch | diff1 | diff2 | blob | history

diff --cc src/or/config.c
Simple merge
diff --cc src/or/router.c
Simple merge
Mirror of https://git.torproject.org/tor.git