]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef83db4 a1d7f7e)
Merge branch 'maint-0.2.4' into master
authorAndrea Shepard <andrea@torproject.org>
Tue, 7 May 2013 09:24:08 +0000 (02:24 -0700)
committerAndrea Shepard <andrea@torproject.org>
Tue, 7 May 2013 09:24:08 +0000 (02:24 -0700)
1  2 
src/or/dirserv.c patch | diff1 | diff2 | blob | history

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