 David Goulet
|
b5731cdf2e
mainloop: Set client role if ControlPort is set
|
6 years ago |
|
David Goulet
|
38599de2dd
test: Update approx_time before the test starts
|
6 years ago |
 Nick Mathewson
|
633e99575f
Merge branch 'maint-0.3.3' into maint-0.3.4
|
6 years ago |
|
Nick Mathewson
|
6b2ef2c559
Fix another tor_assert(0) case
|
6 years ago |
|
Nick Mathewson
|
d1ec7bb06e
Merge branch 'maint-0.3.3' into maint-0.3.4
|
6 years ago |
|
Nick Mathewson
|
86e0be421f
Merge branch 'maint-0.2.9' into maint-0.3.3
|
6 years ago |
|
Nick Mathewson
|
5b28190c67
Fix make check-spaces.
|
6 years ago |
|
Nick Mathewson
|
3462f8ed64
Merge branch 'maint-0.3.3' into maint-0.3.4
|
6 years ago |
|
Nick Mathewson
|
796e36e535
Adjust tor_assert_unreached()
|
6 years ago |
|
Nick Mathewson
|
fd528a0884
Merge branch 'maint-0.3.3' into maint-0.3.4
|
6 years ago |
|
Nick Mathewson
|
dff7d3d00a
Merge branch 'maint-0.2.9' into maint-0.3.3
|
6 years ago |
|
Nick Mathewson
|
b113399658
Merge branch 'bug27709_029' into maint-0.2.9
|
6 years ago |
|
Nick Mathewson
|
5e582c7ffa
Explain a bit more about branch prediction in the unit-test case
|
6 years ago |
|
Nick Mathewson
|
ffaf180b7e
Merge branch 'maint-0.3.3' into maint-0.3.4
|
6 years ago |
|
Nick Mathewson
|
f7e93cf2e7
Merge branch 'maint-0.2.9' into maint-0.3.3
|
6 years ago |
|
Nick Mathewson
|
717507e3bb
Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
|
6 years ago |
 Taylor Yu
|
484b259604
Merge branch 'bug27738-033' into bug27738-034
|
6 years ago |
|
Taylor Yu
|
cc10873dee
Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033
|
6 years ago |
|
Nick Mathewson
|
48182c147b
Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
|
6 years ago |
|
Nick Mathewson
|
e5fe8b0e3a
Merge branch 'maint-0.3.3' into maint-0.3.4
|
6 years ago |
|
Nick Mathewson
|
b057623bed
Merge branch 'maint-0.2.9' into maint-0.3.3
|
6 years ago |
 Karsten Loesing
|
119df9c1c0
Update geoip and geoip6 to the October 9 2018 database.
|
6 years ago |
|
Nick Mathewson
|
c6b5b43d92
fixup! Changes file for apveyor changes
|
6 years ago |
|
Nick Mathewson
|
8c0009a8de
Changes file for apveyor changes
|
6 years ago |
|
Nick Mathewson
|
1b57bbba02
Appveyor: Don't try to install the mingw openssl package
|
6 years ago |
|
Nick Mathewson
|
c6d2990a73
Install only one of the two mingw architectures in appveyor
|
6 years ago |
|
Nick Mathewson
|
f57d8722e0
Fix the 0.3.4 part of bug 27781 (arm compilation)
|
6 years ago |
|
Nick Mathewson
|
e818a71905
Merge branch 'maint-0.3.3' into maint-0.3.4
|
6 years ago |
|
Nick Mathewson
|
2cadd93cea
Merge branch 'maint-0.3.2' into maint-0.3.3
|
6 years ago |
|
Nick Mathewson
|
5b04392c15
Merge branch 'maint-0.2.9' into maint-0.3.2
|
6 years ago |
