fold in last two changes files

This commit is contained in:
Roger Dingledine
2011-02-22 22:56:57 -05:00
parent f10ec55b25
commit feabf2eb6c
3 changed files with 12 additions and 14 deletions
-9
View File
@@ -1,9 +0,0 @@
o Minor bugfixes:
- Bring the logic that gathers routerinfos and assesses the
acceptability of circuits into line. This prevents a Tor OP from getting
locked in a cycle of choosing its local OR as an exit for a path (due to
a .exit request) and then rejecting the circuit because its OR is not
listed yet. Also prevent Tor clients from using an OR running in the same
instance as an exit (due to a .exit request) if the OR does not meet the
same requirements expected of an OR running elsewhere.
Fixes bug 1859; bugfix on 0.2.0-alpha.
-4
View File
@@ -1,4 +0,0 @@
o Minor bugfixes (build)
- Do not include Git version tags as though they were SVN tags when
generating a tarball from inside a repository that has switched between
branches. Bugfix on 0.2.1.15-rc; fixes bug 2402.