 Nick Mathewson
|
d50f90bfc4
Merge branch 'maint-0.3.4'
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
6e0872e867
Merge branch 'maint-0.3.3' into maint-0.3.4
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
e01ea64f0a
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
36bb11a650
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=6) %!d(string=hai) anos |
 teor
|
cc4ea34a26
Silence a compilation warning on MSVC 2017 and clang-cl
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
2ae92ab973
Merge branch 'maint-0.3.4'
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
ced350882d
Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4
|
%!s(int64=6) %!d(string=hai) anos |
|
teor
|
fadcab920b
Bootstrap: check the exit policy and flag on descriptors
|
%!s(int64=6) %!d(string=hai) anos |
|
teor
|
692efdad09
Update the message logged on relays when DirCache is disabled
|
%!s(int64=6) %!d(string=hai) anos |
 Dominique Ingoglia
|
8747afc5e0
Change the wording of the DirCache warning
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
8691046ac6
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
c1ad40627b
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
573b6e4f2f
Merge branch 'maint-0.3.3' into maint-0.3.4
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
ac44e70ffc
Merge branch 'maint-0.3.4'
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
9068e2fa28
Mark cert_matches_key as not-intrusive; fix stretch compilation.
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
e619fd02ef
Merge remote-tracking branch 'tor-github/pr/287'
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
3cfceeb45d
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
81e529d236
Merge branch 'maint-0.3.3' into maint-0.3.4
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
05cd3224a0
Merge branch 'maint-0.3.4'
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
bf5704051c
Merge remote-tracking branch 'teor/travis-osx-master'
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
aac1e17f22
Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
f0633bc491
Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
a5bbe3f1d0
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
a29e9a901d
Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
05d62a3b73
Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
|
%!s(int64=6) %!d(string=hai) anos |
 Neel Chauhan
|
3bf4493cb9
Remove duplicate include in src/test/test_address.c
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
de66bd397c
Merge branch 'maint-0.3.4'
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
f68aab83ba
Merge branch 'maint-0.3.3' into maint-0.3.4
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
245025a3df
Merge branch 'maint-0.3.2' into maint-0.3.3
|
%!s(int64=6) %!d(string=hai) anos |
|
Nick Mathewson
|
d52f406001
Merge branch 'maint-0.2.9' into maint-0.3.2
|
%!s(int64=6) %!d(string=hai) anos |
