nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 00:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,330 Commits 53 Branches 630 Tags 128 MiB
3b0140b811
Commit Graph

13330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
ebf6786ab3 Merge remote branch 'origin/maint-0.2.2' 
Fixed conflict: router_get_my_routerinfo now returns const

Conflicts:
	src/or/router.c
 2011-03-14 17:22:38 -04:00
Nick Mathewson
b97d9abd09 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 2011-03-14 17:04:53 -04:00
Nick Mathewson
50c9d31029 finish a comment 2011-03-14 16:46:43 -04:00
Nick Mathewson
e91a8c5589 Merge remote branch 'origin/maint-0.2.2' 
Resolved nontrivial conflict around rewrite_x_address_for_bridge and
learned_bridge_descriptor.  Now, since leanred_bridge_descriptor works
on nodes, we must make sure that rewrite_node_address_for_bridge also
works on nodes.

Conflicts:
	src/or/circuitbuild.c
 2011-03-14 16:34:33 -04:00
Nick Mathewson
0588330c1d Merge remote branch 'arma/bug2510' into maint-0.2.2 2011-03-14 16:14:54 -04:00
Roger Dingledine
cb101c4815 Merge branch 'bug2511' into bug2510 2011-03-14 15:52:53 -04:00
Nick Mathewson
f1c365b032 Merge remote branch 'origin/maint-0.2.2' 
Fix trivial add/add conflict in main.c

Conflicts:
	src/or/main.c
 2011-03-14 15:31:24 -04:00
Nick Mathewson
b639add1a0 Merge remote branch 'arma/bug2716' into maint-0.2.2 2011-03-14 15:29:02 -04:00
Roger Dingledine
72b89c96bf fix two issues pointed out by nickm 2011-03-13 16:56:41 -04:00
Roger Dingledine
1a9d19e972 we're not reachable if we don't have a routerinfo yet 2011-03-13 15:47:59 -04:00
Roger Dingledine
61f648ae37 fix one more typo 2011-03-13 15:22:45 -04:00
Robert Ransom
eb50e3d6bf Add changes file for previous commit 2011-03-12 07:30:24 -08:00
Robert Ransom
a6cc15e2ae Revert "If we are not using BEGIN_DIR cells, don't attempt to contact hidden service directories with non-open dir port." 
This reverts commit 9a7098487b.

Conflicts:

	ChangeLog (left unchanged by this commit)
 2011-03-12 07:30:24 -08:00
Nick Mathewson
176fde505f Tweak bug2716 patch a little 
Name the magic value "10" rather than re-deriving it.

Comment more.

Use the pattern that works for periodic timers, not the pattern that
doesn't work. ;)
 2011-03-12 00:19:52 -05:00
Nick Mathewson
d52a99dc77 Merge remote branch 'origin/maint-0.2.2' 2011-03-11 23:34:46 -05:00
Nick Mathewson
d34a5cdc59 Merge branch 'hsdir_assignment' into maint-0.2.2 2011-03-11 23:30:25 -05:00
Nick Mathewson
3a0c602155 Clarify threat description and avoid negative uptimes. 2011-03-11 23:27:53 -05:00
Roger Dingledine
977e396e86 improve accuracy for when a relay went unreachable 2011-03-11 22:12:15 -05:00
Roger Dingledine
600ad7bf8d Merge commit 'sebastian/bug2663' into maint-0.2.2 2011-03-11 20:37:21 -05:00
Roger Dingledine
0b07b5dc98 Merge branch 'maint-0.2.2' 2011-03-11 17:40:16 -05:00
Roger Dingledine
879f1718ad Merge branch 'maint-0.2.1' into maint-0.2.2 2011-03-11 17:39:54 -05:00
Roger Dingledine
151ab61442 put the 0.2.1.30 changes into releasenotes 2011-03-11 17:38:55 -05:00
Sebastian Hahn
f7a3cdc8f2 Use observed instead of declared uptime for HSDir 
It is important to verify the uptime claim of a relay instead of just
trusting it, otherwise it becomes too easy to blackhole a specific
hidden service. rephist already has data available that we can use here.

Bugfix on 0.2.0.10-alpha.
 2011-03-11 18:44:35 +01:00
Nick Mathewson
02d93caa09 Backport: Generate version tags using Git, not (broken) svn revisions. 
Partial backport of daa0326aaa .
Resolves bug 2402.  Bugfix on 0.2.1.15 (for the part where we switched to
git) and on 0.2.1.30 (for the part where we dumped micro-revisions.)
 2011-03-11 11:01:17 -05:00
Nick Mathewson
671318c3a8 Revert "Simplest fix to bug2402: do not include SVN versions" 
This reverts commit a1073ee956.

Apparently, we totally misunderstood how the debian packages were using
microrevisions.  Better fix that!
 2011-03-11 10:47:25 -05:00
Nick Mathewson
4740311d18 Merge remote branch 'origin/maint-0.2.2' 2011-03-10 16:11:39 -05:00
Nick Mathewson
48c4d53281 Add a step to the release process: tell trac about the version. 2011-03-10 16:10:53 -05:00
Steven Murdoch
56bdc844ba Fix compilation under LLVM/clang with --enable-gcc-warnings 
- When compiling using clang (2.9 or lower) do not enable
  -Wnormalized=id or -Woverride-init when --enable-gcc-warnings
  or --enable-gcc-warnings-advisory is set as these options
  are unsupported.
 2011-03-10 01:54:43 +01:00
Sebastian Hahn
473ff26563 Fix two compile warnings when using clang 
Issue found by Steven Murdoch
 2011-03-10 01:48:19 +01:00
Nick Mathewson
92e607d951 Merge remote branch 'origin/maint-0.2.2' 2011-03-09 16:22:50 -05:00
Nick Mathewson
78d5955e5b oops. I got the bug number wrong. 2011-03-09 16:22:18 -05:00
Nick Mathewson
dc0bb6b709 oops. I got the bug number wrong. 2011-03-09 16:21:34 -05:00
Nick Mathewson
19baca4837 Merge remote branch 'origin/maint-0.2.2' 2011-03-09 16:20:14 -05:00
Andreas Stieger
f31ba6a356 openSUSE initscript create /var/run/tor fixes Ticket #2573 
(changes file added by nickm)
 2011-03-09 16:18:44 -05:00
Roger Dingledine
b5f2b449ee forward-port the 0.2.2.23-alpha changelog 2011-03-08 18:59:48 -05:00
Roger Dingledine
e569e6b201 Merge branch 'maint-0.2.2' 2011-03-08 18:16:27 -05:00
Roger Dingledine
6426cd14f3 Merge branch 'maint-0.2.1' into maint-0.2.2 2011-03-08 18:16:06 -05:00
Roger Dingledine
d080fe8db1 move to march 2011 geoip file 2011-03-08 18:15:17 -05:00
Nick Mathewson
63651b9191 Merge remote branch 'origin/maint-0.2.2' 
Trivial conflicts fixed in or.h

Conflicts:
	src/or/or.h
 2011-03-08 16:20:53 -05:00
Roger Dingledine
cb3c3c63cb Merge branch 'maint-0.2.2' 2011-03-08 16:14:53 -05:00
Nick Mathewson
00446973f2 Merge remote branch 'sebastian/bug2250' into maint-0.2.2 2011-03-08 16:13:28 -05:00
Nick Mathewson
f9bb3ced51 Merge remote branch 'origin/maint-0.2.2' 
Resolved trivial one-line conflicts.

Conflicts:
	src/or/dirserv.c
	src/or/rephist.c
 2011-03-08 16:10:40 -05:00
Roger Dingledine
dbd4a01756 steps roger takes when making a new release 2011-03-08 16:06:32 -05:00
Nick Mathewson
0d78a16c36 Merge remote branch 'sebastian/bug1035' into maint-0.2.2 2011-03-08 15:52:43 -05:00
Roger Dingledine
9c72324ae8 update spec locations 2011-03-08 15:31:04 -05:00
Nick Mathewson
d5907e7d9d Merge remote branch 'origin/maint-0.2.2' 2011-03-08 15:23:30 -05:00
Nick Mathewson
9ad083d573 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 2011-03-08 15:20:48 -05:00
Nick Mathewson
9a6df21539 Avoid crash in any_pending_bridge_descriptor_fetches 
This is based on shitlei's fix for bug2629, with extra parens removed.
Fixes bug 2629, bugfix on 0.2.1.2-alpha.
 2011-03-08 15:17:41 -05:00
Roger Dingledine
95edd51116 make nickm's proposed convention from 2003 be gospel 2011-03-08 14:59:30 -05:00
Nick Mathewson
26009a3ed0 Merge remote branch 'origin/maint-0.2.2' 2011-03-07 17:12:08 -05:00