]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3934e78 5a83122)
Merge remote-tracking branch 'arma/bug18840'
authorNick Mathewson <nickm@torproject.org>
Fri, 27 May 2016 14:35:55 +0000 (10:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 27 May 2016 14:35:55 +0000 (10:35 -0400)
1  2 
src/or/dirvote.c patch | diff1 | diff2 | blob | history

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