diff options
| author | Peter Palfrader <peter@palfrader.org> | 2009-09-21 13:14:39 +0200 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2009-09-21 13:14:39 +0200 |
| commit | a9c45754e0e587dda4e16f888a1662eddf90b1f5 (patch) | |
| tree | cc5b7aa467419ae63f394e9e3929c38eac316915 /src/win32/orconfig.h | |
| parent | b440a4d9369c4a6c4501b289f2e6ff089ba9a519 (diff) | |
| parent | 54ba86d9d0cff2ceef75d564ece3d7d2ea26af26 (diff) | |
| download | tor-a9c45754e0e587dda4e16f888a1662eddf90b1f5.tar tor-a9c45754e0e587dda4e16f888a1662eddf90b1f5.tar.gz | |
Merge commit 'tor-0.2.2.2-alpha' into debian-merge
* commit 'tor-0.2.2.2-alpha': (94 commits)
downgrade a log severity, since this event has been known
Update to the "September 4 2009" ip-to-country file.
bump to 0.2.2.2-alpha
Revert "Teach connection_ap_can_use_exit about Exclude*Nodes"
fix grammar / add changelog for the torify commit
Fix compile on Snow Leopard
Fix build warnings on OSX 10.5.8
Change the condition on the nonlive timeout counting.
Add a couple of time helper functions.
Fix typos and comments, plus two bugs
Implement and document new network liveness algorithm.
Fix some precision-related asserts in unit tests.
replace contrib/auto-naming with a readme saying where it went
clarify our rules for assigning the Named flag
disable the end of circuitbuildtimeout units tests
draw in a lot of 0.2.1.20 changelog items into 0.2.2.2-alpha
Fix compile on freebsd
Let our config abbreviations rewrite more than once
a mish-mash of stuff in my sandbox
give proposal 151 a changelog and other touchups
...
Diffstat (limited to 'src/win32/orconfig.h')
| -rw-r--r-- | src/win32/orconfig.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index aced48782..c2ccfa7be 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,5 +226,5 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.2.1-alpha" +#define VERSION "0.2.2.2-alpha" |