]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commit9c58905a2bfd1049613173c27c357e8a20ff066a
treea4e8133475ea8720c294562dca8d764558826fd9
parentef83db4fe85f2c73b5891d5b8e53ca776dc230f8
parenta1d7f7ea503f2f739953d6a25ebb5d93981604be
Merge branch 'maint-0.2.4' into master
src/or/dirserv.c