55e8cae815
add a "docs" to the manual URI as listed in torrc.sample.in
2012-02-08 10:52:05 -05:00
121ae29ed9
Merge branch 'maint-0.2.2' into release-0.2.2
2012-02-02 02:33:03 -05:00
688903e919
Update "ClientOnly" man page entry
...
There isn't really any point to messing with it. Resolves ticket 5005.
2012-02-02 02:31:28 -05:00
6d595fa4cf
Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2
2012-01-18 15:29:25 -05:00
676bba8e0c
Documentation for GiveGuardFlagTo... option
2012-01-18 14:44:29 -05:00
dd4b1a2ac6
Fix SOCKET_OK test on win64.
...
Bugfix on 0.2.2.29-beta; partial fix for 4533; found by wanoskarnet
2012-01-18 10:48:29 -05:00
0126150c2d
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2012-01-11 11:07:13 -05:00
8d5c0e58ea
Fix a compilation warning for our bug4822 fix on 64-bit linux
2012-01-11 11:06:31 -05:00
6cd68895fb
Merge branch 'maint-0.2.2' into release-0.2.2
2012-01-10 20:26:50 -05:00
c78a314e95
Fix comment about TLSv1_method() per comments by wanoskarnet
2012-01-09 16:40:21 -05:00
6fd61cf767
Fix a trivial log message error in renservice.c
...
Fixes bug 4856; bugfix on 0.0.6
This bug was introduced in 79fc5217
2012-01-09 12:21:04 -05:00
0a77d5324f
Merge branch 'maint-0.2.2' into release-0.2.2
2012-01-08 12:17:03 -05:00
cc1580dbe0
when the consensus fails, list which dir auths were in or out
2012-01-08 12:14:44 -05:00
04bf17c50c
nickname, not identity fingerprint, will help more
2012-01-08 12:09:01 -05:00
78e95b7b71
tell me who votes are actually for, not just where they're from
2012-01-08 10:03:46 -05:00
1416dd47a9
add a note from wanoskarnet
...
he disagrees about what the code that we decided not to use would do
2012-01-08 09:03:03 -05:00
031ac2a49e
clean up the changelog some more
2012-01-07 06:35:44 -05:00
6c02f4d2e3
fold in the next 0.2.2 changes
2012-01-05 18:38:32 -05:00
43454a872e
Merge branch 'maint-0.2.2' into release-0.2.2
2012-01-05 18:28:27 -05:00
ccd8289958
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2012-01-05 14:16:30 -05:00
b839ace7d0
Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1
2012-01-05 14:11:42 -05:00
4752b34879
Log at info level when disabling SSLv3
2012-01-05 12:28:56 -05:00
0a00678e56
Add a changes file for bug4822
2012-01-05 12:28:55 -05:00
db78fe4589
Disable SSLv3 when using a not-up-to-date openssl
...
This is to address bug 4822, and CVE-2011-4576.
2012-01-05 12:28:55 -05:00
98402d0865
Merge branch 'maint-0.2.2' into release-0.2.2
2012-01-05 06:46:01 -05:00
a1074c7aa2
Merge branch 'maint-0.2.1' into maint-0.2.2
2012-01-05 06:45:28 -05:00
df17b62d54
add a changes file for ticket 4825
2012-01-05 06:42:26 -05:00
1db1b23a7b
Update to the January 2012 GeoIP database.
2012-01-05 11:10:57 +01:00
d861b4cc9d
Fix spelling in a controlsocket log msg
...
Fixes bug 4803.
2011-12-30 23:27:02 +01:00
84bf8e3808
Merge remote-tracking branch 'public/bug4788' into maint-0.2.2
2011-12-28 16:50:45 -05:00
c563551eef
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-12-28 15:56:37 -05:00
120a745346
Bug 4786 fix: don't convert EARLY to RELAY on v1 connections
...
We used to do this as a workaround for older Tors, but now it's never
the correct thing to do (especially since anything that didn't
understand RELAY_EARLY is now deprecated hard).
2011-12-28 15:54:06 -05:00
9bcb187387
Authorities reject insecure Tors.
...
This patch should make us reject every Tor that was vulnerable to
CVE-2011-0427. Additionally, it makes us reject every Tor that couldn't
handle RELAY_EARLY cells, which helps with proposal 110 (#4339 ).
2011-12-27 21:47:04 -05:00
da876aec63
Provide correct timeradd/timersup replacements
...
Bug caught and patch provided by Vektor. Fixes bug 4778.t
2011-12-25 23:19:08 +01:00
b5e6bbc01d
Do not even try to keep going on a socket with socklen==0
...
Back in #1240 , r1eo linked to information about how this could happen
with older Linux kernels in response to nmap. Bugs #4545 and #4547
are about how our approach to trying to deal with this condition was
broken and stupid. Thanks to wanoskarnet for reminding us about #1240 .
This is a fix for the abovementioned bugs, and is a bugfix on
0.1.0.3-rc.
2011-12-21 11:19:41 -05:00
cefff11950
Merge remote-tracking branch 'sebastian/clang-3.0-fixes_022' into maint-0.2.2
2011-12-16 17:49:41 -05:00
1208c179fb
fix extra words and minor whitespace
2011-12-16 12:47:05 -05:00
b04388f9e7
Copy 0.2.2.35 changelog into releasenotes; fix a date
2011-12-15 13:16:30 -05:00
796563f7f3
Actually merge the CVE-2011-2778 log entry into ChangeLog
2011-12-15 13:14:50 -05:00
7264e0d880
Increment release to 0.2.2.35
2011-12-15 12:02:38 -05:00
d4b935e77f
Changelog for 0.2.2.35
2011-12-15 11:56:26 -05:00
2c70ca0e94
Merge branch 'maint-0.2.2' into release-0.2.2
2011-12-15 11:38:40 -05:00
562c974ee7
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-12-15 11:28:44 -05:00
9d0777839b
Add a fix for the buf_pullup bug that Vektor reported
2011-12-15 11:28:24 -05:00
ed46539050
Merge changes files for 0.2.2.35; start work on a blurb
2011-12-14 16:01:33 -05:00
bcca541da9
Build with warnings and clang 3.0
...
--enable-gcc-warnings enables two warnings that clang doesn't support,
so the build fails. We had hoped clang 3.0 would add those, but it
didn't, so let's just always disable those warnings when building with
clang. We can still fix it later once they add support
2011-12-13 07:43:53 +01:00
9fdfc10092
Merge branch 'maint-0.2.2' into release-0.2.2
2011-12-08 17:23:58 -05:00
0582746e0d
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-12-08 04:40:15 -05:00
ff2c9acbb3
Update to the December 2011 GeoIP database.
2011-12-08 09:55:44 +01:00
6171bdd105
Don't call tor_tls_set_logged_address till after checking conn->tls
...
Fixes bug 4531; partial backport of e27a26d5
2011-12-02 16:15:52 -05:00
Nick Mathewson
Roger Dingledine
Robert Ransom
Karsten Loesing
Sebastian Hahn