diff options
| author | Peter Palfrader <peter@palfrader.org> | 2009-06-20 13:08:43 +0200 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2009-06-20 13:08:43 +0200 |
| commit | f53b1c673cb3a892268586ea61a6cd59f2abf2e0 (patch) | |
| tree | b03ceb11ca659ba3370542a33bd11a0512507b16 /debian | |
| parent | 6190c8145474d47e00805be9cf1f842437b2d53a (diff) | |
| parent | 6be66447e76fb6a52c0cc47346611c02fbe29a83 (diff) | |
| download | tor-f53b1c673cb3a892268586ea61a6cd59f2abf2e0.tar.gz tor-f53b1c673cb3a892268586ea61a6cd59f2abf2e0.zip | |
Merge branch 'debian-merge' into debian
* debian-merge: (33 commits)
Forward port 06_add_compile_time_defaults
New upstream version
Bump version to 0.2.1.16-rc
prepare changelog for 0.2.1.16-rc
Better fix for 997.
Revert "Backport fix for bug 997."
tor-resolve: Don't automatically refuse .onion addresses.
Backport fix for bug 997.
Revise earlier check for correct IPv4 addr length to check for ==4.
Check answer_len in the remap_addr case of process_relay_cell_not_open.
update requirements to openssl 0.9.7
Missing changelog entry about geoip
Move and fix a changelog entry. Noticed by optimist.
Avoid a memory corruption problem related to "private" in DirPolicy.
Update the rest of the geoip file.
Update the geoip file
Fix gprof bottlenecks on exit nodes found by Jacob.
Do not report a node as a "chosen exit" when it is not in fact an exit.
Make the second argument to routerset_contains_extendinfo const
Don't attempt to log messages to a controller from a worker thread.
...
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/patches/06_add_compile_time_defaults.dpatch | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 425b56bacd..620917081b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -tor (0.2.1.15-rc-1XXX) XXXerimental; urgency=low +tor (0.2.1.16-rc-1) unreleased; urgency=low + * New upstream version. * No longer inform the user if/when we re-create the /var/run/tor directory in the init script. With /var/run on tmpfs this is completely normal now so our message was just noise. @@ -14,8 +15,9 @@ tor (0.2.1.15-rc-1XXX) XXXerimental; urgency=low - Change dh_strip call from --dbg-package=tor to --dbg-package=tor-dbg. - Update versioned build time dependency on debhelper. + * Forward port 06_add_compile_time_defaults. - -- Peter Palfrader <weasel@debian.org> Sun, 31 May 2009 13:18:47 +0200 + -- Peter Palfrader <weasel@debian.org> Sat, 20 Jun 2009 13:00:14 +0200 tor (0.2.1.15-rc-1) experimental; urgency=low diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch index 7dfce2ef23..a2472d1db8 100755 --- a/debian/patches/06_add_compile_time_defaults.dpatch +++ b/debian/patches/06_add_compile_time_defaults.dpatch @@ -50,7 +50,7 @@ diff -urNad tor-trunk~/src/or/config.c tor-trunk/src/or/config.c + if (debian_config_fix_defaults() < 0) + goto err; + - if (argv) { /* first time we're called. save commandline args */ + if (argv) { /* first time we're called. save command line args */ backup_argv = argv; backup_argc = argc; @@ -5307,3 +5313,62 @@ |